qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH] docker: Fix git-archive for submodules


From: Fam Zheng
Subject: [Qemu-devel] [PATCH] docker: Fix git-archive for submodules
Date: Fri, 3 Jun 2016 16:42:44 +0800

If dtc or pixman submodule is initialized, "git archive" in the subshell
gets a relative filename against $(SRC_PATH), while we have already
cd'ed into the submodule directory.

Prefix it with $(CURDIR), which is the full path to the working
directory.

Signed-off-by: Fam Zheng <address@hidden>
---
 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 2fd2ca3..3788cd8 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -29,7 +29,7 @@ make-archive-maybe = $(if $(wildcard $1/*), \
 
 CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$)
 # Makes the definition constant after the first expansion
-DOCKER_SRC_COPY = $(eval DOCKER_SRC_COPY := 
docker-src.$(CUR_TIME))$(DOCKER_SRC_COPY)
+DOCKER_SRC_COPY = $(eval DOCKER_SRC_COPY := 
$(CURDIR)/docker-src.$(CUR_TIME))$(DOCKER_SRC_COPY)
 
 $(DOCKER_SRC_COPY):
        @mkdir $@
-- 
2.8.2




reply via email to

[Prev in Thread] Current Thread [Next in Thread]