[Xen-devel] [PATCH v3] xen: use BOOT_DIR as xen.gz install location

[Olaf Hering <olaf@xxxxxxxxx>]

Xen is currently installed into /boot, which is a hardcoded path. This
makes it impossible to install two xen.rpm packages from 'make rpmball'
in parallel because rpm complains about conflicting files.
Use BOOT_DIR to define the install path to make it possible to install
xen.gz below --prefix=.

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
---

v3:
 set BOOT_DIR also in SunOS.mk because it does not include StdGNU.mk
v2:
 use BOOT_DIR instead of XEN_BOOT_DIR
 add variable to config/StdGNU.mk instead of xen/Makefile

 config/StdGNU.mk |  2 ++
 config/SunOS.mk  |  2 ++
 xen/Makefile     | 24 ++++++++++++------------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index 25fc594..c6439f6 100644
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -51,6 +51,8 @@ SYSCONFIG_DIR = $(CONFIG_DIR)/$(CONFIG_LEAF_DIR)
 XEN_CONFIG_DIR = $(CONFIG_DIR)/xen
 XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts
 
+BOOT_DIR ?= /boot
+
 SOCKET_LIBS =
 UTIL_LIBS = -lutil
 DLOPEN_LIBS = -ldl
diff --git a/config/SunOS.mk b/config/SunOS.mk
index 2c528b7..50c60fe 100644
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -39,6 +39,8 @@ endif
 XEN_CONFIG_DIR = $(CONFIG_DIR)/xen
 XEN_SCRIPT_DIR = $(PRIVATE_PREFIX)/scripts
 
+BOOT_DIR ?= /boot
+
 SunOS_LIBDIR = /usr/sfw/lib
 SunOS_LIBDIR_x86_64 = /usr/sfw/lib/amd64
 
diff --git a/xen/Makefile b/xen/Makefile
index 79fa8f2..c0cf0c3 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -12,7 +12,7 @@ export XEN_DOMAIN     ?= $(shell ([ -x /bin/dnsdomainname ] 
&& /bin/dnsdomainname) |
 export BASEDIR := $(CURDIR)
 export XEN_ROOT := $(BASEDIR)/..
 
-EFI_MOUNTPOINT ?= /boot/efi
+EFI_MOUNTPOINT ?= $(BOOT_DIR)/efi
 
 .PHONY: default
 default: build
@@ -36,12 +36,12 @@ _install: D=$(DESTDIR)
 _install: T=$(notdir $(TARGET))
 _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX)
 _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
-       [ -d $(D)/boot ] || $(INSTALL_DIR) $(D)/boot
-       $(INSTALL_DATA) $(TARGET)$(Z) $(D)/boot/$(T)-$(XEN_FULLVERSION)$(Z)
-       ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) 
$(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
-       ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)-$(XEN_VERSION)$(Z)
-       ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)$(Z)
-       $(INSTALL_DATA) $(TARGET)-syms $(D)/boot/$(T)-syms-$(XEN_FULLVERSION)
+       [ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR)
+       $(INSTALL_DATA) $(TARGET)$(Z) 
$(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z)
+       ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) 
$(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
+       ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) 
$(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z)
+       ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z)
+       $(INSTALL_DATA) $(TARGET)-syms 
$(D)$(BOOT_DIR)/$(T)-syms-$(XEN_FULLVERSION)
        if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \
                [ -d $(D)$(EFI_DIR) ] || $(INSTALL_DIR) $(D)$(EFI_DIR); \
                $(INSTALL_DATA) $(TARGET).efi 
$(D)$(EFI_DIR)/$(T)-$(XEN_FULLVERSION).efi; \
@@ -60,11 +60,11 @@ _uninstall: D=$(DESTDIR)
 _uninstall: T=$(notdir $(TARGET))
 _uninstall: Z=$(CONFIG_XEN_INSTALL_SUFFIX)
 _uninstall:
-       rm -f $(D)/boot/$(T)-$(XEN_FULLVERSION)$(Z)
-       rm -f $(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
-       rm -f $(D)/boot/$(T)-$(XEN_VERSION)$(Z)
-       rm -f $(D)/boot/$(T)$(Z)
-       rm -f $(D)/boot/$(T)-syms-$(XEN_FULLVERSION)
+       rm -f $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z)
+       rm -f $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
+       rm -f $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z)
+       rm -f $(D)$(BOOT_DIR)/$(T)$(Z)
+       rm -f $(D)$(BOOT_DIR)/$(T)-syms-$(XEN_FULLVERSION)
        rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_FULLVERSION).efi
        rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi
        rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel