Re: [Xen-devel] [PATCH] xen: Install unstripped version -syms version into /usr/lib/debug

[Andrew Cooper <andrew.cooper3@xxxxxxxxxx>]

On 26/06/15 10:41, Ian Campbell wrote:
> 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@xxxxxxxxxx>
> ---
>  INSTALL          |    4 +++-
>  config/StdGNU.mk |    1 +
>  config/SunOS.mk  |    1 +
>  xen/Makefile     |    5 +++--
>  4 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/INSTALL b/INSTALL
> index 10cf879..680dcb2 100644
> --- 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, DERBUG_DIR defaults to /usr/lib/debugt and

DERBUG and /debugt

> +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 f47c238..39d36b2 100644
> --- 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

While I hate to day it, this probably needs /local/ handling for
non-system builds, and this sounds autoconf'y.  How stable is the path
across different systems?

~Andrew

>  
>  SOCKET_LIBS =
>  UTIL_LIBS = -lutil
> diff --git a/config/SunOS.mk b/config/SunOS.mk
> index 21ea0c2..86a384d 100644
> --- 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 b51dd36..6305880 100644
> --- 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


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