1. Patchew
  2. QEMU
  3. View series

[PATCH] tests/docker: Remove the remainders of debian9 containers from the Makefile

Thomas Huth posted 1 patch 4 years, 11 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20201215083318.92205-1-thuth@redhat.com
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, Fam Zheng <fam@euphon.net>
tests/docker/Makefile.include | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
[PATCH] tests/docker: Remove the remainders of debian9 containers from the Makefile
Posted by Thomas Huth 4 years, 11 months ago 
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
Re: [PATCH] tests/docker: Remove the remainders of debian9 containers from the Makefile
Posted by Wainer dos Santos Moschetta 4 years, 11 months ago 
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)
Re: [PATCH] tests/docker: Remove the remainders of debian9 containers from the Makefile
Posted by Alex Bennée 4 years, 11 months ago 
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

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.