ia64/xen-unstable

changeset 19611:887337323bd8

tools: clean up handling of xen config and scripts directories.

For now hardcode /etc w/o a prefix as there are hardcoded
config paths in the code which would break otherwise.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue May 19 01:48:18 2009 +0100 (2009-05-19)
parents a89e83f2d43e
children fad68a77af5c
files tools/Rules.mk tools/examples/Makefile tools/flask/policy/Makefile tools/hotplug/Linux/Makefile tools/hotplug/NetBSD/Makefile tools/hotplug/common/Makefile tools/include/xen-foreign/Makefile tools/security/Makefile tools/vnet/examples/Makefile
line diff
     1.1 --- a/tools/Rules.mk	Tue May 19 01:37:19 2009 +0100
     1.2 +++ b/tools/Rules.mk	Tue May 19 01:48:18 2009 +0100
     1.3 @@ -8,6 +8,10 @@ include $(XEN_ROOT)/Config.mk
     1.4  export _INSTALL := $(INSTALL)
     1.5  INSTALL = $(XEN_ROOT)/tools/cross-install
     1.6  
     1.7 +CONFIG_DIR = /etc
     1.8 +XEN_CONFIG_DIR = $(CONFIG_DIR)/xen
     1.9 +XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts
    1.10 +
    1.11  XEN_INCLUDE        = $(XEN_ROOT)/tools/include
    1.12  XEN_XC             = $(XEN_ROOT)/tools/python/xen/lowlevel/xc
    1.13  XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
     2.1 --- a/tools/examples/Makefile	Tue May 19 01:37:19 2009 +0100
     2.2 +++ b/tools/examples/Makefile	Tue May 19 01:48:18 2009 +0100
     2.3 @@ -7,7 +7,6 @@ XENDOMAINS_INITD = init.d/xendomains
     2.4  XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains
     2.5  
     2.6  # Xen configuration dir and configs to go there.
     2.7 -XEN_CONFIG_DIR = /etc/xen
     2.8  XEN_READMES = README
     2.9  XEN_READMES += README.incompatibilities
    2.10  XEN_CONFIGS = xend-config.sxp
     3.1 --- a/tools/flask/policy/Makefile	Tue May 19 01:37:19 2009 +0100
     3.2 +++ b/tools/flask/policy/Makefile	Tue May 19 01:48:18 2009 +0100
     3.3 @@ -86,7 +86,7 @@ TUNABLES := $(POLDIR)/tunables.conf
     3.4  BOOLEANS := $(POLDIR)/booleans.conf
     3.5  
     3.6  # install paths
     3.7 -TOPDIR = $(DESTDIR)/etc/xen/
     3.8 +TOPDIR = $(DESTDIR)$(XEN_CONFIG_DIR)
     3.9  INSTALLDIR = $(TOPDIR)/$(NAME)
    3.10  SRCPATH = $(INSTALLDIR)/src
    3.11  USERPATH = $(INSTALLDIR)/users
     4.1 --- a/tools/hotplug/Linux/Makefile	Tue May 19 01:37:19 2009 +0100
     4.2 +++ b/tools/hotplug/Linux/Makefile	Tue May 19 01:48:18 2009 +0100
     4.3 @@ -6,11 +6,7 @@ XEND_INITD = init.d/xend
     4.4  XENDOMAINS_INITD = init.d/xendomains
     4.5  XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains
     4.6  
     4.7 -# Xen configuration dir and configs to go there.
     4.8 -XEN_CONFIG_DIR = /etc/xen
     4.9 -
    4.10  # Xen script dir and scripts to go there.
    4.11 -XEN_SCRIPT_DIR = /etc/xen/scripts
    4.12  XEN_SCRIPTS = network-bridge vif-bridge
    4.13  XEN_SCRIPTS += network-route vif-route
    4.14  XEN_SCRIPTS += network-nat vif-nat
    4.15 @@ -25,10 +21,10 @@ XEN_SCRIPT_DATA += xen-hotplug-common.sh
    4.16  XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh
    4.17  XEN_SCRIPT_DATA += vtpm-migration.sh vtpm-impl
    4.18  
    4.19 -XEN_HOTPLUG_DIR = /etc/hotplug
    4.20 +XEN_HOTPLUG_DIR = $(CONFIG_DIR)/hotplug
    4.21  XEN_HOTPLUG_SCRIPTS = xen-backend.agent
    4.22  
    4.23 -UDEV_RULES_DIR = /etc/udev
    4.24 +UDEV_RULES_DIR = $(CONFIG_DIR)/udev
    4.25  UDEV_RULES = xen-backend.rules xend.rules
    4.26  
    4.27  DI = $(if $(DISTDIR),$(shell readlink -f $(DISTDIR)),)
    4.28 @@ -54,11 +50,11 @@ install: all install-initd install-scrip
    4.29  
    4.30  .PHONY: install-initd
    4.31  install-initd:
    4.32 -	[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
    4.33 -	[ -d $(DESTDIR)/etc/sysconfig ] || $(INSTALL_DIR) $(DESTDIR)/etc/sysconfig
    4.34 -	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d
    4.35 -	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d
    4.36 -	$(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/etc/sysconfig/xendomains
    4.37 +	[ -d $(DESTDIR)$(CONFIG_DIR)/init.d ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/init.d
    4.38 +	[ -d $(DESTDIR)$(CONFIG_DIR)/sysconfig ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/sysconfig
    4.39 +	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d
    4.40 +	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d
    4.41 +	$(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/sysconfig/xendomains
    4.42  
    4.43  .PHONY: install-scripts
    4.44  install-scripts:
     5.1 --- a/tools/hotplug/NetBSD/Makefile	Tue May 19 01:37:19 2009 +0100
     5.2 +++ b/tools/hotplug/NetBSD/Makefile	Tue May 19 01:48:18 2009 +0100
     5.3 @@ -1,11 +1,7 @@
     5.4  XEN_ROOT = ../../../
     5.5  include $(XEN_ROOT)/tools/Rules.mk
     5.6  
     5.7 -# Xen configuration dir and configs to go there.
     5.8 -XEN_CONFIG_DIR = /etc/xen
     5.9 -
    5.10  # Xen script dir and scripts to go there.
    5.11 -XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts
    5.12  XEN_SCRIPTS =
    5.13  XEN_SCRIPTS += block-nbsd
    5.14  XEN_SCRIPTS += qemu-ifup-nbsd
     6.1 --- a/tools/hotplug/common/Makefile	Tue May 19 01:37:19 2009 +0100
     6.2 +++ b/tools/hotplug/common/Makefile	Tue May 19 01:48:18 2009 +0100
     6.3 @@ -3,11 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
     6.4  
     6.5  # OS-independent hotplug scripts go in this directory
     6.6  
     6.7 -# Xen configuration dir and configs to go there.
     6.8 -XEN_CONFIG_DIR = /etc/xen
     6.9 -
    6.10  # Xen script dir and scripts to go there.
    6.11 -XEN_SCRIPT_DIR = /etc/xen/scripts
    6.12  XEN_SCRIPTS =
    6.13  XEN_SCRIPT_DATA =
    6.14  
     7.1 --- a/tools/include/xen-foreign/Makefile	Tue May 19 01:37:19 2009 +0100
     7.2 +++ b/tools/include/xen-foreign/Makefile	Tue May 19 01:48:18 2009 +0100
     7.3 @@ -1,5 +1,5 @@
     7.4  XEN_ROOT=../../..
     7.5 -include $(XEN_ROOT)/Config.mk
     7.6 +include $(XEN_ROOT)/tools/Rules.mk
     7.7  
     7.8  ROOT = $(XEN_ROOT)/xen/include/public
     7.9  
     8.1 --- a/tools/security/Makefile	Tue May 19 01:37:19 2009 +0100
     8.2 +++ b/tools/security/Makefile	Tue May 19 01:48:18 2009 +0100
     8.3 @@ -21,7 +21,7 @@ ACM_EZPOLICY      = xensec_ezpolicy
     8.4  ACM_OBJS          = $(OBJS_TOOL) $(OBJS_GETD)
     8.5  ACM_SCRIPTS       = python/xensec_tools/acm_getlabel
     8.6  
     8.7 -ACM_CONFIG_DIR    = /etc/xen/acm-security
     8.8 +ACM_CONFIG_DIR    = $(XEN_CONFIG_DIR)/acm-security
     8.9  ACM_POLICY_DIR    = $(ACM_CONFIG_DIR)/policies
    8.10  ACM_SCRIPT_DIR    = $(ACM_CONFIG_DIR)/scripts
    8.11  
     9.1 --- a/tools/vnet/examples/Makefile	Tue May 19 01:37:19 2009 +0100
     9.2 +++ b/tools/vnet/examples/Makefile	Tue May 19 01:48:18 2009 +0100
     9.3 @@ -3,8 +3,6 @@
     9.4  XEN_ROOT        = ../../..
     9.5  include $(XEN_ROOT)/tools/Rules.mk
     9.6  
     9.7 -XEN_SCRIPT_DIR  = $(DESTDIR)/etc/xen/scripts
     9.8 -
     9.9  .PHONY: all
    9.10  all:
    9.11