[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/17] docker: drop QEMU_TARGET check, fallback in EX
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 11/17] docker: drop QEMU_TARGET check, fallback in EXECUTABLE not set |
Date: |
Tue, 24 Jul 2018 11:51:03 +0100 |
The addition of QEMU_TARGET was intended to ensure we fall back to
checking for the existence of an image if the build system was not
currently configured to build it. However this breaks the direct use
of the rule for building custom binfmt_misc images. We already check
for EXECUTABLE so let us just use that as a proxy for deciding if we
are just going to check the image exits.
Signed-off-by: Alex Bennée <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 8fbb076396..05afeb64a7 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -58,13 +58,11 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker
docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
$(if $(EXECUTABLE),,\
$(error EXECUTABLE not set, debootstrap of debian-$* would
fail))
- $(if $(wildcard $(EXECUTABLE)),,\
- $(error Please build $(EXECUTABLE) first))
$(if $(DEB_ARCH),,\
$(error DEB_ARCH not set, debootstrap of debian-$* would fail))
$(if $(DEB_TYPE),,\
$(error DEB_TYPE not set, debootstrap of debian-$* would fail))
- $(if $(filter $(QEMU_TARGET),$(TARGET_DIRS)),
\
+ $(if $(wildcard $(EXECUTABLE)),
\
$(call quiet-command,
\
DEB_ARCH=$(DEB_ARCH)
\
DEB_TYPE=$(DEB_TYPE)
\
@@ -136,7 +134,6 @@ DOCKER_PARTIAL_IMAGES += debian-tricore-cross
debian-powerpc-cross fedora-i386-c
# 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: QEMU_TARGET = ppc-linux-user
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
--
2.17.1
- [Qemu-devel] [PULL for 3.0 00/17] docker fixes and tcg test tweak, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 01/17] tests/.gitignore: don't ignore docker tests, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 03/17] docker: par down QEMU_CONFIGURE_OPTS in debian-tricore-cross, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 04/17] docker: fail more gracefully on docker.py check, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 05/17] docker: split configure_qemu from build_qemu, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 06/17] docker: move make check into check_qemu helper, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 02/17] docker: base debian-tricore on qemu:debian9, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 07/17] docker: gracefully skip check_qemu, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 11/17] docker: drop QEMU_TARGET check, fallback in EXECUTABLE not set,
Alex Bennée <=
- [Qemu-devel] [PULL 08/17] docker: Makefile.include don't include partial images, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 12/17] docker: report hint when docker.py check fails, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 10/17] docker: add expansion for docker-test-FOO to Makefile.include, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 09/17] docker: add test-unit runner, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 15/17] docker: ignore distro versioning of debootstrap, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 13/17] docker: Update debootstrap script after Debian migration from Alioth to Salsa, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 14/17] docker: add commentary to debian-bootstrap.docker, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 17/17] tests/tcg: remove runcom test, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 16/17] docker: perform basic binfmt_misc validation in docker.py, Alex Bennée, 2018/07/24
- Re: [Qemu-devel] [PULL for 3.0 00/17] docker fixes and tcg test tweak, Peter Maydell, 2018/07/24