tests/docker: move sh4 to use debian-legacy-test-cross

sh4 is another target which doesn't work with bookworm compilers. To
keep on buster move across to the debian-legacy-test-cross image and
update accordingly.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20231030135715.800164-1-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2023-10-29 14:50:21 +00:00
parent d004e27b4e
commit 4e76d98ae9
7 changed files with 13 additions and 33 deletions

View file

@ -4,6 +4,7 @@
# 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.
@ -30,6 +31,8 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
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 \
@ -38,7 +41,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
RUN /usr/bin/pip3 install tomli
ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools
ENV DEF_TARGET_LIST alpha-linux-user
ENV DEF_TARGET_LIST alpha-linux-user,sh4-linux-user
# As a final step configure the user (if env is defined)
ARG USER
ARG UID