[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 23/45] tests/docker: move our ppc64 cross compile to
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 23/45] tests/docker: move our ppc64 cross compile to Buster |
Date: |
Tue, 10 Sep 2019 09:43:27 +0100 |
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 93190b1e2a2..b6c04059502 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -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
diff --git a/tests/docker/dockerfiles/debian-ppc64-cross.docker
b/tests/docker/dockerfiles/debian-ppc64-cross.docker
index e5757fe46ee..4bf88ab02dd 100644
--- a/tests/docker/dockerfiles/debian-ppc64-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64-cross.docker
@@ -1,12 +1,11 @@
#
# 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
--
2.20.1
- [Qemu-devel] [PULL 44/45] Fedora images: use URLs from stable "archives.fedoraproject.org", (continued)
- [Qemu-devel] [PULL 44/45] Fedora images: use URLs from stable "archives.fedoraproject.org", Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 26/45] tests/docker: add debian-xtensa-cross to DEBIAN_PARTIAL_IMAGES, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 30/45] tests/docker: use --arch-only for installing deps, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 27/45] tests/docker: add debian9-mxe to DEBIAN_PARTIAL_IMAGES, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 37/45] .travis.yml: Cache Avocado cache, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 34/45] .travis.yml: Enable multiple caching features, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 23/45] tests/docker: move our ppc64 cross compile to Buster,
Alex Bennée <=
- [Qemu-devel] [PULL 12/45] tests/docker: set DEF_TARGET_LIST for some containers, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 45/45] travis.yml: Install libcap-dev for testing virito-9p, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 33/45] configure: check if --no-pie is supported first, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 11/45] tests/docker: move DEF_TARGET_LIST setting to common.rc, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 29/45] tests/docker: add debian-amd64-cross for non-x86 hosts, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 24/45] tests/docker: update Debian Sid image, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 36/45] .travis.yml: Cache Python PIP packages, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 25/45] tests/docker: pin powerpc-user-cross to a snapshot, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 35/45] .travis.yml: Increase cache timeout from 3min to 20min, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 39/45] .travis.yml: Enable ccache on OSX, Alex Bennée, 2019/09/10