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

kernel: Simplify perf and bcc build logic

Browse Source 
Since we removed the 4.4.x kernel, simply don't build
perf and bcc for 4.9.x kernels.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
This commit is contained in:
Rolf Neugebauer 2019-01-01 19:48:20 +00:00
parent 2ab3b0a24e
commit 6c59e083f4
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/Dockerfile
View File

@ -176,9 +176,8 @@ RUN printf "KERNEL_SOURCE=${KERNEL_SOURCE}\n" > /out/kernel-source-info
# perf
# Only build perf for the latest LTS and the latest stable kernel.
# There were intermittent breakage for 4.4.x and 4.9.x on some arches
# Skip arm64 for now as perf for 4.19.x fails to build.
RUN if ( [ "${KERNEL_SERIES}" = 4.14.x ] || [ "${KERNEL_SERIES}" = 4.19.x ] ) && [ $(uname -m) != aarch64 ]; then \
RUN if [ "${KERNEL_SERIES}" != 4.9.x ] && [ $(uname -m) != aarch64 ]; then \
mkdir -p /build/perf && \
make -C tools/perf LDFLAGS=-static O=/build/perf && \
strip /build/perf/perf && \

9
kernel/Makefile
View File

@ -157,8 +157,8 @@ fetch: sources/linux-$(1).tar.xz
# with DCT as part of the dependency on build_$(2)$(3)$(4) and then build
# with DOCKER_CONTENT_TRUST explicitly set to 0
ifeq ($(2), $(filter $(2),4.14.x 4.19.x))
# Only build perf for the latest LTS and the latest stable kernel.
# Only build perf for the latest LTS and the latest stable kernel
ifneq ($(2), $(filter $(2),4.9.x))
ifneq ($(ARCH),aarch64)
# Skip arm64 for now as perf for 4.19.x fails to build.
build_perf_$(2)$(3)$(4): build_$(2)$(3)$(4)
@ -196,10 +196,9 @@ forcepush: forcepush_perf_$(2)$(3)$(4)
endif
endif
# For BCC, only build on x86 and only on latest LTS and latest stable.
# That's 4.14.x and 4.19.x at time of authorship.
# Only build BCC on x86 and only on latest LTS and latest stable kernels.
ifeq ($(ARCH),x86_64)
ifeq ($(2), $(filter $(2),4.14.x 4.19.x))
ifneq ($(2), $(filter $(2),4.9.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 \