[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for 3.0 07/10] docker: Makefile.include don't includ
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH for 3.0 07/10] docker: Makefile.include don't include partial images |
Date: |
Mon, 9 Jul 2018 16:21:14 +0100 |
Rename DOCKER_INTERMEDIATE_IMAGES to DOCKER_PARTIAL_IMAGES and add the
incomplete cross compiler images that can build tests but can't build
QEMU itself. We also add debian, debian-bootstrap and the tricode
images to the list.
Signed-off-by: Alex Bennée <address@hidden>
---
tests/docker/Makefile.include | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index b2a7e761cc..09fb7db7fa 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -6,7 +6,7 @@ DOCKER_SUFFIX := .docker
DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
DOCKER_DEPRECATED_IMAGES := debian
# we don't run tests on intermediate images (used as base by another image)
-DOCKER_INTERMEDIATE_IMAGES := debian8 debian9 debian8-mxe debian-ports
debian-sid
+DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian8-mxe debian-ports
debian-sid debian-bootstrap
DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir
$(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
# Use a global constant ccache directory to speed up repetitive builds
@@ -121,6 +121,11 @@ docker-image-travis: NOUSER=1
# Specialist build images, sometimes very limited tools
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
+
# Rules for building linux-user powered images
#
# These are slower than using native cross compiler setups but can
@@ -137,7 +142,7 @@ docker-image-debian-powerpc-user-cross:
docker-binfmt-image-debian-powerpc-user
DOCKER_USER_IMAGES += debian-powerpc-user
# Expand all the pre-requistes for each docker image and test combination
-$(foreach i,$(filter-out $(DOCKER_INTERMEDIATE_IMAGES),$(DOCKER_IMAGES)
$(DOCKER_DEPRECATED_IMAGES)), \
+$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)
$(DOCKER_DEPRECATED_IMAGES)), \
$(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \
$(eval .PHONY: address@hidden) \
$(eval address@hidden: docker-image-$i address@hidden) \
--
2.17.1
- [Qemu-devel] [PATCH for 3.0 05/10] docker: move make check into check_qemu helper, (continued)
- [Qemu-devel] [PATCH for 3.0 03/10] docker: fail more gracefully on docker.py check, Alex Bennée, 2018/07/09
- [Qemu-devel] [PATCH for 3.0 04/10] docker: split configure_qemu from build_qemu, Alex Bennée, 2018/07/09
- [Qemu-devel] [PATCH for 3.0 07/10] docker: Makefile.include don't include partial images,
Alex Bennée <=
- [Qemu-devel] [PATCH for 3.0 06/10] docker: gracefully skip check_qemu, Alex Bennée, 2018/07/09
- [Qemu-devel] [PATCH for 3.0 08/10] docker: disable debian-powerpc-user-cross, Alex Bennée, 2018/07/09
- [Qemu-devel] [PATCH for 3.0 10/10] docker: add expansion for docker-test-FOO to Makefile.include, Alex Bennée, 2018/07/09
[Qemu-devel] [PATCH for 3.0 09/10] docker: add test-unit runner, Alex Bennée, 2018/07/09