github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-23 19:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Re-enable perf build. Update bcc build.

Browse Source 
Re-enable perf builds for 5.3.x and 4.19.x since they're the latest
stable and LTS, respectively.

Update the bcc build rules to map to these same kernel releases, too.

Signed-off-by: Krister Johansen <krister.johansen@oracle.com>
This commit is contained in:
Krister Johansen 2019-11-13 17:52:50 -08:00
parent dad20f2e91
commit a0d797916d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/Makefile
View File

@ -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 DCT as part of the dependency on build_$(2)$(3)$(4) and then build
# with DOCKER_CONTENT_TRUST explicitly set to 0 # with DOCKER_CONTENT_TRUST explicitly set to 0
# Skip perf build for now. See: # Only build perf on latest LTS and stable kernels. Skip arm64.
# https://github.com/linuxkit/linuxkit/issues/3299 ifeq ($(2), $(filter $(2),5.3.x 4.19.x))
ifeq ($(ARCH),SKIP) 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) || \
DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.perf \ DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.perf \
@ -185,10 +185,11 @@ forcebuild: forcebuild_perf_$(2)$(3)$(4)
push: push_perf_$(2)$(3)$(4) push: push_perf_$(2)$(3)$(4)
forcepush: forcepush_perf_$(2)$(3)$(4) forcepush: forcepush_perf_$(2)$(3)$(4)
endif endif
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)
ifneq ($(2), $(filter $(2),4.9.x)) ifeq ($(2), $(filter $(2),5.3.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 \