[Xen-devel] [PATCH] xen: use XEN_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 XEN_BOOT_DIR to define the install path to make it possible to
install xen.gz below --prefix=.

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
---
 xen/Makefile | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/xen/Makefile b/xen/Makefile
index 79fa8f2..fd82a94 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -13,6 +13,7 @@ export BASEDIR := $(CURDIR)
 export XEN_ROOT := $(BASEDIR)/..
 
 EFI_MOUNTPOINT ?= /boot/efi
+XEN_BOOT_DIR ?= /boot
 
 .PHONY: default
 default: build
@@ -36,12 +37,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)$(XEN_BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(XEN_BOOT_DIR)
+       $(INSTALL_DATA) $(TARGET)$(Z) 
$(D)$(XEN_BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z)
+       ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) 
$(D)$(XEN_BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
+       ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) 
$(D)$(XEN_BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z)
+       ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(XEN_BOOT_DIR)/$(T)$(Z)
+       $(INSTALL_DATA) $(TARGET)-syms 
$(D)$(XEN_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 +61,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)$(XEN_BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z)
+       rm -f $(D)$(XEN_BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
+       rm -f $(D)$(XEN_BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z)
+       rm -f $(D)$(XEN_BOOT_DIR)/$(T)$(Z)
+       rm -f $(D)$(XEN_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