summaryrefslogtreecommitdiffstats
path: root/tests/docker/Makefile.include
diff options
context:
space:
mode:
authorAlex Bennée2019-09-09 12:11:49 +0200
committerAlex Bennée2019-09-10 15:14:31 +0200
commit4d26c7fef41171617bf05e2f9c31b415de651f3a (patch)
treef37f1861b2355e8c61e623f7108c2f7303338a40 /tests/docker/Makefile.include
parenttests/docker: update Debian Sid image (diff)
downloadqemu-4d26c7fef41171617bf05e2f9c31b415de651f3a.tar.gz
qemu-4d26c7fef41171617bf05e2f9c31b415de651f3a.tar.xz
qemu-4d26c7fef41171617bf05e2f9c31b415de651f3a.zip
tests/docker: pin powerpc-user-cross to a snapshot
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é <philmd@redhat.com> Cc: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker/Makefile.include')
-rw-r--r--tests/docker/Makefile.include4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index b6c0405950..b06716ff71 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