github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-25 19:32:18 +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
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 && \