OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/docker: flatten debian-powerpc-test-cross

Browse Source 
Flatten into a single dockerfile. We really don't need the rest of the
stuff from the QEMU base image just to compile test images.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220914155950.804707-15-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2022-09-14 16:59:34 +01:00
parent 6ede0767ba
commit 0fd8f7a2df
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.d/container-cross.yml
View File

@ -102,7 +102,6 @@ mipsel-debian-cross-container:
powerpc-test-cross-container: powerpc-test-cross-container:
extends: .container_job_template extends: .container_job_template
stage: containers stage: containers
needs: ['amd64-debian11-container']
variables: variables:
NAME: debian-powerpc-test-cross NAME: debian-powerpc-test-cross

1
tests/docker/Makefile.include
View File

@ -137,7 +137,6 @@ 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
docker-image-debian-powerpc-test-cross: docker-image-debian11
docker-image-debian-riscv64-test-cross: docker-image-debian11 docker-image-debian-riscv64-test-cross: docker-image-debian11
# These images may be good enough for building tests but not for test builds # These images may be good enough for building tests but not for test builds

12
tests/docker/dockerfiles/debian-powerpc-test-cross.docker
View File

@ -1,13 +1,15 @@
# #
# Docker powerpc/ppc64/ppc64le cross-compiler target # Docker powerpc/ppc64/ppc64le cross-compiler target
# #
# This docker target builds on the debian Bullseye base image. # This docker target builds on the Debian Bullseye base image.
# #
FROM qemu/debian11 FROM docker.io/library/debian:11-slim
RUN apt update && \ RUN export DEBIAN_FRONTEND=noninteractive && \
DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get update && \
apt install -y --no-install-recommends \ apt-get install -y eatmydata && \
eatmydata apt-get dist-upgrade -y && \
eatmydata apt-get install --no-install-recommends -y \
gcc-powerpc-linux-gnu \ gcc-powerpc-linux-gnu \
libc6-dev-powerpc-cross \ libc6-dev-powerpc-cross \
gcc-10-powerpc64-linux-gnu \ gcc-10-powerpc64-linux-gnu \