diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2019-08-12 15:44:44 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2019-09-10 14:14:31 +0100 |
| commit | ce49420913c4a0b3eec18cfdd5041aa2dab2f026 (patch) | |
| tree | 3f8ebc34e449e8160bf162d327738affa3e53fd6 | |
| parent | 18b6be432650ccad7c7d94c4e62ea4b7f1a15e29 (diff) | |
tests/docker: move our powerpc cross compile to Buster
Now Buster is released we can stop relying on the movable feast that
is Sid for our cross-compiler for building tests.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
| -rw-r--r-- | tests/docker/Makefile.include | 2 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/debian-powerpc-cross.docker | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 48c22ae40c..7c1ff677a1 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -99,6 +99,7 @@ docker-image-debian-win32-cross: docker-image-debian9-mxe docker-image-debian-win64-cross: docker-image-debian9-mxe docker-image-debian-arm64-cross: docker-image-debian10 +docker-image-debian-powerpc-cross: docker-image-debian10 docker-image-debian-alpha-cross: docker-image-debian-sid docker-image-debian-hppa-cross: docker-image-debian-sid @@ -107,7 +108,6 @@ docker-image-debian-sh4-cross: docker-image-debian-sid docker-image-debian-sparc64-cross: docker-image-debian-sid docker-image-debian-mips64-cross: docker-image-debian-sid docker-image-debian-riscv64-cross: docker-image-debian-sid -docker-image-debian-powerpc-cross: docker-image-debian-sid docker-image-debian-ppc64-cross: docker-image-debian-sid docker-image-travis: NOUSER=1 diff --git a/tests/docker/dockerfiles/debian-powerpc-cross.docker b/tests/docker/dockerfiles/debian-powerpc-cross.docker index 5d08fad7cd..89dd4fbf87 100644 --- a/tests/docker/dockerfiles/debian-powerpc-cross.docker +++ b/tests/docker/dockerfiles/debian-powerpc-cross.docker @@ -1,14 +1,12 @@ # # Docker powerpc cross-compiler target # -# This docker target builds on the debian sid base image which -# contains cross compilers for Debian "ports" targets. The original -# Jessie based no longer builds. +# This docker target builds on the debian Buster base image. # -FROM qemu:debian-sid +FROM qemu:debian10 RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ gcc-powerpc-linux-gnu \ - libc6-dev-powerpc-cross || { echo "Failed to build - see debian-sid.docker notes"; exit 1; } + libc6-dev-powerpc-cross |