buildsystem: consolidate config dir
PATCH 1/1 buildsystem: consolidate config dir
Hi,
attached patch consolidates the xen config and scripts directories. For now hardcode /etc w/o a prefix in StdGNU.mk as there are hardcoded config path's in the code which would break otherwise.
Signature · 6 lines
---to satisfy European Law for business letters: Advanced Micro Devices GmbH Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
config/StdGNU.mk +4 -0
@@ -21,6 +21,10 @@ INSTALL_DIR = $(INSTALL) -d -m0755 -p INSTALL_DATA = $(INSTALL) -m0644 -p INSTALL_PROG = $(INSTALL) -m0755 -p +CONFIG_DIR = /etc +XEN_CONFIG_DIR = $(CONFIG_DIR)/xen +XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts + PREFIX ?= /usr BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include
tools/examples/Makefile +0 -1
@@ -7,7 +7,6 @@ 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_READMES = README XEN_READMES += README.incompatibilities XEN_CONFIGS = xend-config.sxp
tools/flask/policy/Makefile +1 -1
@@ -86,7 +86,7 @@ TUNABLES := $(POLDIR)/tunables.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
tools/hotplug/Linux/Makefile +7 -11
@@ -6,11 +6,7 @@ XEND_INITD = init.d/xend 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 += xen-hotplug-common.sh 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:
tools/hotplug/NetBSD/Makefile +0 -4
@@ -1,11 +1,7 @@ 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
tools/hotplug/common/Makefile +0 -4
@@ -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 =
tools/security/Makefile +1 -1
@@ -21,7 +21,7 @@ ACM_EZPOLICY = xensec_ezpolicy 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
tools/vnet/examples/Makefile +0 -2
@@ -3,8 +3,6 @@ XEN_ROOT = ../../.. include $(XEN_ROOT)/tools/Rules.mk -XEN_SCRIPT_DIR = $(DESTDIR)/etc/xen/scripts - .PHONY: all all:
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Christoph Egger writes ("[Xen-devel] [PATCH] buildsystem: consolidate config dir"):
Quoted 3 lines
attached patch consolidates the xen config and scripts directories. For now hardcode /etc w/o a prefix in StdGNU.mk as there are hardcoded config path's in the code which would break otherwise.
Have you done a pair of before-and-after test builds to check that this doesn't change the location of any files ? It's difficult to check this by eye while reading the makefile patches because unfortunately the effect of changes to our build system (like most) is difficult to predict with confidence.
Thanks,
Ian.