This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


[Xen-devel] [PATCH] [PATCH v2] build: Don't fetch tools/ioemu-dir unless

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH] [PATCH v2] build: Don't fetch tools/ioemu-dir unless needed
From: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
Date: Mon, 9 May 2011 12:48:07 +0100
Cc: george.dunlap@xxxxxxxxxxxxx
Delivery-date: Mon, 09 May 2011 04:44:22 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mercurial-patchbomb/1.4.3
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@xxxxxxxxxxxxx>

diff -r 4b0692880dfa -r cf5d1c7bbbfd Makefile
--- a/Makefile  Thu May 05 17:40:34 2011 +0100
+++ b/Makefile  Mon May 09 12:44:09 2011 +0100
@@ -13,6 +13,11 @@ SUBARCH := $(subst x86_32,i386,$(XEN_TAR
 include buildconfigs/Rules.mk
+# If building with CONFIG_IOEMU, get ioemu-dir before building
+# tools or stubdom (or they may race)
+SHARED_SUBDIRS-$(CONFIG_IOEMU) += tools/ioemu-dir
 # build and install everything into the standard system directories
 .PHONY: install
 install: install-xen install-kernels install-tools install-stubdom install-docs
@@ -66,7 +71,7 @@ install-xen:
        $(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 +79,7 @@ install-kernels:
        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))

Xen-devel mailing list

<Prev in Thread] Current Thread [Next in Thread>