* [Qemu-devel] [PATCH] docker: Fix git-archive for submodules
@ 2016-06-03 8:42 Fam Zheng
2016-06-03 9:22 ` Jason Wang
2016-06-06 13:43 ` Paolo Bonzini
0 siblings, 2 replies; 3+ messages in thread
From: Fam Zheng @ 2016-06-03 8:42 UTC (permalink / raw)
To: qemu-devel; +Cc: Fam Zheng, pbonzini, jasowang
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 <famz@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] docker: Fix git-archive for submodules
2016-06-03 8:42 [Qemu-devel] [PATCH] docker: Fix git-archive for submodules Fam Zheng
@ 2016-06-03 9:22 ` Jason Wang
2016-06-06 13:43 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Jason Wang @ 2016-06-03 9:22 UTC (permalink / raw)
To: Fam Zheng, qemu-devel; +Cc: pbonzini
On 2016年06月03日 16:42, Fam Zheng wrote:
> 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 <famz@redhat.com>
> ---
> 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 $@
Tested-by: Jason Wang <jasowang@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] docker: Fix git-archive for submodules
2016-06-03 8:42 [Qemu-devel] [PATCH] docker: Fix git-archive for submodules Fam Zheng
2016-06-03 9:22 ` Jason Wang
@ 2016-06-06 13:43 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2016-06-06 13:43 UTC (permalink / raw)
To: Fam Zheng, qemu-devel; +Cc: jasowang
On 03/06/2016 10:42, Fam Zheng wrote:
> 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 <famz@redhat.com>
> ---
> 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 $@
>
Good, another possibility is to use "> $2" instead of "-o $2" in
git-archive. I was going to send a patch now for this possibility, you
can choose the one you prefer.
Thanks,
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-06-06 13:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-03 8:42 [Qemu-devel] [PATCH] docker: Fix git-archive for submodules Fam Zheng
2016-06-03 9:22 ` Jason Wang
2016-06-06 13:43 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).