ia64/xen-unstable

changeset 18496:087008dfb005

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@eu.citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Sep 15 17:10:43 2008 +0100 (2008-09-15)
parents 75c4a603d9cd
children 087b8b29b6b2
files Makefile
line diff
     1.1 --- a/Makefile	Mon Sep 15 15:44:38 2008 +0100
     1.2 +++ b/Makefile	Mon Sep 15 17:10:43 2008 +0100
     1.3 @@ -64,7 +64,7 @@ install-xen:
     1.4  	$(MAKE) -C xen install
     1.5  
     1.6  .PHONY: install-tools
     1.7 -install-tools:
     1.8 +install-tools: tools/ioemu-dir
     1.9  	$(MAKE) -C tools install
    1.10  
    1.11  .PHONY: install-kernels
    1.12 @@ -72,12 +72,15 @@ install-kernels:
    1.13  	for i in $(XKERNELS) ; do $(MAKE) $$i-install || exit 1; done
    1.14  
    1.15  .PHONY: install-stubdom
    1.16 -install-stubdom:
    1.17 +install-stubdom: tools/ioemu-dir
    1.18  	$(MAKE) -C stubdom install
    1.19  ifeq (x86_64,$(XEN_TARGET_ARCH))
    1.20  	XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub
    1.21  endif
    1.22  
    1.23 +tools/ioemu-dir:
    1.24 +	make -C tools ioemu-dir-find
    1.25 +
    1.26  .PHONY: install-docs
    1.27  install-docs:
    1.28  	sh ./docs/check_pkgs && $(MAKE) -C docs install || true