From a28ebce2f415ec218e4873b31b1a53e4eb7ade14 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 18 Dec 2019 15:25:49 +0000 Subject: [PATCH] kernel: Build perf/bcc for 5.4.x kernels not 5.3.x Signed-off-by: Rolf Neugebauer --- kernel/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 288e84cd7..1b51e05db 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -150,7 +150,7 @@ show-tags: show-tag_$(2)$(3)$(4) # with DOCKER_CONTENT_TRUST explicitly set to 0 # Only build perf on latest LTS and stable kernels. Skip arm64. -ifeq ($(2), $(filter $(2),5.3.x 4.19.x)) +ifeq ($(2), $(filter $(2),5.4.x 4.19.x)) ifneq ($(ARCH),aarch64) build_perf_$(2)$(3)$(4): build_$(2)$(3)$(4) docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \ @@ -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.3.x 4.19.x)) +ifeq ($(2), $(filter $(2),5.4.x 4.19.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 \