[Qemu-devel] [PATCH 1/6] tests/docker: fix make-archive-maybe

[Paolo Bonzini]

make-archive-maybe expects an archive path relative
to $1, but receives a path relative to the current directory.  Redirect
the output outside the subshell to bypass the "cd $1".

Signed-off-by: Paolo Bonzini <address@hidden>
---
 tests/docker/Makefile.include | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 2fd2ca3..d0ad36c 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -21,10 +21,10 @@ IMAGES ?= %
 make-archive-maybe = $(if $(wildcard $1/*), \
        $(call quiet-command, \
                (cd $1; if git diff-index --quiet HEAD -- &>/dev/null; then \
-                       git archive -1 HEAD --format=tar.gz -o $2; \
+                       git archive -1 HEAD --format=tar.gz; \
                else \
-                       git archive -1 $$(git stash create) --format=tar.gz -o 
$2; \
-               fi), \
+                       git archive -1 $$(git stash create) --format=tar.gz; \
+               fi) > $2, \
                "  ARCHIVE $(notdir $2)"))
 
 CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$)
-- 
1.8.3.1