[Qemu-devel] [PATCH] docker: fix out-of-tree 'make docker-test-build@debian-powerpc-cross'

Greg Kurz posted 1 patch 6 years, 5 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/150841324224.31292.4012464539983692364.stgit@bahia.lan
Test checkpatch passed
Test docker passed
Test s390x passed
tests/docker/Makefile.include |    2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[Qemu-devel] [PATCH] docker: fix out-of-tree 'make docker-test-build@debian-powerpc-cross'
Posted by Greg Kurz 6 years, 5 months ago
Without this patch, it fails with:

IOError: [Errno 2] No such file or directory:
 'tests/docker/dockerfiles/debian-apt-fake.sh'

Signed-off-by: Greg Kurz <groug@kaod.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 6f9ea196a7b8..5d54eca5d0b3 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -44,7 +44,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker
 		$(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\
 		"BUILD","$*")
 
-docker-image-debian-powerpc-cross: EXTRA_FILES:=tests/docker/dockerfiles/debian-apt-fake.sh
+docker-image-debian-powerpc-cross: EXTRA_FILES:=$(SRC_PATH)/tests/docker/dockerfiles/debian-apt-fake.sh
 
 # Enforce dependancies for composite images
 docker-image-debian: docker-image-debian9


Re: [Qemu-devel] [Qemu-trivial] [PATCH] docker: fix out-of-tree 'make docker-test-build@debian-powerpc-cross'
Posted by Philippe Mathieu-Daudé 6 years, 5 months ago
On 10/19/2017 08:40 AM, Greg Kurz wrote:
> Without this patch, it fails with:
> 
> IOError: [Errno 2] No such file or directory:
>  'tests/docker/dockerfiles/debian-apt-fake.sh'

Yes, my bad :)

I have the same fix in my CI-WIP branch which sadly lacks of love.

> 
> Signed-off-by: Greg Kurz <groug@kaod.org>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.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 6f9ea196a7b8..5d54eca5d0b3 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -44,7 +44,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker
>  		$(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\
>  		"BUILD","$*")
>  
> -docker-image-debian-powerpc-cross: EXTRA_FILES:=tests/docker/dockerfiles/debian-apt-fake.sh
> +docker-image-debian-powerpc-cross: EXTRA_FILES:=$(SRC_PATH)/tests/docker/dockerfiles/debian-apt-fake.sh
>  
>  # Enforce dependancies for composite images
>  docker-image-debian: docker-image-debian9


Re: [Qemu-devel] [PATCH] docker: fix out-of-tree 'make docker-test-build@debian-powerpc-cross'
Posted by Fam Zheng 6 years, 5 months ago
On Thu, 10/19 13:40, Greg Kurz wrote:
> Without this patch, it fails with:
> 
> IOError: [Errno 2] No such file or directory:
>  'tests/docker/dockerfiles/debian-apt-fake.sh'
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>

Reasonable. Queued, thanks!

Fam