xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH for 4.6] build: fix tarball stubdom build
@ 2015-08-27 15:54 Wei Liu
  2015-08-27 16:05 ` Jan Beulich
  2015-08-27 17:58 ` Ian Jackson
  0 siblings, 2 replies; 10+ messages in thread
From: Wei Liu @ 2015-08-27 15:54 UTC (permalink / raw)
  To: Xen-devel; +Cc: Ian Jackson, Wei Liu, Ian Campbell

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>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 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

^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2015-09-04 13:54 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-27 15:54 [PATCH for 4.6] build: fix tarball stubdom build Wei Liu
2015-08-27 16:05 ` Jan Beulich
2015-08-27 16:24   ` Wei Liu
2015-08-28  6:41     ` Jan Beulich
2015-08-28  8:47       ` Wei Liu
2015-08-28  9:49         ` Jan Beulich
2015-08-28  9:55           ` Wei Liu
2015-08-27 17:58 ` Ian Jackson
2015-09-04 13:48   ` Doug Goldstein
2015-09-04 13:54     ` Ian Campbell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).