tests/docker: update and flatten debian-all-test-cross
Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We also need to ensure we install clang as it is used for those builds as well. It would be nice to port this to lcitool but for now this will do. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20220914155950.804707-24-alex.bennee@linaro.org>
This commit is contained in:
parent
fab08026a2
commit
b6fafe5b3e
|
@ -14,7 +14,6 @@ amd64-debian-cross-container:
|
||||||
amd64-debian-user-cross-container:
|
amd64-debian-user-cross-container:
|
||||||
extends: .container_job_template
|
extends: .container_job_template
|
||||||
stage: containers
|
stage: containers
|
||||||
needs: ['amd64-debian10-container']
|
|
||||||
variables:
|
variables:
|
||||||
NAME: debian-all-test-cross
|
NAME: debian-all-test-cross
|
||||||
|
|
||||||
|
|
|
@ -129,7 +129,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \
|
||||||
$(call debian-toolchain, $@)
|
$(call debian-toolchain, $@)
|
||||||
|
|
||||||
# Specialist build images, sometimes very limited tools
|
# Specialist build images, sometimes very limited tools
|
||||||
docker-image-debian-all-test-cross: docker-image-debian10
|
|
||||||
docker-image-debian-loongarch-cross: docker-image-debian11
|
docker-image-debian-loongarch-cross: docker-image-debian11
|
||||||
docker-image-debian-microblaze-cross: docker-image-debian10
|
docker-image-debian-microblaze-cross: docker-image-debian10
|
||||||
docker-image-debian-nios2-cross: docker-image-debian10
|
docker-image-debian-nios2-cross: docker-image-debian10
|
||||||
|
|
|
@ -6,16 +6,24 @@
|
||||||
# basic compilers for as many targets as possible. We shall use this
|
# basic compilers for as many targets as possible. We shall use this
|
||||||
# to build and run linux-user tests on GitLab
|
# to build and run linux-user tests on GitLab
|
||||||
#
|
#
|
||||||
FROM qemu/debian10
|
FROM docker.io/library/debian:11-slim
|
||||||
|
|
||||||
# What we need to build QEMU itself
|
# Duplicate deb line as deb-src
|
||||||
RUN apt update && \
|
RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
|
||||||
DEBIAN_FRONTEND=noninteractive eatmydata \
|
|
||||||
|
RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
|
apt-get update && \
|
||||||
|
apt-get install -y eatmydata && \
|
||||||
|
eatmydata apt-get dist-upgrade -y && \
|
||||||
apt build-dep -yy qemu
|
apt build-dep -yy qemu
|
||||||
|
|
||||||
# Add the foreign architecture we want and install dependencies
|
# Add extra build tools and as many cross compilers as we can for testing
|
||||||
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
|
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
|
||||||
apt install -y --no-install-recommends \
|
apt install -y --no-install-recommends \
|
||||||
|
ccache \
|
||||||
|
clang \
|
||||||
|
git \
|
||||||
|
ninja-build \
|
||||||
gcc-aarch64-linux-gnu \
|
gcc-aarch64-linux-gnu \
|
||||||
libc6-dev-arm64-cross \
|
libc6-dev-arm64-cross \
|
||||||
gcc-alpha-linux-gnu \
|
gcc-alpha-linux-gnu \
|
||||||
|
|
Loading…
Reference in New Issue