From: Ian Campbell <ian.campbell@citrix.com>
To: Olaf Hering <olaf@aepfle.de>
Cc: Keir Fraser <keir@xen.org>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Tim Deegan <tim@xen.org>, Ian Jackson <ian.jackson@eu.citrix.com>,
xen-devel@lists.xen.org, Jan Beulich <jbeulich@suse.com>,
Samuel Thibault <samuel.thibault@ens-lyon.org>
Subject: Re: [PATCH 08/13] tools/hotplug: use XEN_SCRIPT_DIR instead of hardcoded path
Date: Tue, 26 Aug 2014 21:07:45 +0100 [thread overview]
Message-ID: <1409083665.28009.25.camel@citrix.com> (raw)
In-Reply-To: <1406538316-29087-9-git-send-email-olaf@aepfle.de>
On Mon, 2014-07-28 at 11:05 +0200, Olaf Hering wrote:
> Helper scripts get installed into XEN_SCRIPT_DIR, but initscripts,
> helper scripts and udev rules still refer to the hardcoded location
> /etc/xen/scripts/. Update scripts, rules and Makefile to refer to
> @@XEN_SCRIPT_DIR@@ instead.
>
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> ---
> .gitignore | 8 +++++
> tools/hotplug/Linux/Makefile | 40 +++++++++++++++++++---
> .../Linux/init.d/{xen-watchdog => xen-watchdog.in} | 2 +-
> .../Linux/init.d/{xencommons => xencommons.in} | 2 +-
> .../Linux/init.d/{xendomains => xendomains.in} | 2 +-
> tools/hotplug/Linux/{vif-setup => vif-setup.in} | 2 +-
> .../{xen-backend.rules => xen-backend.rules.in} | 16 ++++-----
> ...-hotplug-common.sh => xen-hotplug-common.sh.in} | 2 +-
> tools/hotplug/Linux/{xendomains => xendomains.in} | 2 +-
> 9 files changed, 57 insertions(+), 19 deletions(-)
> rename tools/hotplug/Linux/init.d/{xen-watchdog => xen-watchdog.in} (97%)
> rename tools/hotplug/Linux/init.d/{xencommons => xencommons.in} (99%)
> rename tools/hotplug/Linux/init.d/{xendomains => xendomains.in} (97%)
> rename tools/hotplug/Linux/{vif-setup => vif-setup.in} (60%)
> rename tools/hotplug/Linux/{xen-backend.rules => xen-backend.rules.in} (60%)
> rename tools/hotplug/Linux/{xen-hotplug-common.sh => xen-hotplug-common.sh.in} (98%)
> rename tools/hotplug/Linux/{xendomains => xendomains.in} (99%)
>
> diff --git a/.gitignore b/.gitignore
> index 685df89..cf2febe 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -159,6 +159,14 @@ tools/flask/utils/flask-set-bool
> tools/flask/utils/flask-label-pci
> tools/fs-back/fs-backend
> tools/hotplug/common/hotplugpath.sh
> +tools/hotplug/Linux/init.d/xen-watchdog
> +tools/hotplug/Linux/init.d/xencommons
> +tools/hotplug/Linux/init.d/xendomains
> +tools/hotplug/Linux/vif-setup
> +tools/hotplug/Linux/xen-backend.rules
> +tools/hotplug/Linux/xen-hotplug-common.sh
> +tools/hotplug/Linux/xendomains
> +tools/hotplug/Linux/_used_path.sh
> tools/include/xen/*
> tools/include/xen-foreign/*.(c|h|size)
> tools/include/xen-foreign/checker
> diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile
> index d5de9e6..fb9f1e6 100644
> --- a/tools/hotplug/Linux/Makefile
> +++ b/tools/hotplug/Linux/Makefile
> @@ -32,18 +32,47 @@ XEN_SCRIPT_DATA += block-common.sh
> UDEV_RULES_DIR = $(CONFIG_DIR)/udev
> UDEV_RULES = xen-backend.rules $(UDEV_RULES-y)
>
> +USED_PATH = "_used_path.sh"
> +genpath-target = $(call buildmakevars2file,$(USED_PATH))
> +$(eval $(genpath-target))
I can't see where _used_path.sh is consumed.
> +%: %.in
> + set -e; \
> + rm -f $@.new ; \
> + sed 's|@@XEN_SCRIPT_DIR@@|$(XEN_SCRIPT_DIR)|g' $< >$@.new ; \
> + $(call move-if-changed,$@.new,$@)
Can you make these substitutions directly from tools/configure.ac? I
think Luis did something similar for the systemd stuff?
If not then you should remove all the "; \" bits and treat this as three
consecutive things in the normal way (the set -e becomes redundant
then).
next prev parent reply other threads:[~2014-08-26 20:07 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-28 9:05 [PATCH 00/13 v2] tools changes to honor --prefix= Olaf Hering
2014-07-28 9:05 ` [PATCH 01/13] Config.mk: move directory list into BUILD_MAKE_VARS Olaf Hering
2014-07-28 9:05 ` [PATCH 02/13] Config.mk: replace dependency to genpath with actual target Olaf Hering
2014-08-26 20:00 ` Ian Campbell
2014-08-27 8:36 ` Olaf Hering
2014-08-28 17:34 ` Ian Campbell
2014-08-29 6:33 ` Olaf Hering
2014-09-03 10:28 ` Ian Campbell
2014-09-03 10:43 ` Olaf Hering
2014-09-17 10:02 ` Olaf Hering
2014-09-17 16:53 ` Ian Campbell
2014-09-18 8:09 ` Olaf Hering
2014-09-18 17:44 ` Ian Campbell
2014-09-19 6:55 ` Olaf Hering
2014-07-28 9:05 ` [PATCH 03/13] Config.mk: add new macro buildmakevars2header Olaf Hering
2014-08-26 20:02 ` Ian Campbell
2014-07-28 9:05 ` [PATCH 04/13] tools/libxl: use buildmakevars2header to create _paths.h Olaf Hering
2014-07-28 9:05 ` [PATCH 05/13] tools/libxc: provide variable paths to libxc Olaf Hering
2014-07-28 9:05 ` [PATCH 06/13] tools/libxc: use XEN_RUN_DIR for SUSPEND_LOCK_FILE Olaf Hering
2014-07-28 9:05 ` [PATCH 07/13] tools/pygrub: store kernels in /var/run/xen/pygrub Olaf Hering
2014-08-26 20:04 ` Ian Campbell
2014-07-28 9:05 ` [PATCH 08/13] tools/hotplug: use XEN_SCRIPT_DIR instead of hardcoded path Olaf Hering
2014-08-26 20:07 ` Ian Campbell [this message]
2014-08-27 8:42 ` Olaf Hering
2014-07-28 9:05 ` [PATCH 09/13] tools/hotplug: create XEN_RUN_DIR at runtime Olaf Hering
2014-07-28 9:05 ` [PATCH 10/13] tools/hotplug: create XEN_LOCK_DIR " Olaf Hering
2014-07-28 9:05 ` [PATCH 11/13] tools/hotplug: use XEN_LOCK_DIR instead of hardcoded path Olaf Hering
2014-08-26 20:08 ` Ian Campbell
2014-07-28 9:05 ` [PATCH 12/13] tools/examples: remove obsolete install targets Olaf Hering
2014-07-28 9:05 ` [PATCH 13/13] remove obsolete SUBSYS_DIR variable Olaf Hering
2014-08-26 20:08 ` Ian Campbell
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=1409083665.28009.25.camel@citrix.com \
--to=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=jbeulich@suse.com \
--cc=keir@xen.org \
--cc=olaf@aepfle.de \
--cc=samuel.thibault@ens-lyon.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=tim@xen.org \
--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).