github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

kernel: Build perf/bcc for 5.4.x kernels not 5.3.x

Browse Source 
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
This commit is contained in:
Rolf Neugebauer 2019-12-18 15:25:49 +00:00
parent f9fee518a7
commit a28ebce2f4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/Makefile
View File

@ -150,7 +150,7 @@ show-tags: show-tag_$(2)$(3)$(4)
# with DOCKER_CONTENT_TRUST explicitly set to 0 # with DOCKER_CONTENT_TRUST explicitly set to 0
# Only build perf on latest LTS and stable kernels. Skip arm64. # 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) ifneq ($(ARCH),aarch64)
build_perf_$(2)$(3)$(4): build_$(2)$(3)$(4) build_perf_$(2)$(3)$(4): build_$(2)$(3)$(4)
docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \ 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. # Only build BCC on x86 and only on latest LTS and latest stable kernels.
ifeq ($(ARCH),x86_64) 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) build_bcc_$(2)$(3)$(4): build_$(2)$(3)$(4)
docker pull $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \ docker pull $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \
DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.bcc \ DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.bcc \