aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Hering <olaf@aepfle.de>2014-10-01 18:41:04 +0200
committerIan Campbell <ian.campbell@citrix.com>2014-10-06 15:50:58 +0100
commiteac3f5122fd4769b2885d8ad78bcbcf5df2472c1 (patch)
treea1ed56948da6606bacf16720cebb70d0d2c98dd8
parent3df671ec2603e8700665b62a29afe93d40f78457 (diff)
tools/hotplug: fix race during xen.conf creation
A make -j8 will call the xen.conf rule twice. The move-if-changed macro may fail if the tmp file was already removed by the other make process. Fix this by let the all target depend on install. Also remove the generated file with make clean. Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> [ ijc -- fixed s/of/if/ typo in commit message ]
-rw-r--r--tools/hotplug/Linux/systemd/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/hotplug/Linux/systemd/Makefile b/tools/hotplug/Linux/systemd/Makefile
index dc98b67367..90ba16e0f2 100644
--- a/tools/hotplug/Linux/systemd/Makefile
+++ b/tools/hotplug/Linux/systemd/Makefile
@@ -21,10 +21,11 @@ ALL_XEN_SYSTEMD = $(XEN_SYSTEMD_MODULES) \
$(XEN_SYSTEMD_SERVICE)
.PHONY: all
-all: $(ALL_XEN_SYSTEMD)
+all: install
.PHONY: clean
clean:
+ rm -f $(ALL_XEN_SYSTEMD)
.PHONY: install
install: $(ALL_XEN_SYSTEMD)