From: Olaf Hering <olaf@aepfle.de>
To: xen-devel@lists.xen.org
Cc: Wei Liu <wei.liu2@citrix.com>, Olaf Hering <olaf@aepfle.de>,
Ian Jackson <ian.jackson@eu.citrix.com>,
Ian Campbell <ian.campbell@citrix.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [PATCH 08/28] tools/hotplug: substitute XEN_SCRIPT_DIR on FreeBSD
Date: Thu, 25 Sep 2014 17:20:03 +0200 [thread overview]
Message-ID: <1411658423-18877-9-git-send-email-olaf@aepfle.de> (raw)
In-Reply-To: <1411658423-18877-1-git-send-email-olaf@aepfle.de>
Also remove DESTDIR from the path, this was most likely not intended.
Please rerun autogen.sh after applying this patch.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
.gitignore | 1 +
tools/configure.ac | 1 +
tools/hotplug/FreeBSD/Makefile | 1 -
tools/hotplug/FreeBSD/rc.d/{xencommons => xencommons.in} | 2 +-
4 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4344c52..2201cb0 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.ac b/tools/configure.ac
index 29d13ff..80754ea 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 e21f046..169a124 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 2d9034c..8b051ec 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
next prev parent reply other threads:[~2014-09-25 15:20 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-25 15:19 [PATCH 00/28 v4] tool changes to honor configure --prefix=DIR Olaf Hering
2014-09-25 15:19 ` [PATCH 01/28] Neutralize make uninstall Olaf Hering
2014-09-29 13:48 ` Ian Campbell
2014-09-30 12:07 ` Olaf Hering
2014-09-30 12:26 ` Ian Campbell
2014-09-29 13:49 ` Ian Campbell
2014-09-30 12:09 ` Olaf Hering
2014-09-30 12:26 ` Ian Campbell
2014-10-01 5:52 ` Olaf Hering
2014-10-01 10:44 ` Ian Campbell
2014-09-25 15:19 ` [PATCH 02/28] tools/hotplug: fix race during xen.conf creation Olaf Hering
2014-09-30 15:46 ` Ian Campbell
2014-09-25 15:19 ` [PATCH 03/28] tools/python: use also LDFLAGS for build Olaf Hering
2014-09-30 15:46 ` Ian Campbell
2014-09-25 15:19 ` [PATCH 04/28] Add configure --with-initddir=DIR Olaf Hering
2014-09-30 15:47 ` Ian Campbell
2014-09-25 15:20 ` [PATCH 05/28] tools/hotplug: use XEN_SCRIPT_DIR instead of hardcoded path Olaf Hering
2014-09-25 15:20 ` [PATCH 06/28] tools/configure.ac: sort AC_CONFIG_FILES Olaf Hering
2014-09-25 15:20 ` [PATCH 07/28] tools: use INITD_DIR instead of CONFIG_DIR/init.d|rc.d Olaf Hering
2014-09-30 16:06 ` Roger Pau Monné
2014-09-25 15:20 ` Olaf Hering [this message]
2014-09-30 16:06 ` [PATCH 08/28] tools/hotplug: substitute XEN_SCRIPT_DIR on FreeBSD Roger Pau Monné
2014-09-25 15:20 ` [PATCH 09/28] remove duplicate variables from config Olaf Hering
2014-09-30 16:11 ` Roger Pau Monné
2014-09-30 16:30 ` Olaf Hering
2014-09-25 15:20 ` [PATCH 10/28] Substitue configure variables in Paths.mk.in Olaf Hering
2014-09-30 15:48 ` Ian Campbell
2014-09-25 15:20 ` [PATCH 11/28] tools: substitute bindir instead of BINDIR Olaf Hering
2014-09-30 15:51 ` Ian Campbell
2014-09-30 15:55 ` Olaf Hering
2014-09-30 16:04 ` Ian Campbell
2014-09-25 15:20 ` [PATCH 12/28] Use configure --mandir=DIR to set MANDIR Olaf Hering
2014-09-30 15:51 ` Ian Campbell
2014-09-25 15:20 ` [PATCH 13/28] Use configure --docdir=DIR to set DOCDIR Olaf Hering
2014-09-30 15:52 ` Ian Campbell
2014-09-25 15:20 ` [PATCH 14/28] Use configure --includedir=DIR to set INCLUDEDIR Olaf Hering
2014-09-30 15:52 ` Ian Campbell
2014-09-25 15:20 ` [PATCH 15/28] Use configure --libexecdir=BASEDIR to set LIBEXEC Olaf Hering
2014-09-30 15:55 ` Ian Campbell
2014-09-30 15:58 ` Olaf Hering
2014-09-30 16:02 ` Ian Campbell
2014-09-25 15:20 ` [PATCH 16/28] Use configure --prefix=DIR to set PREFIX Olaf Hering
2014-09-25 15:20 ` [PATCH 17/28] Use configure --localstatedir=BASEDIR to set path to /var Olaf Hering
2014-09-30 15:55 ` Ian Campbell
2014-09-25 15:20 ` [PATCH 18/28] Add configure --enable-rpath Olaf Hering
2014-09-30 15:56 ` Ian Campbell
2014-09-25 15:20 ` [PATCH 19/28] Add configure --with-linux-backend-modules="mod1 mod2" Olaf Hering
2014-09-30 15:57 ` Ian Campbell
2014-09-25 15:20 ` [PATCH 20/28] Put bash_completion.d below --sysconfdir=DIR Olaf Hering
2014-09-30 15:58 ` Ian Campbell
2014-09-30 16:01 ` Olaf Hering
2014-09-25 15:20 ` [PATCH 21/28] Add configure --with-sysconfig-leaf-dir=SUBDIR to set CONFIG_LEAF_DIR Olaf Hering
2014-09-30 15:59 ` Ian Campbell
2014-09-25 15:20 ` [PATCH 22/28] Make XENFIRMWAREDIR a subdir of libexecdir Olaf Hering
2014-09-25 15:20 ` [PATCH 23/28] tools: remove private copies of includedir and libdir from libxenstat Olaf Hering
2014-09-25 15:20 ` [PATCH 24/28] Use Paths.mk for docs, stubdom and tools build Olaf Hering
2014-09-30 16:00 ` Ian Campbell
2014-09-25 15:20 ` [PATCH 25/28] tools: use XEN_LIB_STORED instead of /var/lib/xenstored Olaf Hering
2014-09-25 15:20 ` [PATCH 26/28] Use XEN_RUN_DIR instead of /var/run/xen Olaf Hering
2014-09-30 16:00 ` Ian Campbell
2014-09-25 15:20 ` [PATCH 27/28] move vtpmmgr helpers from tools to stubdom Olaf Hering
2014-09-30 16:02 ` Ian Campbell
2014-09-25 15:20 ` [PATCH 28/28] Separate runtime debug output from debug symbols Olaf Hering
2014-09-25 15:41 ` Andrew Cooper
2014-09-25 15:57 ` Jan Beulich
2014-09-26 6:07 ` Olaf Hering
2014-09-25 16:01 ` Jan Beulich
2014-09-26 8:17 ` Olaf Hering
2014-09-26 8:54 ` Olaf Hering
2014-09-26 9:06 ` Jan Beulich
2014-09-26 9:22 ` Olaf Hering
2014-09-26 9:37 ` Jan Beulich
2014-09-26 8:56 ` Jan Beulich
2014-09-26 11:40 ` [PATCH 28/28 v2] " Olaf Hering
2014-09-26 11:56 ` Jan Beulich
2014-09-26 14:02 ` Olaf Hering
2014-09-26 14:43 ` Jan Beulich
2014-09-26 19:12 ` Konrad Rzeszutek Wilk
-- strict thread matches above, loose matches on Subject: below --
2014-10-01 16:41 [PATCH 00/28 v5 for-xen-4.5] tool changes to honor configure --prefix=DIR Olaf Hering
2014-10-01 16:41 ` [PATCH 08/28] tools/hotplug: substitute XEN_SCRIPT_DIR on FreeBSD Olaf Hering
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1411658423-18877-9-git-send-email-olaf@aepfle.de \
--to=olaf@aepfle.de \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).