From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8kgy-0001D7-UY for qemu-devel@nongnu.org; Fri, 03 Jun 2016 04:42:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8kgt-0008Hv-PZ for qemu-devel@nongnu.org; Fri, 03 Jun 2016 04:42:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51162) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8kgt-0008Hl-JH for qemu-devel@nongnu.org; Fri, 03 Jun 2016 04:42:51 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (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 163A781F07 for ; Fri, 3 Jun 2016 08:42:51 +0000 (UTC) From: Fam Zheng Date: Fri, 3 Jun 2016 16:42:44 +0800 Message-Id: <1464943364-32199-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH] docker: Fix git-archive for submodules List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Fam Zheng , pbonzini@redhat.com, jasowang@redhat.com 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 $@ -- 2.8.2