Commit 8a4daee5 authored by Alex Bennée's avatar Alex Bennée
Browse files

tests/docker: move our ppc64 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: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent c6e8f512

tests/docker/Makefile.include

+2 −2
Original line number Diff line number Diff line
@@ -104,11 +104,11 @@ docker-image-debian-hppa-cross: docker-image-debian10 
docker-image-debian-m68k-cross: docker-image-debian10

docker-image-debian-mips64-cross: docker-image-debian10

docker-image-debian-powerpc-cross: docker-image-debian10

docker-image-debian-ppc64-cross: docker-image-debian10

docker-image-debian-riscv64-cross: docker-image-debian10

docker-image-debian-sh4-cross: docker-image-debian10

docker-image-debian-sparc64-cross: docker-image-debian10



docker-image-debian-ppc64-cross: docker-image-debian-sid

docker-image-travis: NOUSER=1



# Specialist build images, sometimes very limited tools
@@ -117,7 +117,7 @@ docker-image-tricore-cross: docker-image-debian9 
# These images may be good enough for building tests but not for test builds

DOCKER_PARTIAL_IMAGES += debian-alpha-cross debian-hppa-cross debian-m68k-cross debian-sh4-cross

DOCKER_PARTIAL_IMAGES += debian-sparc64-cross debian-mips64-cross debian-riscv64-cross

DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross fedora-i386-cross

DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross debian-ppc64-cross fedora-i386-cross

DOCKER_PARTIAL_IMAGES += fedora-cris-cross



# Rules for building linux-user powered images

tests/docker/dockerfiles/debian-ppc64-cross.docker

+3 −4
Original line number Diff line number Diff line 
#

# Docker ppc64 cross-compiler target

#

# This docker target builds on the debian sid base image which

# contains cross compilers for Debian "ports" targets.

FROM qemu:debian-sid

# This docker target builds on the debian Buster base image.

FROM qemu:debian10



RUN apt update && \

    DEBIAN_FRONTEND=noninteractive eatmydata \

    apt install -y --no-install-recommends \

       gcc-powerpc64-linux-gnu \

       libc6-dev-ppc64-cross || { echo "Failed to build - see debian-sid.docker notes"; exit 1; }
 
       libc6-dev-ppc64-cross