Now that this image is amd64 only, we don't need those ifs anymore. Signed-off-by: Pierrick Bouvier <[email protected]> --- .../dockerfiles/debian-all-test-cross.docker | 35 +++++++++---------- tests/lcitool/refresh | 35 +++++++++---------- 2 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index b6aba26c0c8..1eb419bb8fd 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -66,15 +66,15 @@ RUN apt update && \ rsync # https://openrisc.io/2025/04/20/toolchainrootfsbins -RUN if dpkg-architecture -e amd64; then \ -cd /tmp && \ +RUN cd /tmp && \ wget -q https://github.com/stffrdhrn/or1k-toolchain-build/releases/download/or1k-16.1.0-20260614/or1k-none-linux-musl-16.1.0-20260614.tar.xz && \ tar --no-same-owner -xf *.tar.xz && \ rsync -a or1k-none-linux-musl/ /usr/ && \ - rm -rf /tmp/*; \ -fi + rm -rf /tmp/* -ENV AVAILABLE_COMPILERS="\ +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-arm-linux-gnueabihf \ @@ -97,19 +97,18 @@ ENV AVAILABLE_COMPILERS="\ libc6-dev-s390x-cross\ gcc-sh4-linux-gnu \ libc6-dev-sh4-cross \ - " -RUN if dpkg-architecture -e amd64; then \ - export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-hppa-linux-gnu libc6-dev-hppa-cross"; \ - export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-m68k-linux-gnu libc6-dev-m68k-cross"; \ - export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-powerpc-linux-gnu libc6-dev-powerpc-cross"; \ - export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-powerpc64-linux-gnu libc6-dev-ppc64-cross"; \ - export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-sparc64-linux-gnu libc6-dev-sparc64-cross"; \ -fi && \ -apt update && \ -DEBIAN_FRONTEND=noninteractive eatmydata \ -apt install -y --no-install-recommends \ -${AVAILABLE_COMPILERS} && \ -dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /packages.txt + gcc-hppa-linux-gnu \ + libc6-dev-hppa-cross \ + gcc-m68k-linux-gnu \ + libc6-dev-m68k-cross \ + gcc-powerpc-linux-gnu \ + libc6-dev-powerpc-cross \ + gcc-powerpc64-linux-gnu \ + libc6-dev-ppc64-cross \ + gcc-sparc64-linux-gnu \ + libc6-dev-sparc64-cross \ + && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /packages.txt ENV QEMU_CONFIGURE_OPTS=--disable-docs ENV DEF_TARGET_LIST=aarch64-linux-user,alpha-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user # As a final step configure the user (if env is defined) diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index ceabb9e978a..2bf5896a7d3 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -182,15 +182,15 @@ RUN apt update && \ rsync # https://openrisc.io/2025/04/20/toolchainrootfsbins -RUN if dpkg-architecture -e amd64; then \ -cd /tmp && \ +RUN cd /tmp && \ wget -q https://github.com/stffrdhrn/or1k-toolchain-build/releases/download/or1k-16.1.0-20260614/or1k-none-linux-musl-16.1.0-20260614.tar.xz && \ tar --no-same-owner -xf *.tar.xz && \ rsync -a or1k-none-linux-musl/ /usr/ && \ - rm -rf /tmp/*; \ -fi + rm -rf /tmp/* -ENV AVAILABLE_COMPILERS="\ +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-arm-linux-gnueabihf \ @@ -213,19 +213,18 @@ ENV AVAILABLE_COMPILERS="\ libc6-dev-s390x-cross\ gcc-sh4-linux-gnu \ libc6-dev-sh4-cross \ - " -RUN if dpkg-architecture -e amd64; then \ - export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-hppa-linux-gnu libc6-dev-hppa-cross"; \ - export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-m68k-linux-gnu libc6-dev-m68k-cross"; \ - export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-powerpc-linux-gnu libc6-dev-powerpc-cross"; \ - export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-powerpc64-linux-gnu libc6-dev-ppc64-cross"; \ - export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-sparc64-linux-gnu libc6-dev-sparc64-cross"; \ -fi && \ -apt update && \ -DEBIAN_FRONTEND=noninteractive eatmydata \ -apt install -y --no-install-recommends \ -${AVAILABLE_COMPILERS} && \ -dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /packages.txt + gcc-hppa-linux-gnu \ + libc6-dev-hppa-cross \ + gcc-m68k-linux-gnu \ + libc6-dev-m68k-cross \ + gcc-powerpc-linux-gnu \ + libc6-dev-powerpc-cross \ + gcc-powerpc64-linux-gnu \ + libc6-dev-ppc64-cross \ + gcc-sparc64-linux-gnu \ + libc6-dev-sparc64-cross \ + && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /packages.txt ENV QEMU_CONFIGURE_OPTS=--disable-docs ENV DEF_TARGET_LIST=aarch64-linux-user,alpha-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user """ -- 2.43.0
