Skip to content

Commit

Permalink
tests/docker: upgrade debian-all-test-cross to bookworm
Browse files Browse the repository at this point in the history
This requires a few more tweaks than usual as:

  - the default sources format has changed
  - bring in python3-tomli from the repos
  - split base install from cross compilers
  - also include libclang-rt-dev for sanitiser builds

Acked-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20231029145033.592566-16-alex.bennee@linaro.org>
  • Loading branch information
stsquad committed Oct 31, 2023
1 parent 7ccb415 commit aba77ac
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions tests/docker/dockerfiles/debian-all-test-cross.docker
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
# basic compilers for as many targets as possible. We shall use this
# to build and run linux-user tests on GitLab
#
FROM docker.io/library/debian:11-slim
FROM docker.io/library/debian:12-slim

# Duplicate deb line as deb-src
RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
RUN sed -in "s/Types: deb/Types: deb deb-src/g" /etc/apt/sources.list.d/debian.sources

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
Expand All @@ -25,7 +25,16 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
clang \
flex \
git \
libclang-rt-dev \
ninja-build \
python3-pip \
python3-setuptools \
python3-tomli \
python3-venv \
python3-wheel

RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt install -y --no-install-recommends \
gcc-aarch64-linux-gnu \
libc6-dev-arm64-cross \
gcc-arm-linux-gnueabihf \
Expand Down Expand Up @@ -53,13 +62,8 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
gcc-s390x-linux-gnu \
libc6-dev-s390x-cross \
gcc-sparc64-linux-gnu \
libc6-dev-sparc64-cross \
python3-pip \
python3-setuptools \
python3-venv \
python3-wheel
libc6-dev-sparc64-cross

RUN /usr/bin/pip3 install tomli

ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools
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
Expand Down

0 comments on commit aba77ac

Please sign in to comment.