[Xen-devel] [PATCH] tools/hotplug/Linux: Fix build

[Anthony PERARD <anthony.perard@xxxxxxxxxx>]

When building, it might happen that xen.conf in
tools/hotplug/Linux/systemd/Makefile is done twice, at the same time,
which leads to a not found file when calling move-if-changed.

Relevent part of an actual failed build:

make[6]: Entering directory 
'/build/xen-unstable/src/xen-unstable/tools/hotplug/Linux'
[...]
make -C systemd all
make -C systemd install
make[7]: Entering directory 
'/build/xen-unstable/src/xen-unstable/tools/hotplug/Linux/systemd'
make[7]: Entering directory 
'/build/xen-unstable/src/xen-unstable/tools/hotplug/Linux/systemd'
mv -f compat/.xlat/grant_table.h.new compat/.xlat/grant_table.h
rm -f xen.conf.tmp
for mod in xen-evtchn xen-gntdev xen-gntalloc xen-blkback xen-netback 
xen-pciback evtchn gntdev netbk blkbk xen-scsibk usbbk pciback 
xen-acpi-processor blktap2 blktap ; do \
  echo $mod ; \
  done > xen.conf.tmp
rm -f xen.conf.tmp
if ! cmp -s xen.conf.tmp xen.conf; then mv -f xen.conf.tmp xen.conf; else rm -f 
xen.conf.tmp; fi
for mod in xen-evtchn xen-gntdev xen-gntalloc xen-blkback xen-netback 
xen-pciback evtchn gntdev netbk blkbk xen-scsibk usbbk pciback 
xen-acpi-processor blktap2 blktap ; do \
  echo $mod ; \
  done > xen.conf.tmp
if ! cmp -s xen.conf.tmp xen.conf; then mv -f xen.conf.tmp xen.conf; else rm -f 
xen.conf.tmp; fi
[ -d /build/xen-unstable/src/xen-unstable/dist/install/usr/lib/systemd/system/ 
] || \
  
/build/xen-unstable/src/xen-unstable/tools/hotplug/Linux/systemd/../../../../tools/cross-install
 -d -m0755 -p 
/build/xen-unstable/src/xen-unstable/dist/install/usr/lib/systemd/system/
mv: cannot stat 'xen.conf.tmp': No such file or directory
Makefile:42: recipe for target 'xen.conf' failed
make[7]: *** [xen.conf] Error 1
make[7]: Leaving directory 
'/build/xen-unstable/src/xen-unstable/tools/hotplug/Linux/systemd'
/build/xen-unstable/src/xen-unstable/tools/hotplug/Linux/../../../tools/Rules.mk:116:
 recipe for target 'subdir-install-systemd' failed
make[6]: *** [subdir-install-systemd] Error 2
make[6]: Leaving directory 
'/build/xen-unstable/src/xen-unstable/tools/hotplug/Linux'
/build/xen-unstable/src/xen-unstable/tools/hotplug/Linux/../../../tools/Rules.mk:111:
 recipe for target 'subdirs-install' failed
make[5]: *** [subdirs-install] Error 2

Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>

---
build have been done with `make -j24`. Without the patch, the problem
always shows.
---
 tools/hotplug/Linux/systemd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/hotplug/Linux/systemd/Makefile 
b/tools/hotplug/Linux/systemd/Makefile
index 6950d24..2b3c559 100644
--- a/tools/hotplug/Linux/systemd/Makefile
+++ b/tools/hotplug/Linux/systemd/Makefile
@@ -21,7 +21,7 @@ ALL_XEN_SYSTEMD =     $(XEN_SYSTEMD_MODULES)  \
                        $(XEN_SYSTEMD_SERVICE)
 
 .PHONY: all
-all:   install
+all:
 
 .PHONY: clean
 clean:
-- 
Anthony PERARD


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel