From 510f26581fb1457986ea8650ac52e7eb04a121ff Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 5 Apr 2019 22:55:51 +0100 Subject: [PATCH] tests: Use elfutils-dev for kmod tests Commit 250b14661b66 ("kernel: Use elfutils-dev instead of libelf-dev") switched the kernel build to use elfutils-dev instead of libelf-dev. This caused the kernel module tests to fail. The still installed libelf-dev and the dunamically linked objtool (and friends) from the kernel source package failed to execute. Signed-off-by: Rolf Neugebauer --- test/cases/020_kernel/011_kmod_4.9.x/Dockerfile | 2 +- test/cases/020_kernel/012_kmod_4.14.x/Dockerfile | 2 +- test/cases/020_kernel/015_kmod_4.19.x/Dockerfile | 2 +- test/cases/020_kernel/017_kmod_5.0.x/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile index 3ead7d5d4..5eaddf37d 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile +++ b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile @@ -7,7 +7,7 @@ FROM linuxkit/kernel:4.9.167 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS build -RUN apk add build-base libelf-dev +RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / RUN tar xf kernel-dev.tar diff --git a/test/cases/020_kernel/012_kmod_4.14.x/Dockerfile b/test/cases/020_kernel/012_kmod_4.14.x/Dockerfile index 6ac6e296f..938ac403e 100644 --- a/test/cases/020_kernel/012_kmod_4.14.x/Dockerfile +++ b/test/cases/020_kernel/012_kmod_4.14.x/Dockerfile @@ -7,7 +7,7 @@ FROM linuxkit/kernel:4.14.110 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS build -RUN apk add build-base libelf-dev +RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / RUN tar xf kernel-dev.tar diff --git a/test/cases/020_kernel/015_kmod_4.19.x/Dockerfile b/test/cases/020_kernel/015_kmod_4.19.x/Dockerfile index ddfb2e1e2..7a9656d19 100644 --- a/test/cases/020_kernel/015_kmod_4.19.x/Dockerfile +++ b/test/cases/020_kernel/015_kmod_4.19.x/Dockerfile @@ -7,7 +7,7 @@ FROM linuxkit/kernel:4.19.33 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS build -RUN apk add build-base libelf-dev +RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / RUN tar xf kernel-dev.tar diff --git a/test/cases/020_kernel/017_kmod_5.0.x/Dockerfile b/test/cases/020_kernel/017_kmod_5.0.x/Dockerfile index 26f376df6..d2b5bfe83 100644 --- a/test/cases/020_kernel/017_kmod_5.0.x/Dockerfile +++ b/test/cases/020_kernel/017_kmod_5.0.x/Dockerfile @@ -7,7 +7,7 @@ FROM linuxkit/kernel:5.0.6 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS build -RUN apk add build-base libelf-dev +RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / RUN tar xf kernel-dev.tar