[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/17] tests/docker: do not duplicate rules for hexagon-cross
From: |
Paolo Bonzini |
Subject: |
[PATCH 08/17] tests/docker: do not duplicate rules for hexagon-cross |
Date: |
Fri, 1 Apr 2022 16:13:17 +0200 |
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>
---
tests/docker/Makefile.include | 26 +++----------------
.../build-toolchain.sh | 0
2 files changed, 4 insertions(+), 22 deletions(-)
rename tests/docker/dockerfiles/{debian-hexagon-cross.docker.d =>
debian-hexagon-cross.d}/build-toolchain.sh (100%)
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.35.1
- [PATCH 01/17] tests/docker: remove dead code for linux-user containers, (continued)
- [PATCH 01/17] tests/docker: remove dead code for linux-user containers, Paolo Bonzini, 2022/04/01
- [PATCH 02/17] tests/docker: remove test targets, Paolo Bonzini, 2022/04/01
- [PATCH 03/17] tests/docker: remove dead variable, Paolo Bonzini, 2022/04/01
- [PATCH 04/17] tests/docker: remove unnecessary default definitions, Paolo Bonzini, 2022/04/01
- [PATCH 06/17] tests/docker: remove unnecessary filtering of $(DOCKER_IMAGES), Paolo Bonzini, 2022/04/01
- [PATCH 05/17] tests/docker: inline variable definitions or move close to use, Paolo Bonzini, 2022/04/01
- [PATCH 07/17] tests/docker: simplify docker-TEST@IMAGE targets, Paolo Bonzini, 2022/04/01
- [PATCH 09/17] tests/tcg: add compiler test variables when using containers, Paolo Bonzini, 2022/04/01
- [PATCH 10/17] tests/tcg: remove CONFIG_LINUX_USER from config-target.mak, Paolo Bonzini, 2022/04/01
- [PATCH 11/17] tests/tcg: remove CONFIG_USER_ONLY from config-target.mak, Paolo Bonzini, 2022/04/01
- [PATCH 08/17] tests/docker: do not duplicate rules for hexagon-cross,
Paolo Bonzini <=
- [PATCH 12/17] tests/tcg: prepare Makefile.prereqs at configure time, Paolo Bonzini, 2022/04/01
- [PATCH 13/17] tests/tcg: list test targets in Makefile.prereqs, Paolo Bonzini, 2022/04/01
- [PATCH 15/17] tests/tcg: isolate from QEMU's config-host.mak, Paolo Bonzini, 2022/04/01
- [PATCH 16/17] tests/docker: remove SKIP_DOCKER_BUILD, Paolo Bonzini, 2022/04/01
- [PATCH 17/17] tests/tcg: fix non-static build, Paolo Bonzini, 2022/04/01
- [PATCH 14/17] tests/tcg: invoke Makefile.target directly from QEMU's makefile, Paolo Bonzini, 2022/04/01
- Re: [PATCH 00/17] tests/docker and tests/tcg cleanup and diet, Alex Bennée, 2022/04/11