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

[Xen-devel] [PATCH] hoplugpath.sh: fix Makefile dependency.



hoplugpath.sh: fix Makefile dependency.

In tools/hotplug/common/Makefile, install-scripts depends on genpath.
So add its dependency. Otherwise parallel build sometimes fails as follows.

genpath and install-scripts command are being run simultaneously.
So When install-scripts tries to install it, it can be under creation.

make -C common install
make[5]: Entering directory `/xen-unstable.hg/tools/hotplug/common'
rm -f "hotplugpath.sh"; echo "SBINDIR=\"/usr/sbin\"" >> "hotplugpath.sh"; echo 
"BINDIR=\"/usr/bin\"" >> "hotplugpath.sh"; echo "LIBEXEC=\"/usr/lib/xen/bin\"" 
>> "hotplugpath.sh"; echo "LIBDIR=\"/usr/lib\"" >> "hotplugpath.sh"; echo 
"SHAREDIR=\"/usr/share\"" >> "hotplugpath.sh"; echo 
"PRIVATE_BINDIR=\"/usr/lib/xen/bin\"" >> "hotplugpath.sh"; echo 
"XENFIRMWAREDIR=\"/usr/lib/xen/boot\"" >> "hotplugpath.sh"; echo 
"XEN_CONFIG_DIR=\"/etc/xen\"" >> "hotplugpath.sh"; echo 
"XEN_SCRIPT_DIR=\"/etc/xen/scripts\"" >> "hotplugpath.sh"
[ -d /xen-unstable.hg/dist/install/etc/xen/scripts ] || \
                ../../../tools/cross-install -d -m0755 -p 
/xen-unstable.hg/dist/install/etc/xen/scripts
set -e; for i in "hotplugpath.sh"; \
           do \
           ../../../tools/cross-install -m0755 -p $i 
/xen-unstable.hg/dist/install/etc/xen/scripts; \
        done
install: cannot stat `hotplugpath.sh': No such file or directory
make[5]: *** [install-scripts] Error 1
make[5]: *** Waiting for unfinished jobs....

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff --git a/tools/hotplug/common/Makefile b/tools/hotplug/common/Makefile
--- a/tools/hotplug/common/Makefile
+++ b/tools/hotplug/common/Makefile
@@ -22,7 +22,7 @@ build: genpath
 install: all install-scripts
 
 .PHONY: install-scripts
-install-scripts:
+install-scripts: build
        [ -d $(DESTDIR)$(XEN_SCRIPT_DIR) ] || \
                $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
        set -e; for i in $(XEN_SCRIPTS); \


-- 
yamahata

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.