From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH for 4.6] build: fix tarball stubdom build Date: Thu, 27 Aug 2015 16:54:01 +0100 Message-ID: <1440690841-10076-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUzVD-0000em-DI for xen-devel@lists.xenproject.org; Thu, 27 Aug 2015 15:54:11 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Ian Jackson , Wei Liu , Ian Campbell List-Id: xen-devel@lists.xenproject.org When we create a source code tarball, mini-os is extracted to extras/mini-os directory. When building a source code tarball, we shouldn't clone mini-os again. Only clone mini-os when that directory doesn't exist. This fixes tarball build and doesn't affect non-tarball build. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e8a75ff..ba0df70 100644 --- a/Makefile +++ b/Makefile @@ -19,10 +19,12 @@ include Config.mk .PHONY: mini-os-dir mini-os-dir: - GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh \ - $(MINIOS_UPSTREAM_URL) \ - $(MINIOS_UPSTREAM_REVISION) \ - $(XEN_ROOT)/extras/mini-os + if [ ! -d $(XEN_ROOT)/extras/mini-os ]; then \ + GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh \ + $(MINIOS_UPSTREAM_URL) \ + $(MINIOS_UPSTREAM_REVISION) \ + $(XEN_ROOT)/extras/mini-os ; \ + fi .PHONY: mini-os-dir-force-update mini-os-dir-force-update: mini-os-dir -- 2.1.4