From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org, richard.henderson@linaro.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
qemu-devel@nongnu.org,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL 11/25] tests/docker: do not duplicate rules for hexagon-cross
Date: Wed, 20 Apr 2022 19:08:18 +0100 [thread overview]
Message-ID: <20220420180832.3812543-12-alex.bennee@linaro.org> (raw)
In-Reply-To: <20220420180832.3812543-1-alex.bennee@linaro.org>
From: Paolo Bonzini <pbonzini@redhat.com>
The commands for docker-image-debian-hexagon-cross are the same as those
in debian-toolchain-run, just with a nonstandard path to build-toolchain.sh.
Reuse the definition by renaming the debian-hexagon-cross.docker.d directory.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220401141326.1244422-9-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220419091020.3008144-12-alex.bennee@linaro.org>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 2a187cb5a2..eb100c294f 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -121,28 +121,6 @@ docker-image-debian11: NOUSER=1
# alpine has no adduser
docker-image-alpine: NOUSER=1
-#
-# The build rule for hexagon-cross is special in so far for most of
-# the time we don't want to build it. While dockers caching does avoid
-# this most of the time sometimes we want to force the issue.
-#
-docker-image-debian-hexagon-cross: $(DOCKER_FILES_DIR)/debian-hexagon-cross.docker
- $(if $(NOCACHE), \
- $(call quiet-command, \
- $(DOCKER_SCRIPT) build -t qemu/debian-hexagon-cross -f $< \
- $(if $V,,--quiet) --no-cache \
- --registry $(DOCKER_REGISTRY) --extra-files \
- $(DOCKER_FILES_DIR)/debian-hexagon-cross.docker.d/build-toolchain.sh, \
- "BUILD", "debian-hexagon-cross"), \
- $(call quiet-command, \
- $(DOCKER_SCRIPT) fetch $(if $V,,--quiet) \
- qemu/debian-hexagon-cross $(DOCKER_REGISTRY), \
- "FETCH", "debian-hexagon-cross") \
- $(call quiet-command, \
- $(DOCKER_SCRIPT) update $(if $V,,--quiet) \
- qemu/debian-hexagon-cross --add-current-user, \
- "PREPARE", "debian-hexagon-cross"))
-
debian-toolchain-run = \
$(if $(NOCACHE), \
$(call quiet-command, \
@@ -162,6 +140,10 @@ debian-toolchain-run = \
"PREPARE", $1))
debian-toolchain = $(call debian-toolchain-run,$(patsubst docker-image-%,%,$1))
+docker-image-debian-hexagon-cross: $(DOCKER_FILES_DIR)/debian-hexagon-cross.docker \
+ $(DOCKER_FILES_DIR)/debian-hexagon-cross.d/build-toolchain.sh
+ $(call debian-toolchain, $@)
+
docker-image-debian-microblaze-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \
$(DOCKER_FILES_DIR)/debian-microblaze-cross.d/build-toolchain.sh
$(call debian-toolchain, $@)
diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh b/tests/docker/dockerfiles/debian-hexagon-cross.d/build-toolchain.sh
similarity index 100%
rename from tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh
rename to tests/docker/dockerfiles/debian-hexagon-cross.d/build-toolchain.sh
--
2.30.2
next prev parent reply other threads:[~2022-04-20 19:08 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-20 18:08 [PULL 00/25] Various testing, doc and gdbstub fixes Alex Bennée
2022-04-20 18:08 ` [PULL 01/25] tests/avocado: update aarch64_virt test to exercise -cpu max Alex Bennée
2022-04-20 18:08 ` [PULL 02/25] docs/devel: add some notes on the binfmt-image-debian targets Alex Bennée
2022-04-20 18:08 ` [PULL 03/25] docs/devel: drop :hidden: and :includehidden: tags Alex Bennée
2022-04-20 18:08 ` [PULL 04/25] tests/docker: remove dead code for linux-user containers Alex Bennée
2022-04-20 18:08 ` [PULL 05/25] tests/docker: remove test targets Alex Bennée
2022-04-20 18:08 ` [PULL 06/25] tests/docker: remove dead variable Alex Bennée
2022-04-20 18:08 ` [PULL 07/25] tests/docker: remove unnecessary default definitions Alex Bennée
2022-04-20 18:08 ` [PULL 08/25] tests/docker: inline variable definitions or move close to use Alex Bennée
2022-04-20 18:08 ` [PULL 09/25] tests/docker: remove unnecessary filtering of $(DOCKER_IMAGES) Alex Bennée
2022-04-20 18:08 ` [PULL 10/25] tests/docker: simplify docker-TEST@IMAGE targets Alex Bennée
2022-04-20 18:08 ` Alex Bennée [this message]
2022-04-20 18:08 ` [PULL 12/25] tests/tcg: add compiler test variables when using containers Alex Bennée
2022-04-20 18:08 ` [PULL 13/25] tests/tcg: remove CONFIG_LINUX_USER from config-target.mak Alex Bennée
2022-04-20 18:08 ` [PULL 14/25] tests/tcg: remove CONFIG_USER_ONLY " Alex Bennée
2022-04-20 18:08 ` [PULL 15/25] tests/tcg: prepare Makefile.prereqs at configure time Alex Bennée
2022-04-20 18:08 ` [PULL 16/25] tests/tcg: list test targets in Makefile.prereqs Alex Bennée
2022-04-20 18:08 ` [PULL 17/25] tests/tcg: invoke Makefile.target directly from QEMU's makefile Alex Bennée
2022-04-20 18:08 ` [PULL 18/25] tests/tcg: isolate from QEMU's config-host.mak Alex Bennée
2022-04-20 18:08 ` [PULL 19/25] tests/docker: remove SKIP_DOCKER_BUILD Alex Bennée
2022-04-20 18:08 ` [PULL 20/25] tests/tcg: fix non-static build Alex Bennée
2022-04-20 18:08 ` [PULL 21/25] tests/tcg: remove duplicate sha512-sse case Alex Bennée
2022-04-20 18:08 ` [PULL 22/25] tests/tcg: add float_convd test Alex Bennée
2022-04-20 18:08 ` [PULL 23/25] tests/tcg: add missing reference files for float_convs Alex Bennée
2022-04-20 18:08 ` [PULL 24/25] target/i386: fix byte swap issue with XMM register access Alex Bennée
2022-04-20 18:08 ` [PULL 25/25] tests/guest-debug: better handle gdb crashes Alex Bennée
2022-04-20 19:46 ` [PULL 00/25] Various testing, doc and gdbstub fixes Richard Henderson
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=20220420180832.3812543-12-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=f4bug@amsat.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).