diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2023-10-29 14:50:24 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2023-10-31 14:10:14 +0000 |
| commit | 9d9a573612802a0da653add70a2b3de75fcdc1d0 (patch) | |
| tree | e06748acc1d48beef81a8cf531e40d1eab9b39bf /tests/docker/dockerfiles | |
| parent | 95f5bf952106f659b16d920dd74d118a4d36b0da (diff) | |
| download | qemu-9d9a573612802a0da653add70a2b3de75fcdc1d0.zip qemu-9d9a573612802a0da653add70a2b3de75fcdc1d0.tar.gz qemu-9d9a573612802a0da653add70a2b3de75fcdc1d0.tar.bz2 | |
tests/docker: use debian-all-test-cross for m68k
Maintaining two sets of containers for test building is silly. While
it makes sense for the QEMU cross-compile targets to have their own
fat containers built by lcitool we might as well merge the other
random debian based compilers into the same one used on gitlab.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20231029145033.592566-11-alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker/dockerfiles')
| -rw-r--r-- | tests/docker/dockerfiles/debian-m68k-cross.docker | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/tests/docker/dockerfiles/debian-m68k-cross.docker b/tests/docker/dockerfiles/debian-m68k-cross.docker deleted file mode 100644 index 25dd1c1..0000000 --- a/tests/docker/dockerfiles/debian-m68k-cross.docker +++ /dev/null @@ -1,19 +0,0 @@ -# -# Docker cross-compiler target -# -# This docker target builds on the Debian Bullseye base image. -# -FROM docker.io/library/debian:11-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-m68k-linux-gnu \ - libc6-dev-m68k-cross -# 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 |