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

[Xen-changelog] [xen master] tools/hotplug: Removing of "all" dependency from "install" rule.



commit e47df5f77bf50c50db6d7901a913003d4e8aa421
Author:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
AuthorDate: Mon Oct 13 15:31:36 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Tue Oct 14 10:03:12 2014 +0100

    tools/hotplug: Removing of "all" dependency from "install" rule.
    
    The "install" rules depends on both "all" and "subdirs-install" and
    "all" depends on "subdirs-all". This leads the "install" rules to call
    both "subdirs-all" and "subdirs-install" which create a race with two
    concurrent `make` within the same directory (systemd) trying to make the
    same things (xen.conf) and failing.
    
    Ultimatly, "install" should only depend on the things it needs to
    install, and not on "all".
    
    Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
    Tested-by: Olaf Hering <olaf@xxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 tools/hotplug/FreeBSD/Makefile |    2 +-
 tools/hotplug/Linux/Makefile   |    2 +-
 tools/hotplug/NetBSD/Makefile  |    2 +-
 tools/hotplug/common/Makefile  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/hotplug/FreeBSD/Makefile b/tools/hotplug/FreeBSD/Makefile
index 169a124..6aba64a 100644
--- a/tools/hotplug/FreeBSD/Makefile
+++ b/tools/hotplug/FreeBSD/Makefile
@@ -15,7 +15,7 @@ all:
 build:
 
 .PHONY: install
-install: all install-scripts install-rcd
+install: install-scripts install-rcd
 
 .PHONY: install-scripts
 install-scripts:
diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile
index 8cdaa9a..1706c05 100644
--- a/tools/hotplug/Linux/Makefile
+++ b/tools/hotplug/Linux/Makefile
@@ -43,7 +43,7 @@ all: subdirs-all
 build:
 
 .PHONY: install
-install: all install-initd install-scripts install-udev subdirs-install
+install: install-initd install-scripts install-udev subdirs-install
 
 # See docs/misc/distro_mapping.txt for INITD_DIR location
 .PHONY: install-initd
diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile
index 9084859..0a370b8 100644
--- a/tools/hotplug/NetBSD/Makefile
+++ b/tools/hotplug/NetBSD/Makefile
@@ -17,7 +17,7 @@ all:
 build:
 
 .PHONY: install
-install: all install-scripts install-rcd
+install: install-scripts install-rcd
 
 .PHONY: install-scripts
 install-scripts:
diff --git a/tools/hotplug/common/Makefile b/tools/hotplug/common/Makefile
index 657a8e3..5623abb 100644
--- a/tools/hotplug/common/Makefile
+++ b/tools/hotplug/common/Makefile
@@ -19,7 +19,7 @@ all: build
 build: $(HOTPLUGPATH)
 
 .PHONY: install
-install: all install-scripts
+install: install-scripts
 
 .PHONY: install-scripts
 install-scripts: build
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
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®.