From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8lJQ-0004X5-Il for qemu-devel@nongnu.org; Fri, 03 Jun 2016 05:22:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8lJI-0000Vb-Vd for qemu-devel@nongnu.org; Fri, 03 Jun 2016 05:22:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8lJI-0000VX-QB for qemu-devel@nongnu.org; Fri, 03 Jun 2016 05:22:32 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 022C4C049D5A for ; Fri, 3 Jun 2016 09:22:32 +0000 (UTC) References: <1464943364-32199-1-git-send-email-famz@redhat.com> From: Jason Wang Message-ID: <57514C53.90304@redhat.com> Date: Fri, 3 Jun 2016 17:22:27 +0800 MIME-Version: 1.0 In-Reply-To: <1464943364-32199-1-git-send-email-famz@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable 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: pbonzini@redhat.com On 2016=E5=B9=B406=E6=9C=8803=E6=97=A5 16:42, Fam Zheng wrote: > If dtc or pixman submodule is initialized, "git archive" in the subshel= l > 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.incl= ude > index 2fd2ca3..3788cd8 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -29,7 +29,7 @@ make-archive-maybe =3D $(if $(wildcard $1/*), \ > =20 > CUR_TIME :=3D $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) > # Makes the definition constant after the first expansion > -DOCKER_SRC_COPY =3D $(eval DOCKER_SRC_COPY :=3D docker-src.$(CUR_TIME)= )$(DOCKER_SRC_COPY) > +DOCKER_SRC_COPY =3D $(eval DOCKER_SRC_COPY :=3D $(CURDIR)/docker-src.$= (CUR_TIME))$(DOCKER_SRC_COPY) > =20 > $(DOCKER_SRC_COPY): > @mkdir $@ Tested-by: Jason Wang