From 4bfb301f8fc8c7f73cc15fd9dcb47a418fad3d39 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 1 Oct 2014 18:41:10 +0200 Subject: [PATCH] tools/hotplug: substitute XEN_SCRIPT_DIR on FreeBSD MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Also remove DESTDIR from the path, this was most likely not intended. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Acked-by: Roger Pau Monné Cc: Ian Campbell Cc: Ian Jackson Cc: Stefano Stabellini Cc: Wei Liu [ ijc -- ran autogen.sh as requested ] --- .gitignore | 1 + tools/configure | 3 ++- tools/configure.ac | 1 + tools/hotplug/FreeBSD/Makefile | 1 - tools/hotplug/FreeBSD/rc.d/{xencommons => xencommons.in} | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) rename tools/hotplug/FreeBSD/rc.d/{xencommons => xencommons.in} (98%) diff --git a/.gitignore b/.gitignore index 4344c52206..2201cb0998 100644 --- a/.gitignore +++ b/.gitignore @@ -160,6 +160,7 @@ tools/flask/utils/flask-set-bool tools/flask/utils/flask-label-pci tools/fs-back/fs-backend tools/hotplug/common/hotplugpath.sh +tools/hotplug/FreeBSD/rc.d/xencommons tools/hotplug/Linux/init.d/xen-watchdog tools/hotplug/Linux/init.d/xendomains tools/hotplug/Linux/vif-setup diff --git a/tools/configure b/tools/configure index ed9e65673a..a9d78aea2e 100755 --- a/tools/configure +++ b/tools/configure @@ -2263,7 +2263,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_files="$ac_config_files ../config/Tools.mk hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons.in hotplug/Linux/init.d/xendomains hotplug/Linux/systemd/proc-xen.mount hotplug/Linux/systemd/var-lib-xenstored.mount hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service hotplug/Linux/systemd/xen-watchdog.service hotplug/Linux/systemd/xenconsoled.service hotplug/Linux/systemd/xendomains.service hotplug/Linux/systemd/xenstored.service hotplug/Linux/systemd/xenstored.socket hotplug/Linux/systemd/xenstored_ro.socket hotplug/Linux/vif-setup hotplug/Linux/xen-backend.rules hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains" +ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons.in hotplug/Linux/init.d/xendomains hotplug/Linux/systemd/proc-xen.mount hotplug/Linux/systemd/var-lib-xenstored.mount hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service hotplug/Linux/systemd/xen-watchdog.service hotplug/Linux/systemd/xenconsoled.service hotplug/Linux/systemd/xendomains.service hotplug/Linux/systemd/xenstored.service hotplug/Linux/systemd/xenstored.socket hotplug/Linux/systemd/xenstored_ro.socket hotplug/Linux/vif-setup hotplug/Linux/xen-backend.rules hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains" ac_config_headers="$ac_config_headers config.h" @@ -9514,6 +9514,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "../config/Tools.mk") CONFIG_FILES="$CONFIG_FILES ../config/Tools.mk" ;; + "hotplug/FreeBSD/rc.d/xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/FreeBSD/rc.d/xencommons" ;; "hotplug/Linux/init.d/sysconfig.xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/sysconfig.xencommons" ;; "hotplug/Linux/init.d/xen-watchdog") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xen-watchdog" ;; "hotplug/Linux/init.d/xencommons.in") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xencommons.in" ;; diff --git a/tools/configure.ac b/tools/configure.ac index 686f4991af..788ba72a62 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -7,6 +7,7 @@ AC_INIT([Xen Hypervisor Tools], m4_esyscmd([../version.sh ../xen/Makefile]), AC_CONFIG_SRCDIR([libxl/libxl.c]) AC_CONFIG_FILES([ ../config/Tools.mk +hotplug/FreeBSD/rc.d/xencommons hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons.in diff --git a/tools/hotplug/FreeBSD/Makefile b/tools/hotplug/FreeBSD/Makefile index e21f0467d3..169a124c39 100644 --- a/tools/hotplug/FreeBSD/Makefile +++ b/tools/hotplug/FreeBSD/Makefile @@ -35,7 +35,6 @@ install-rcd: set -e; for i in $(XEN_RCD_PROG); \ do \ $(INSTALL_PROG) $$i $(DESTDIR)$(INITD_DIR); \ - sed -i '' 's,@xen_script_dir@,$(DESTDIR)$(XEN_SCRIPT_DIR),g' $(DESTDIR)$(CONFIG_DIR)/$$i; \ done $(INSTALL_DATA) ../common/hotplugpath.sh $(DESTDIR)$(XEN_SCRIPT_DIR) diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons b/tools/hotplug/FreeBSD/rc.d/xencommons.in similarity index 98% rename from tools/hotplug/FreeBSD/rc.d/xencommons rename to tools/hotplug/FreeBSD/rc.d/xencommons.in index 2d9034ce25..8b051ecffc 100644 --- a/tools/hotplug/FreeBSD/rc.d/xencommons +++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in @@ -5,7 +5,7 @@ . /etc/rc.subr -. @xen_script_dir@/hotplugpath.sh +. @XEN_SCRIPT_DIR@/hotplugpath.sh LD_LIBRARY_PATH="${LIBDIR}" export LD_LIBRARY_PATH -- 2.30.2