* [PATCH] tests/docker: Remove the remainders of debian9 containers from the Makefile
@ 2020-12-15 8:33 Thomas Huth
2020-12-15 15:24 ` Wainer dos Santos Moschetta
2020-12-16 11:04 ` Alex Bennée
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Huth @ 2020-12-15 8:33 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, Alex Bennée
The Debian 9 containers have been removed a while ago, so we can
delete the corresponding entries in the Makefile, too.
Fixes: e3755276d1 ("tests/docker: Remove old Debian 9 containers")
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/docker/Makefile.include | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 02ec92830b..c254ac38d0 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -11,8 +11,7 @@ HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m))
DOCKER_SUFFIX := .docker
DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
# we don't run tests on intermediate images (used as base by another image)
-DOCKER_PARTIAL_IMAGES := debian9 debian10 debian11
-DOCKER_PARTIAL_IMAGES += debian9-mxe debian-bootstrap
+DOCKER_PARTIAL_IMAGES := debian10 debian11 debian-bootstrap
DOCKER_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
@@ -96,7 +95,6 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
endif
# Enforce dependencies for composite images
-docker-image-debian9-mxe: docker-image-debian9
ifeq ($(HOST_ARCH),x86_64)
docker-image-debian-amd64: docker-image-debian10
DOCKER_PARTIAL_IMAGES += debian-amd64-cross
@@ -104,8 +102,6 @@ else
docker-image-debian-amd64-cross: docker-image-debian10
DOCKER_PARTIAL_IMAGES += debian-amd64
endif
-docker-image-debian-win32-cross: docker-image-debian9-mxe
-docker-image-debian-win64-cross: docker-image-debian9-mxe
# For non-x86 hosts not all cross-compilers have been packaged
ifneq ($(HOST_ARCH),x86_64)
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] tests/docker: Remove the remainders of debian9 containers from the Makefile
2020-12-15 8:33 [PATCH] tests/docker: Remove the remainders of debian9 containers from the Makefile Thomas Huth
@ 2020-12-15 15:24 ` Wainer dos Santos Moschetta
2020-12-16 11:04 ` Alex Bennée
1 sibling, 0 replies; 3+ messages in thread
From: Wainer dos Santos Moschetta @ 2020-12-15 15:24 UTC (permalink / raw)
To: Thomas Huth, qemu-devel; +Cc: Alex Bennée, Philippe Mathieu-Daudé
On 12/15/20 5:33 AM, Thomas Huth wrote:
> The Debian 9 containers have been removed a while ago, so we can
> delete the corresponding entries in the Makefile, too.
>
> Fixes: e3755276d1 ("tests/docker: Remove old Debian 9 containers")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> tests/docker/Makefile.include | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 02ec92830b..c254ac38d0 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -11,8 +11,7 @@ HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m))
> DOCKER_SUFFIX := .docker
> DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
> # we don't run tests on intermediate images (used as base by another image)
> -DOCKER_PARTIAL_IMAGES := debian9 debian10 debian11
> -DOCKER_PARTIAL_IMAGES += debian9-mxe debian-bootstrap
> +DOCKER_PARTIAL_IMAGES := debian10 debian11 debian-bootstrap
> DOCKER_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
> @@ -96,7 +95,6 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
> endif
>
> # Enforce dependencies for composite images
> -docker-image-debian9-mxe: docker-image-debian9
> ifeq ($(HOST_ARCH),x86_64)
> docker-image-debian-amd64: docker-image-debian10
> DOCKER_PARTIAL_IMAGES += debian-amd64-cross
> @@ -104,8 +102,6 @@ else
> docker-image-debian-amd64-cross: docker-image-debian10
> DOCKER_PARTIAL_IMAGES += debian-amd64
> endif
> -docker-image-debian-win32-cross: docker-image-debian9-mxe
> -docker-image-debian-win64-cross: docker-image-debian9-mxe
>
> # For non-x86 hosts not all cross-compilers have been packaged
> ifneq ($(HOST_ARCH),x86_64)
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] tests/docker: Remove the remainders of debian9 containers from the Makefile
2020-12-15 8:33 [PATCH] tests/docker: Remove the remainders of debian9 containers from the Makefile Thomas Huth
2020-12-15 15:24 ` Wainer dos Santos Moschetta
@ 2020-12-16 11:04 ` Alex Bennée
1 sibling, 0 replies; 3+ messages in thread
From: Alex Bennée @ 2020-12-16 11:04 UTC (permalink / raw)
To: Thomas Huth; +Cc: Philippe Mathieu-Daudé, qemu-devel
Thomas Huth <thuth@redhat.com> writes:
> The Debian 9 containers have been removed a while ago, so we can
> delete the corresponding entries in the Makefile, too.
>
> Fixes: e3755276d1 ("tests/docker: Remove old Debian 9 containers")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Queued to pr/161220-testing-1, thanks.
--
Alex Bennée
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-16 11:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-15 8:33 [PATCH] tests/docker: Remove the remainders of debian9 containers from the Makefile Thomas Huth
2020-12-15 15:24 ` Wainer dos Santos Moschetta
2020-12-16 11:04 ` Alex Bennée
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).