[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 25/45] tests/docker: pin powerpc-user-cross to a snap
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 25/45] tests/docker: pin powerpc-user-cross to a snapshot |
Date: |
Tue, 10 Sep 2019 09:43:29 +0100 |
Now Jessie has entered LTS the powerpc architecture has been dropped
so we can no longer build the image from scratch. However we can use
the snapshot archive to build the last working version.
This now only lives on an example of setting up a user-cross image as
at least on x86-64 we can use the Buster packaged cross compiler for
building test images.
Suggested-by: Philippe Mathieu-Daudé <address@hidden>
Cc: David Gibson <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index b6c04059502..b06716ff71c 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -71,7 +71,8 @@ docker-binfmt-image-debian-%:
$(DOCKER_FILES_DIR)/debian-bootstrap.docker
$(if $(wildcard $(EXECUTABLE)),
\
$(call quiet-command,
\
DEB_ARCH=$(DEB_ARCH)
\
- DEB_TYPE=$(DEB_TYPE)
\
+ DEB_TYPE=$(DEB_TYPE)
\
+ $(if $(DEB_URL),DEB_URL=$(DEB_URL),)
\
$(DOCKER_SCRIPT) build qemu:debian-$* $<
\
$(if $V,,--quiet) $(if $(NOCACHE),--no-cache)
\
$(if $(NOUSER),,--add-current-user)
\
@@ -130,6 +131,7 @@ DOCKER_PARTIAL_IMAGES += fedora-cris-cross
# broken so we need a qemu-linux-user for this target
docker-binfmt-image-debian-powerpc-user: DEB_ARCH = powerpc
docker-binfmt-image-debian-powerpc-user: DEB_TYPE = jessie
+docker-binfmt-image-debian-powerpc-user: DEB_URL =
http://snapshot.debian.org/archive/debian/20180615T211437Z
docker-binfmt-image-debian-powerpc-user: EXECUTABLE =
${BUILD_DIR}/ppc-linux-user/qemu-ppc
docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user
DOCKER_USER_IMAGES += debian-powerpc-user
diff --git a/tests/docker/dockerfiles/debian-powerpc-user-cross.docker
b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker
index 6938a845ee2..83749b0abb8 100644
--- a/tests/docker/dockerfiles/debian-powerpc-user-cross.docker
+++ b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker
@@ -8,8 +8,14 @@
# debootstrapped qemu:debian-powerpc-user but doesn't need any extra
# magic once it is setup.
#
+# It can be used to build old versions of QEMU, current versions need
+# newer dependencies than Jessie provides.
+#
FROM qemu:debian-powerpc-user
RUN echo man-db man-db/auto-update boolean false | debconf-set-selections
RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get build-dep -yy qemu
+ DEBIAN_FRONTEND=noninteractive apt-get build-dep -yy qemu
+
+ENV QEMU_CONFIGURE_OPTS --disable-werror
+ENV DEF_TARGET_LIST powerpc-softmmu,arm-linux-user,aarch64-linux-user
--
2.20.1
- [Qemu-devel] [PULL 37/45] .travis.yml: Cache Avocado cache, (continued)
- [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, 2019/09/10
- [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 <=
- [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
- [Qemu-devel] [PULL 17/45] tests/docker: move our HPPA cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 43/45] .travis.yml: Cache Linux/Clang jobs together, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 40/45] .travis.yml: Document how the build matrix use caches, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 31/45] tests/docker: add more images to PARTIAL_IMAGES when not on x86_64, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 28/45] tests/docker: avoid $SHELL invoke bash directly, Alex Bennée, 2019/09/10
- Re: [Qemu-devel] [PULL 00/45] testing updates (fixes, upgrades, caching), Peter Maydell, 2019/09/10