xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] xen: use XEN_BOOT_DIR as xen.gz install location
@ 2014-04-23  8:00 Olaf Hering
  2014-04-23  8:09 ` Roger Pau Monné
  2014-04-23  9:34 ` Jan Beulich
  0 siblings, 2 replies; 10+ messages in thread
From: Olaf Hering @ 2014-04-23  8:00 UTC (permalink / raw)
  To: xen-devel; +Cc: Olaf Hering, keir, ian.campbell, tim, ian.jackson, jbeulich

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@aepfle.de>
---
 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

^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2014-04-23 14:46 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-23  8:00 [PATCH] xen: use XEN_BOOT_DIR as xen.gz install location Olaf Hering
2014-04-23  8:09 ` Roger Pau Monné
2014-04-23  8:24   ` Olaf Hering
2014-04-23  9:37     ` Jan Beulich
2014-04-23  9:40       ` Olaf Hering
2014-04-23 11:33       ` Ian Campbell
2014-04-23 14:46         ` Roger Pau Monné
2014-04-23  9:34 ` Jan Beulich
2014-04-23  9:39   ` Olaf Hering
2014-04-23  9:47     ` Jan Beulich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).