From faa0450b14cba7fc7dad697cbd86801b13ce032a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 3 May 2021 10:39:44 +0100 Subject: [PATCH] kernel: Adjust perf and bcc builds Build both only recent LTS and latest stable kernel Signed-off-by: Rolf Neugebauer --- kernel/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 07680597d..366c6ee54 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -145,9 +145,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 x86 and latest LTS and stable kernels +# Only build perf only on x86 and recent LTS and latest stable kernels ifeq ($(ARCH),x86_64) -ifeq ($(2), $(filter $(2),5.6.x 5.4.x)) +ifeq ($(2), $(filter $(2),5.11.x 5.10.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 \ @@ -183,9 +183,9 @@ forcepush: forcepush_perf_$(2)$(3)$(4) endif endif -# Only build BCC on x86 and only on latest LTS and latest stable kernels. +# Only build bcc only on x86 and recent LTS and latest stable kernels ifeq ($(ARCH),x86_64) -ifeq ($(2), $(filter $(2),5.6.x 5.4.x)) +ifeq ($(2), $(filter $(2),5.11.x 5.10.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 \