[Xen-changelog] [xen master] build: fix tarball stubdom build

[patchbot@xxxxxxx]

commit 0cc73e9870a96e18fc076618c0b419919794ae06
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Thu Aug 27 16:54:01 2015 +0100
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Thu Aug 27 18:59:11 2015 +0100

    build: fix tarball stubdom build
    
    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 <wei.liu2@xxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 Makefile |   10 ++++++----
 1 files 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
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog