WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 		  
Home Products Support Community News
 
   
 

xen-changelog

[Top] [All Lists]
<prev [Date] next>
[Advanced]
 <prev [Thread] next>

[Xen-changelog] [xen-unstable] tools: clean up handling of xen config an

from [Xen patchbot-unstable] [Permanent Link][Original]
To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] tools: clean up handling of xen config and scripts directories.
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Tue, 19 May 2009 09:30:32 -0700
Delivery-date: Tue, 19 May 2009 09:31:17 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx 
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1242694098 -3600
# Node ID 887337323bd8fd47f2129b1647620ace6439d458
# Parent  a89e83f2d43e00502b28a056989fcb5145b6eb40
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@xxxxxxx>
---
 tools/Rules.mk                     |    4 ++++
 tools/examples/Makefile            |    1 -
 tools/flask/policy/Makefile        |    2 +-
 tools/hotplug/Linux/Makefile       |   18 +++++++-----------
 tools/hotplug/NetBSD/Makefile      |    4 ----
 tools/hotplug/common/Makefile      |    4 ----
 tools/include/xen-foreign/Makefile |    2 +-
 tools/security/Makefile            |    2 +-
 tools/vnet/examples/Makefile       |    2 --
 9 files changed, 14 insertions(+), 25 deletions(-)

diff -r a89e83f2d43e -r 887337323bd8 tools/Rules.mk
--- a/tools/Rules.mk    Tue May 19 01:37:19 2009 +0100
+++ b/tools/Rules.mk    Tue May 19 01:48:18 2009 +0100
@@ -7,6 +7,10 @@ include $(XEN_ROOT)/Config.mk
 
 export _INSTALL := $(INSTALL)
 INSTALL = $(XEN_ROOT)/tools/cross-install
+
+CONFIG_DIR = /etc
+XEN_CONFIG_DIR = $(CONFIG_DIR)/xen
+XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts
 
 XEN_INCLUDE        = $(XEN_ROOT)/tools/include
 XEN_XC             = $(XEN_ROOT)/tools/python/xen/lowlevel/xc
diff -r a89e83f2d43e -r 887337323bd8 tools/examples/Makefile
--- a/tools/examples/Makefile   Tue May 19 01:37:19 2009 +0100
+++ b/tools/examples/Makefile   Tue May 19 01:48:18 2009 +0100
@@ -7,7 +7,6 @@ XENDOMAINS_SYSCONFIG = init.d/sysconfig.
 XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains
 
 # Xen configuration dir and configs to go there.
-XEN_CONFIG_DIR = /etc/xen
 XEN_READMES = README
 XEN_READMES += README.incompatibilities
 XEN_CONFIGS = xend-config.sxp
diff -r a89e83f2d43e -r 887337323bd8 tools/flask/policy/Makefile
--- a/tools/flask/policy/Makefile       Tue May 19 01:37:19 2009 +0100
+++ b/tools/flask/policy/Makefile       Tue May 19 01:48:18 2009 +0100
@@ -86,7 +86,7 @@ BOOLEANS := $(POLDIR)/booleans.conf
 BOOLEANS := $(POLDIR)/booleans.conf
 
 # install paths
-TOPDIR = $(DESTDIR)/etc/xen/
+TOPDIR = $(DESTDIR)$(XEN_CONFIG_DIR)
 INSTALLDIR = $(TOPDIR)/$(NAME)
 SRCPATH = $(INSTALLDIR)/src
 USERPATH = $(INSTALLDIR)/users
diff -r a89e83f2d43e -r 887337323bd8 tools/hotplug/Linux/Makefile
--- a/tools/hotplug/Linux/Makefile      Tue May 19 01:37:19 2009 +0100
+++ b/tools/hotplug/Linux/Makefile      Tue May 19 01:48:18 2009 +0100
@@ -6,11 +6,7 @@ XENDOMAINS_INITD = init.d/xendomains
 XENDOMAINS_INITD = init.d/xendomains
 XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains
 
-# Xen configuration dir and configs to go there.
-XEN_CONFIG_DIR = /etc/xen
-
 # Xen script dir and scripts to go there.
-XEN_SCRIPT_DIR = /etc/xen/scripts
 XEN_SCRIPTS = network-bridge vif-bridge
 XEN_SCRIPTS += network-route vif-route
 XEN_SCRIPTS += network-nat vif-nat
@@ -25,10 +21,10 @@ XEN_SCRIPT_DATA += block-common.sh vtpm-
 XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh
 XEN_SCRIPT_DATA += vtpm-migration.sh vtpm-impl
 
-XEN_HOTPLUG_DIR = /etc/hotplug
+XEN_HOTPLUG_DIR = $(CONFIG_DIR)/hotplug
 XEN_HOTPLUG_SCRIPTS = xen-backend.agent
 
-UDEV_RULES_DIR = /etc/udev
+UDEV_RULES_DIR = $(CONFIG_DIR)/udev
 UDEV_RULES = xen-backend.rules xend.rules
 
 DI = $(if $(DISTDIR),$(shell readlink -f $(DISTDIR)),)
@@ -54,11 +50,11 @@ install: all install-initd install-scrip
 
 .PHONY: install-initd
 install-initd:
