From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>,
Wei Liu <wei.liu2@citrix.com>,
Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH for 4.6] build: fix tarball stubdom build
Date: Thu, 27 Aug 2015 16:54:01 +0100 [thread overview]
Message-ID: <1440690841-10076-1-git-send-email-wei.liu2@citrix.com> (raw)
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
next reply other threads:[~2015-08-27 15:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-27 15:54 Wei Liu [this message]
2015-08-27 16:05 ` [PATCH for 4.6] build: fix tarball stubdom build 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440690841-10076-1-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).