From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47607) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9uoi-0004Km-2H for qemu-devel@nongnu.org; Mon, 06 Jun 2016 09:43:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9uod-00027M-VY for qemu-devel@nongnu.org; Mon, 06 Jun 2016 09:43:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37348) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9uod-00027B-Pj for qemu-devel@nongnu.org; Mon, 06 Jun 2016 09:43:39 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 49E5463E21 for ; Mon, 6 Jun 2016 13:43:39 +0000 (UTC) References: <1464943364-32199-1-git-send-email-famz@redhat.com> From: Paolo Bonzini Message-ID: <13a9a3d7-09e0-80f8-ca05-80681dbad69b@redhat.com> Date: Mon, 6 Jun 2016 15:43:33 +0200 MIME-Version: 1.0 In-Reply-To: <1464943364-32199-1-git-send-email-famz@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] docker: Fix git-archive for submodules List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng , qemu-devel@nongnu.org Cc: jasowang@redhat.com 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 > --- > 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