The bugs have evidently been fixed in the latest release so we can migrate the laggards into how all-test-cross container and remove the legacy hacks. They are also packaged for the main architectures so we don't need to jump through the amd64 hoops.
Suggested-by: John Snow <[email protected]> Signed-off-by: Alex Bennée <[email protected]> --- configure | 10 +--- .gitlab-ci.d/buildtest.yml | 12 ----- .gitlab-ci.d/container-cross.yml | 6 --- .gitlab-ci.d/containers.yml | 1 - .../dockerfiles/debian-all-test-cross.docker | 8 ++- .../debian-legacy-test-cross.docker | 51 ------------------- tests/lcitool/refresh | 8 ++- 7 files changed, 13 insertions(+), 83 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-legacy-test-cross.docker diff --git a/configure b/configure index c4837eba2b1..683813473e9 100755 --- a/configure +++ b/configure @@ -1450,7 +1450,7 @@ probe_target_compiler() { container_image=debian-all-test-cross container_cross_prefix=aarch64-linux-gnu- ;; - hppa|m68k|mips|riscv64|sparc64) + alpha|hppa|m68k|mips|riscv64|sh4|sparc64) container_image=debian-all-test-cross ;; mips64) @@ -1462,14 +1462,6 @@ probe_target_compiler() { container_cross_prefix=powerpc${target_arch#ppc}-linux-gnu- ;; - # debian-legacy-test-cross architectures (need Debian 11) - # - libc6.1-dev-alpha-cross: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1054412 - # - sh4-linux-user: binaries don't run with bookworm compiler - - alpha|sh4) - container_image=debian-legacy-test-cross - ;; - # architectures with individual containers aarch64) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 1b656b9eb08..fef19c2d5da 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -376,18 +376,6 @@ build-user-static: variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --disable-system --static - --target-list-exclude=alpha-linux-user,sh4-linux-user - MAKE_CHECK_ARGS: check-tcg - -# targets stuck on older compilers -build-legacy: - extends: .native_build_job_template - needs: - - job: amd64-debian-legacy-cross-container - variables: - IMAGE: debian-legacy-test-cross - TARGETS: alpha-linux-user alpha-softmmu sh4-linux-user - CONFIGURE_ARGS: --disable-tools MAKE_CHECK_ARGS: check-tcg build-user-hexagon: diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 2a0cea6ce1a..92a7f1c1b47 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -10,12 +10,6 @@ amd64-debian-user-cross-container: variables: NAME: debian-all-test-cross -amd64-debian-legacy-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-legacy-test-cross - arm64-debian-cross-container: extends: .container_job_template stage: containers diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 6aeccf8be0c..c8b8e44ad86 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -45,7 +45,6 @@ weekly-container-builds: # cross - amd64-debian-cross-container - amd64-debian-user-cross-container - - amd64-debian-legacy-cross-container - arm64-debian-cross-container - hexagon-cross-container - loongarch-debian-cross-container diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index 1823233438a..b73776d95b5 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -64,6 +64,8 @@ ENV AVAILABLE_COMPILERS gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-arm-linux-gnueabihf \ libc6-dev-armhf-cross \ + gcc-alpha-linux-gnu \ + libc6.1-dev-alpha-cross \ gcc-mips-linux-gnu \ libc6-dev-mips-cross \ gcc-mips64-linux-gnuabi64 \ @@ -77,7 +79,9 @@ ENV AVAILABLE_COMPILERS gcc-aarch64-linux-gnu \ gcc-riscv64-linux-gnu \ libc6-dev-riscv64-cross \ gcc-s390x-linux-gnu \ - libc6-dev-s390x-cross + 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"; \ @@ -90,7 +94,7 @@ apt install -y --no-install-recommends \ ${AVAILABLE_COMPILERS} && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /packages.txt ENV QEMU_CONFIGURE_OPTS --disable-docs -ENV DEF_TARGET_LIST aarch64-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,sparc64-linux-user +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) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-legacy-test-cross.docker b/tests/docker/dockerfiles/debian-legacy-test-cross.docker deleted file mode 100644 index 5a6616b7d39..00000000000 --- a/tests/docker/dockerfiles/debian-legacy-test-cross.docker +++ /dev/null @@ -1,51 +0,0 @@ -# Docker legacy cross-compiler target (tests and minimal qemu) -# -# Compilers for some of our older targets which we cant currently -# upgrade. Currently: -# -# libc6.1-dev-alpha-cross: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1054412 -# sh4-linux-user: binaries don't run with bookworm compiler -# -# As we are targeting check-tcg here we only need minimal qemu -# dependencies and the relevant cross compilers. - -FROM docker.io/library/debian:11-slim - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - apt build-dep -yy qemu - -# Add extra build tools and as many cross compilers as we can for testing -RUN DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - bison \ - ccache \ - clang \ - flex \ - git \ - ninja-build \ - gcc-alpha-linux-gnu \ - libc6.1-dev-alpha-cross \ - gcc-sh4-linux-gnu \ - libc6-dev-sh4-cross \ - python3-pip \ - python3-setuptools \ - python3-venv \ - python3-wheel && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt - -RUN /usr/bin/pip3 install tomli - -ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools -ENV DEF_TARGET_LIST alpha-linux-user,sh4-linux-user -ENV MAKE /usr/bin/make -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 8f0aa3fa343..c74345e03d0 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -172,6 +172,8 @@ debian_all_test_cross_compilers = [ " libc6-dev-arm64-cross \\\n", " gcc-arm-linux-gnueabihf \\\n", " libc6-dev-armhf-cross \\\n", + " gcc-alpha-linux-gnu \\\n" + " libc6.1-dev-alpha-cross \\\n" " gcc-mips-linux-gnu \\\n", " libc6-dev-mips-cross \\\n", " gcc-mips64-linux-gnuabi64 \\\n", @@ -185,7 +187,9 @@ debian_all_test_cross_compilers = [ " gcc-riscv64-linux-gnu \\\n", " libc6-dev-riscv64-cross \\\n", " gcc-s390x-linux-gnu \\\n", - " libc6-dev-s390x-cross\n", + " libc6-dev-s390x-cross\\\n", + " gcc-sh4-linux-gnu \\\n", + " libc6-dev-sh4-cross\n", "RUN if dpkg-architecture -e amd64; then \\\n", " export AVAILABLE_COMPILERS=\"${AVAILABLE_COMPILERS} gcc-hppa-linux-gnu libc6-dev-hppa-cross\"; \\\n", " export AVAILABLE_COMPILERS=\"${AVAILABLE_COMPILERS} gcc-m68k-linux-gnu libc6-dev-m68k-cross\"; \\\n", @@ -198,7 +202,7 @@ debian_all_test_cross_compilers = [ "${AVAILABLE_COMPILERS} && \\\n", "dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /packages.txt\n", "ENV QEMU_CONFIGURE_OPTS --disable-docs\n", - "ENV DEF_TARGET_LIST aarch64-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,sparc64-linux-user\n", + "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\n", ] def cross_build(prefix, targets): -- 2.47.3
