From ea750c8b7bc07bdf7f95e83fda5297be2b79d723 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 14 Apr 2020 23:58:00 +0100 Subject: [PATCH] kernel: Only build bcc/perf on x86 and latest stable and LTS This was previously build for 5.4 and 4.19. Latest LTS is 5.4 and latest stable is 5.6. Also skip s390x build for perf Signed-off-by: Rolf Neugebauer --- kernel/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 2659d10a8..85bc9b7ac 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -149,9 +149,9 @@ show-tags: show-tag_$(2)$(3)$(4) # with DCT as part of the dependency on build_$(2)$(3)$(4) and then build # with DOCKER_CONTENT_TRUST explicitly set to 0 -# Only build perf on latest LTS and stable kernels. Skip arm64. -ifeq ($(2), $(filter $(2),5.4.x 4.19.x)) -ifneq ($(ARCH),aarch64) +# Only build perf on x86 and latest LTS and stable kernels +ifeq ($(ARCH),x86_64) +ifeq ($(2), $(filter $(2),5.6.x 5.4.x)) build_perf_$(2)$(3)$(4): build_$(2)$(3)$(4) docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \ DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.perf \ @@ -189,7 +189,7 @@ endif # Only build BCC on x86 and only on latest LTS and latest stable kernels. ifeq ($(ARCH),x86_64) -ifeq ($(2), $(filter $(2),5.4.x 4.19.x)) +ifeq ($(2), $(filter $(2),5.6.x 5.4.x)) build_bcc_$(2)$(3)$(4): build_$(2)$(3)$(4) docker pull $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \ DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.bcc \