[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/5] docker: allow running from srcdir != builddir bu
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 3/5] docker: allow running from srcdir != builddir build |
Date: |
Fri, 20 Oct 2017 14:32:17 +0800 |
From: Paolo Bonzini <address@hidden>
The new script uses "git submodule", which is picky about being invoked
from the top of the git checkout. Invoke the script from $(SRC_PATH)
to avoid git's wrath.
Fixes: b7f404201e45e99da23b9764dec27ce5f965cdcd
Cc: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
tests/docker/Makefile.include | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 38874ec03d..02cd520590 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -18,11 +18,11 @@ TESTS ?= %
IMAGES ?= %
CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$)
-DOCKER_SRC_COPY := docker-src.$(CUR_TIME)
+DOCKER_SRC_COPY := $(BUILD_DIR)/docker-src.$(CUR_TIME)
$(DOCKER_SRC_COPY):
@mkdir $@
- $(call quiet-command, $(SRC_PATH)/scripts/archive-source.sh
$@/qemu.tar, \
+ $(call quiet-command, cd $(SRC_PATH) && scripts/archive-source.sh
$@/qemu.tar, \
"GEN", "$@/qemu.tar")
$(call quiet-command, cp $(SRC_PATH)/tests/docker/run $@/run, \
"COPY","RUNNER")
--
2.13.5
- [Qemu-devel] [PULL 0/5] Docker patches, Fam Zheng, 2017/10/20
- [Qemu-devel] [PULL 2/5] docker: cleanup temp directory after test, Fam Zheng, 2017/10/20
- [Qemu-devel] [PULL 1/5] docker: Don't allocate tty unless DEBUG=1, Fam Zheng, 2017/10/20
- [Qemu-devel] [PULL 3/5] docker: allow running from srcdir != builddir build,
Fam Zheng <=
- [Qemu-devel] [PULL 4/5] docker: fix out-of-tree 'make address@hidden', Fam Zheng, 2017/10/20
- [Qemu-devel] [PULL 5/5] docker: Fix PATH for ccache, Fam Zheng, 2017/10/20
- Re: [Qemu-devel] [PULL 0/5] Docker patches, Peter Maydell, 2017/10/20