[Qemu-devel] [PATCH RFC 02/10] docker: change docker-image to docker-all-images target

[Alex Bennée]

We also evaluate this list later in the build rule after all decisions
about what will and won't be built have been made.

Signed-off-by: Alex Bennée <address@hidden>
---
 tests/docker/Makefile.include | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index c9e412f9d0..22adf6ac73 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -8,7 +8,6 @@ DOCKER_DEPRECATED_IMAGES := debian
 # we don't run tests on intermediate images (used as base by another image)
 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
 DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
 
@@ -34,8 +33,6 @@ $(DOCKER_SRC_COPY):
 
 docker-qemu-src: $(DOCKER_SRC_COPY)
 
-docker-image: ${DOCKER_TARGETS}
-
 # General rule for building docker images. If we are a sub-make
 # invoked with SKIP_DOCKER_BUILD we still check the image is upto date
 # though
@@ -154,6 +151,10 @@ $(foreach i,$(filter-out 
$(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPR
        ) \
 )
 
+# Expand a rule to build all useable images
+DOCKER_TARGETS := $(patsubst %,docker-image-%,$(filter-out 
$(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)))
+docker-all-images: $(DOCKER_TARGETS)
+
 docker:
        @echo 'Build QEMU and run tests inside Docker containers'
        @echo
@@ -167,7 +168,7 @@ docker:
        @echo '                         Note: "TEST" is one of the listed test 
name,'
        @echo '                         or a script name under 
$$QEMU_SRC/tests/docker/;'
        @echo '                         "IMAGE" is one of the listed container 
name."'
-       @echo '    docker-image:        Build all images.'
+       @echo '    docker-all-images:   Build all images.'
        @echo '    docker-image-IMAGE:  Build image "IMAGE".'
        @echo '    docker-run:          For manually running a "TEST" with 
"IMAGE"'
        @echo
-- 
2.17.1