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

[Xen-changelog] [xen-unstable] Avoid parallel invocation of git for ioemu-remote.



# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1221495043 -3600
# Node ID 087008dfb00504f8d38ee48e197ea1dc8e5cb203
# Parent  75c4a603d9cd7f73366986261e1078fce1ead815
Avoid parallel invocation of git for ioemu-remote.

The stubdom and tools directories both run `make ioemu-dir-find' in
tools.  In a parallel build, both these invocations can run
concurrently because we're doing recursive make.

This change fixes this problem by adding a suitable dependencies in
the top-level Makefile for the recursion into tools/ and stubdom/,
ensuring that the git fetch happens once, first.

The bug was introduced in 18472/18474.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 Makefile |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff -r 75c4a603d9cd -r 087008dfb005 Makefile
--- a/Makefile  Mon Sep 15 15:44:38 2008 +0100
+++ b/Makefile  Mon Sep 15 17:10:43 2008 +0100
@@ -64,7 +64,7 @@ install-xen:
        $(MAKE) -C xen install
 
 .PHONY: install-tools
-install-tools:
+install-tools: tools/ioemu-dir
        $(MAKE) -C tools install
 
 .PHONY: install-kernels
@@ -72,11 +72,14 @@ install-kernels:
        for i in $(XKERNELS) ; do $(MAKE) $$i-install || exit 1; done
 
 .PHONY: install-stubdom
-install-stubdom:
+install-stubdom: tools/ioemu-dir
        $(MAKE) -C stubdom install
 ifeq (x86_64,$(XEN_TARGET_ARCH))
        XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub
 endif
+
+tools/ioemu-dir:
+       make -C tools ioemu-dir-find
 
 .PHONY: install-docs
 install-docs:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog


 


Rackspace

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