From cfe8b21efbd67e495d0e14920b8dc32b43e77eec Mon Sep 17 00:00:00 2001 From: Jo Zzsi Date: Tue, 28 Jan 2025 16:55:21 -0500 Subject: [PATCH] ci: move distro specific workarounds to the containerfiles This change helps to keep the test itself more readable. --- test/container/Dockerfile-debian | 6 ++++++ test/container/Dockerfile-opensuse | 5 +++++ test/container/Dockerfile-void | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/test/container/Dockerfile-debian b/test/container/Dockerfile-debian index 86273d8f1..ccc1274a9 100644 --- a/test/container/Dockerfile-debian +++ b/test/container/Dockerfile-debian @@ -98,3 +98,9 @@ RUN \ zstd \ && apt-get clean \ && chmod a+r /boot/vmlinu* + +# workaround for kernel-install +RUN \ + KVERSION="$(cd /lib/modules && ls -1 | tail -1)" \ + ; ! [ -e /usr/lib/modules/"$KVERSION"/vmlinuz ] && ln -sf /boot/vmlinuz /usr/lib/modules/"$KVERSION"/vmlinuz \ + ; ! [ -e /usr/lib/modules/"$KVERSION"/vmlinuz ] && ln -sf /boot/vmlinuz-"$KVERSION" /usr/lib/modules/"$KVERSION"/vmlinuz diff --git a/test/container/Dockerfile-opensuse b/test/container/Dockerfile-opensuse index 66b2d277a..e95da5b6c 100644 --- a/test/container/Dockerfile-opensuse +++ b/test/container/Dockerfile-opensuse @@ -53,3 +53,8 @@ RUN zypper --non-interactive install --no-recommends \ util-linux-systemd \ xorriso \ && zypper --non-interactive dist-upgrade --no-recommends + +# workaround for openSUSE on arm64 +RUN \ + KVERSION="$(cd /lib/modules && ls -1 | tail -1)" \ + && if [ "$(arch)"="aarch64" ] && [ -e /usr/lib/modules/"$KVERSION"/Image ]; then ln -sf /usr/lib/modules/"$KVERSION"/Image /usr/lib/modules/"$KVERSION"/vmlinuz; fi diff --git a/test/container/Dockerfile-void b/test/container/Dockerfile-void index 0250da132..ecdfd0f41 100644 --- a/test/container/Dockerfile-void +++ b/test/container/Dockerfile-void @@ -60,4 +60,5 @@ RUN xbps-install -Syu xbps && xbps-install -yu \ ukify \ xorriso \ zfs \ - && rm -rf /var/cache/xbps + && rm -rf /var/cache/xbps \ + && rm -rf /usr/lib/firmware -- 2.47.3