[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [PATCH for 4.6] 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>
Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 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


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.