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@citrix.com>
Tested-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/tools/hotplug/FreeBSD/Makefile b/tools/hotplug/FreeBSD/Makefile
index 169a124c39de70f29fb60d7762f632813418795a..6aba64a3aeccb352aae53f9f365e7920f90edee9 100644 (file)
--- 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 8cdaa9a35b2fa2dc37a9ed51776bb84c937e97fb..1706c058ddaf7537c9d18e55646dc51cf0634fd4 100644 (file)
--- 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 908485939f588d766a1f6db7e4b571e5b35467ed..0a370b85f580ff4813b7008363099e596801d95c 100644 (file)
--- 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 657a8e309c91b48dc630d90998ab5f491ce0bb9d..5623abb23cb1719750ff4ed746b9e41490a164a6 100644 (file)
--- 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