From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Fam Zheng <famz@redhat.com>, pbonzini@redhat.com, jasowang@redhat.com
Subject: [Qemu-devel] [PATCH] docker: Fix git-archive for submodules
Date: Fri, 3 Jun 2016 16:42:44 +0800 [thread overview]
Message-ID: <1464943364-32199-1-git-send-email-famz@redhat.com> (raw)
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
next reply other threads:[~2016-06-03 8:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-03 8:42 Fam Zheng [this message]
2016-06-03 9:22 ` [Qemu-devel] [PATCH] docker: Fix git-archive for submodules Jason Wang
2016-06-06 13:43 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464943364-32199-1-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=jasowang@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).