-       [ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
-       [ -d $(DESTDIR)/etc/sysconfig ] || $(INSTALL_DIR) 
$(DESTDIR)/etc/sysconfig
-       $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d
-       $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d
-       $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) 
$(DESTDIR)/etc/sysconfig/xendomains
+       [ -d $(DESTDIR)$(CONFIG_DIR)/init.d ] || $(INSTALL_DIR) 
$(DESTDIR)$(CONFIG_DIR)/init.d
+       [ -d $(DESTDIR)$(CONFIG_DIR)/sysconfig ] || $(INSTALL_DIR) 
$(DESTDIR)$(CONFIG_DIR)/sysconfig
+       $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d
+       $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d
+       $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) 
$(DESTDIR)$(CONFIG_DIR)/sysconfig/xendomains
 
 .PHONY: install-scripts
 install-scripts:
diff -r a89e83f2d43e -r 887337323bd8 tools/hotplug/NetBSD/Makefile
--- a/tools/hotplug/NetBSD/Makefile     Tue May 19 01:37:19 2009 +0100
+++ b/tools/hotplug/NetBSD/Makefile     Tue May 19 01:48:18 2009 +0100
@@ -1,11 +1,7 @@ XEN_ROOT = ../../../
 XEN_ROOT = ../../../
 include $(XEN_ROOT)/tools/Rules.mk
 
-# Xen configuration dir and configs to go there.
-XEN_CONFIG_DIR = /etc/xen
-
 # Xen script dir and scripts to go there.
-XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts
 XEN_SCRIPTS =
 XEN_SCRIPTS += block-nbsd
 XEN_SCRIPTS += qemu-ifup-nbsd
diff -r a89e83f2d43e -r 887337323bd8 tools/hotplug/common/Makefile
--- a/tools/hotplug/common/Makefile     Tue May 19 01:37:19 2009 +0100
+++ b/tools/hotplug/common/Makefile     Tue May 19 01:48:18 2009 +0100
@@ -3,11 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 # OS-independent hotplug scripts go in this directory
 
-# Xen configuration dir and configs to go there.
-XEN_CONFIG_DIR = /etc/xen
-
 # Xen script dir and scripts to go there.
-XEN_SCRIPT_DIR = /etc/xen/scripts
 XEN_SCRIPTS =
 XEN_SCRIPT_DATA =
 
diff -r a89e83f2d43e -r 887337323bd8 tools/include/xen-foreign/Makefile
--- a/tools/include/xen-foreign/Makefile        Tue May 19 01:37:19 2009 +0100
+++ b/tools/include/xen-foreign/Makefile        Tue May 19 01:48:18 2009 +0100
@@ -1,5 +1,5 @@ XEN_ROOT=../../..
 XEN_ROOT=../../..
-include $(XEN_ROOT)/Config.mk
+include $(XEN_ROOT)/tools/Rules.mk
 
 ROOT = $(XEN_ROOT)/xen/include/public
 
diff -r a89e83f2d43e -r 887337323bd8 tools/security/Makefile
--- a/tools/security/Makefile   Tue May 19 01:37:19 2009 +0100
+++ b/tools/security/Makefile   Tue May 19 01:48:18 2009 +0100
@@ -21,7 +21,7 @@ ACM_OBJS          = $(OBJS_TOOL) $(OBJS_
 ACM_OBJS          = $(OBJS_TOOL) $(OBJS_GETD)
 ACM_SCRIPTS       = python/xensec_tools/acm_getlabel
 
-ACM_CONFIG_DIR    = /etc/xen/acm-security
+ACM_CONFIG_DIR    = $(XEN_CONFIG_DIR)/acm-security
 ACM_POLICY_DIR    = $(ACM_CONFIG_DIR)/policies
 ACM_SCRIPT_DIR    = $(ACM_CONFIG_DIR)/scripts
 
diff -r a89e83f2d43e -r 887337323bd8 tools/vnet/examples/Makefile
--- a/tools/vnet/examples/Makefile      Tue May 19 01:37:19 2009 +0100
+++ b/tools/vnet/examples/Makefile      Tue May 19 01:48:18 2009 +0100
@@ -2,8 +2,6 @@
 #============================================================================
 XEN_ROOT        = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
-
-XEN_SCRIPT_DIR  = $(DESTDIR)/etc/xen/scripts
 
 .PHONY: all
 all:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
[More with this subject...]
<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] tools: clean up handling of xen config and scripts directories., Xen patchbot-unstable <=
Previous by Date:  [Xen-changelog] [xen-unstable] xend: solve issues with xm block-configure command., Xen patchbot-unstable
Next by Date:  [Xen-changelog] [xen-unstable] xend: adjust relocation buffer size, Xen patchbot-unstable
Previous by Thread:  [Xen-changelog] [xen-unstable] xend: solve issues with xm block-configure command., Xen patchbot-unstable
Next by Thread:  [Xen-changelog] [xen-unstable] xend: adjust relocation buffer size, Xen patchbot-unstable
Indexes:  [Date] [Thread] [Top] [All Lists]
 
   

Copyright , Citrix Systems Inc. All rights reserved. Legal and Privacy