diff mbox series

[v2,10/12] tests/docker: fix binfmt_misc image building

Message ID 20200722062902.24509-11-alex.bennee@linaro.org
State Superseded
Headers show
Series candidate fixes for 5.1-rc1 (testing, semihosting, OOM tcg, x86 fpu) | expand

Commit Message

Alex Bennée July 22, 2020, 6:29 a.m. UTC 
When we updated the arguments for docker.py we missed a bit.

Fixes: dfae6284
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
 tests/docker/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.20.1

Comments

Philippe Mathieu-Daudé July 22, 2020, 6:35 a.m. UTC | #1 
On 7/22/20 8:29 AM, Alex Bennée wrote:
> When we updated the arguments for docker.py we missed a bit.

>


Oops.

> Fixes: dfae6284


Fixes: dfae628459 ("docker.py/build: support -t and -f arguments")

(see https://www.mail-archive.com/qemu-devel@nongnu.org/msg711059.html)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>  tests/docker/Makefile.include | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include

> index a104e9df281..9119dff97de 100644

> --- a/tests/docker/Makefile.include

> +++ b/tests/docker/Makefile.include

> @@ -78,7 +78,7 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker

>  			DEB_ARCH=$(DEB_ARCH)					\

>  			DEB_TYPE=$(DEB_TYPE) 					\

>  			$(if $(DEB_URL),DEB_URL=$(DEB_URL),)			\

> -			$(DOCKER_SCRIPT) build qemu/debian-$* $< 		\

> +			$(DOCKER_SCRIPT) build -t qemu/debian-$* -f $< 		\

>  			$(if $V,,--quiet) $(if $(NOCACHE),--no-cache) 		\

>  			$(if $(NOUSER),,--add-current-user) 			\

>  			$(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))	\

>
diff mbox series

Patch

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index a104e9df281..9119dff97de 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -78,7 +78,7 @@  docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
 			DEB_ARCH=$(DEB_ARCH)					\
 			DEB_TYPE=$(DEB_TYPE) 					\
 			$(if $(DEB_URL),DEB_URL=$(DEB_URL),)			\
-			$(DOCKER_SCRIPT) build qemu/debian-$* $< 		\
+			$(DOCKER_SCRIPT) build -t qemu/debian-$* -f $< 		\
 			$(if $V,,--quiet) $(if $(NOCACHE),--no-cache) 		\
 			$(if $(NOUSER),,--add-current-user) 			\
 			$(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))	\