xen: Install unstripped version -syms version into /usr/lib/debug

xen-*-syms cannot actually be booted, so putting it in /boot is a bit
misleading. It also happens to cause a warning from update-grub (so at
least it doesn't end up in grub.cfg)

/usr/lib/debug seems to be a pretty common path for installing such
debug info.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
[ ijc -- fixed typos ]

diff --git a/INSTALL b/INSTALL
index 10cf879c8d7558246dc8281de34ed4bdd2866a68..12615ab03b8de8d30f227bcb24f57673193a2167 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -196,8 +196,10 @@ OCAMLFIND_DESTDIR= and OCAMLFIND_METADIR= will have the same effect.
 OCAMLDESTDIR=
 
 The xen subsystem will install the hypervisor into fixed locations.
-BOOT_DIR defaults to /boot, EFI_DIR to /usr/lib64/efi.
+BOOT_DIR defaults to /boot, DEBUG_DIR defaults to /usr/lib/debug and
+EFI_DIR to /usr/lib64/efi.
 BOOT_DIR=
+DEBUG_DIR=
 EFI_DIR=
 
 The make target 'rpmball' will build a xen.rpm. This variable can be

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index e10ed39ec78c85f5087fba80e27a6a4c214c393a..129d5c8a18ccfa91f7da1f6116b6e3249800a523 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -27,6 +27,7 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
 
 BOOT_DIR ?= /boot
+DEBUG_DIR ?= /usr/lib/debug
 
 SOCKET_LIBS =
 UTIL_LIBS = -lutil

diff --git a/config/SunOS.mk b/config/SunOS.mk
index c2be37d6302e672551931e0707d87db61b02f245..db5e8982a3f8aadfc0a8df55f53cc01db396d626 100644 (file)
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -19,6 +19,7 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
 
 BOOT_DIR ?= /boot
+DEBUG_DIR ?= /usr/lib/debug
 
 SunOS_LIBDIR = /usr/sfw/lib
 SunOS_LIBDIR_x86_64 = /usr/sfw/lib/amd64

diff --git a/xen/Makefile b/xen/Makefile
index b51dd361d872e3fcd3e64b368dfcba50113c1e4f..63058803e3a863ee44242d978b332a882b5d3ac6 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -44,7 +44,8 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
        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)
+       [ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR)
+       $(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_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; \
@@ -67,7 +68,7 @@ _uninstall:
        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)$(DEBUG_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