build: fix tarball stubdom build
authorWei Liu <wei.liu2@citrix.com>
Thu, 27 Aug 2015 15:54:01 +0000 (16:54 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 27 Aug 2015 17:59:11 +0000 (18:59 +0100)
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@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Makefile

index e8a75ffb66e44563541fb007f210e0ccc907703a..ba0df708d55730b983ee6eaf78d8cf0c07efce62 100644 (file)
--- 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