[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 for 3.0 12/16] docker: drop QEMU_TARGET check, fa
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v2 for 3.0 12/16] docker: drop QEMU_TARGET check, fallback in EXECUTABLE not set |
Date: |
Fri, 13 Jul 2018 13:17:37 +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>
---
tests/docker/Makefile.include | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index e32c35be0d..ec23620153 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] [PATCH v2 for 3.0 02/16] docker: base debian-tricore on qemu:debian9, (continued)
- [Qemu-devel] [PATCH v2 for 3.0 02/16] docker: base debian-tricore on qemu:debian9, Alex Bennée, 2018/07/13
- [Qemu-devel] [PATCH v2 for 3.0 08/16] docker: Makefile.include don't include partial images, Alex Bennée, 2018/07/13
- [Qemu-devel] [PATCH v2 for 3.0 10/16] docker: add test-unit runner, Alex Bennée, 2018/07/13
- [Qemu-devel] [PATCH v2 for 3.0 15/16] docker: add commentary to debian-bootstrap.docker, Alex Bennée, 2018/07/13
- [Qemu-devel] [PATCH v2 for 3.0 16/16] docker: ignore distro versioning of debootstrap, Alex Bennée, 2018/07/13
- [Qemu-devel] [PATCH v2 for 3.0 12/16] docker: drop QEMU_TARGET check, fallback in EXECUTABLE not set,
Alex Bennée <=
- [Qemu-devel] [PATCH v2 for 3.0 14/16] docker: Update debootstrap script after Debian migration from Alioth to Salsa, Alex Bennée, 2018/07/13
- Re: [Qemu-devel] [PATCH v2 for 3.0 00/16] various docker fixes, Philippe Mathieu-Daudé, 2018/07/17