From: George Dunlap <george.dunlap@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: george.dunlap@eu.citrix.com
Subject: [PATCH] build: Don't fetch tools/ioemu-dir unless needed
Date: Fri, 6 May 2011 15:33:30 +0100 [thread overview]
Message-ID: <c3b9bca4b119b66f0c47.1304692410@elijah> (raw)
c/s 18482 made both stubdom and tools dependent on tools/ioemu-dir
to fix a race condition where both build paths might try to fetch
qemu in parallel. But this means that even if you build the tools
with CONFIG_IOEMU=n, qemu is still fetched first.
This patch causes tools/ioemu-dir to be a dependency for tools
only if CONFIG_IOEMU is enabled.
It's still unconditional for stubdoms, as it doesn't make much sense
to build stubdoms without it.
Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
diff -r 4b0692880dfa -r c3b9bca4b119 Config.mk
--- a/Config.mk Thu May 05 17:40:34 2011 +0100
+++ b/Config.mk Fri May 06 15:33:09 2011 +0100
@@ -179,6 +179,11 @@
# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
+# If building with CONFIG_IOEMU, get ioemu-dir before building
+# tools or stubdom (or they may race)
+SHARED_SUBDIRS-y :=
+SHARED_SUBDIRS-$(CONFIG_IOEMU) += tools/ioemu-dir
+
QEMU_TAG := xen-4.1.0-rc6
#QEMU_TAG ?= e073e69457b4d99b6da0b6536296e3498f7f6599
# Fri Feb 11 17:54:51 2011 +0000
diff -r 4b0692880dfa -r c3b9bca4b119 Makefile
--- a/Makefile Thu May 05 17:40:34 2011 +0100
+++ b/Makefile Fri May 06 15:33:09 2011 +0100
@@ -66,7 +66,7 @@
$(MAKE) -C xen install
.PHONY: install-tools
-install-tools: tools/ioemu-dir
+install-tools: $(SHARED_SUBDIRS-y)
$(MAKE) -C tools install
.PHONY: install-kernels
@@ -74,6 +74,7 @@
for i in $(XKERNELS) ; do $(MAKE) $$i-install || exit 1; done
.PHONY: install-stubdom
+# NB: depend on tools/ioemu-dir unconditionally for stubdoms
install-stubdom: tools/ioemu-dir install-tools
$(MAKE) -C stubdom install
ifeq (x86_64,$(XEN_TARGET_ARCH))
next reply other threads:[~2011-05-06 14:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-06 14:33 George Dunlap [this message]
2011-05-06 14:41 ` [PATCH] build: Don't fetch tools/ioemu-dir unless needed Jan Beulich
-- strict thread matches above, loose matches on Subject: below --
2011-05-16 10:58 George Dunlap
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=c3b9bca4b119b66f0c47.1304692410@elijah \
--to=george.dunlap@eu.citrix.com \
--cc=xen-devel@lists.xensource.com \
/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).