Message ID | 20190904203013.9028-25-alex.bennee@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | current testing/next queue (podman, docker, ci) | expand |
On 9/4/19 10:29 PM, Alex Bennée wrote: > Another image that can't be used directly to build QEMU. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/docker/Makefile.include | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index 8d7f9376578..2c8cb790ad0 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_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian8-mxe debian-ports debian-bootstrap > +DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian8-mxe debian9-mxe debian-ports 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 > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8d7f9376578..2c8cb790ad0 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_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian8-mxe debian-ports debian-bootstrap +DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian8-mxe debian9-mxe debian-ports 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
Another image that can't be used directly to build QEMU. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1