On 9/10/26 11:14 AM, Alex Bennée wrote:
With the meson changes we now build the images directly by calling
docker.py. However the Makefile.include builds prefix all the images
with qemu/:

   # General rule for building docker images.
   docker-image-%: $(DOCKER_FILES_DIR)/%.docker
             $(call quiet-command,                      \
                   DOCKER_BUILDKIT=1 $(CONTAINER_COMMAND) build \
                   $(if $(DOCKER_V),,--quiet)           \
                   $(if $(NOCACHE),--no-cache,          \
                           $(if $(DOCKER_REGISTRY),--cache-from 
$(DOCKER_REGISTRY)/qemu/$*)) \
                   --build-arg BUILDKIT_INLINE_CACHE=1  \
                   $(if $(NOUSER),,                     \
                           --build-arg USER=$(USER)     \
                           --build-arg UID=$(UID))              \
                   -t qemu/$* - < $< $(if $(DOCKER_V),,> /dev/null),\
                   "BUILD", $*)

So to ensure we don't end up building every container twice make sure
the naming conventions line up.

Signed-off-by: Alex Bennée <[email protected]>
---
  tests/tcg/meson.build | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)


Reviewed-by: Pierrick Bouvier <[email protected]>

Reply via email to