From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Fam Zheng" <fam@euphon.net>, "Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 10/11] tests/docker: Remove the remainders of debian9 containers from the Makefile
Date: Wed, 16 Dec 2020 16:48:26 +0000 [thread overview]
Message-ID: <20201216164827.24457-11-alex.bennee@linaro.org> (raw)
In-Reply-To: <20201216164827.24457-1-alex.bennee@linaro.org>
From: Thomas Huth <thuth@redhat.com>
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>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20201215083318.92205-1-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
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.20.1
next prev parent reply other threads:[~2020-12-16 16:58 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-16 16:48 [PULL 00/11] testing and configure updates Alex Bennée
2020-12-16 16:48 ` [PULL 01/11] configure: include moxie-softmmu in deprecated_targets_list Alex Bennée
2020-12-16 16:48 ` [PULL 02/11] gitlab: include aarch64-softmmu and ppc64-softmmu cross-system-build Alex Bennée
2020-12-16 16:48 ` [PULL 03/11] configure: move gettext detection to meson.build Alex Bennée
2020-12-16 16:48 ` [PULL 04/11] configure: add --without-default-features Alex Bennée
2020-12-16 16:48 ` [PULL 05/11] python: add __repr__ to ConsoleSocket to aid debugging Alex Bennée
2020-12-16 16:48 ` [PULL 06/11] gitlab: move --without-default-devices build from Travis Alex Bennée
2020-12-16 16:48 ` [PULL 07/11] gitlab: add --without-default-features build Alex Bennée
2020-12-16 16:48 ` [PULL 08/11] tests/tcg: build tests with -Werror Alex Bennée
2020-12-16 16:48 ` [PULL 09/11] gitlab-CI: Test 32-bit builds with the fedora-i386-cross container Alex Bennée
2020-12-16 16:48 ` Alex Bennée [this message]
2020-12-16 16:48 ` [PULL 11/11] tests: update for rename of CentOS8 PowerTools repo Alex Bennée
2020-12-16 18:23 ` [PULL 00/11] testing and configure updates Alex Bennée
2020-12-16 18:57 ` Peter Maydell
2020-12-17 8:20 ` Alex Bennée
2020-12-17 9:40 ` Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201216164827.24457-11-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).