Re: [Xen-devel] [xen-unstable bisection] complete test-amd64-i386-rhel6hvm-intel

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

On Sun, 2013-07-21 at 04:26 +0100, xen.org wrote:
>   commit 524b93def23b9f75fd7851063f5291886e63d1ed
>   Author: Ian Campbell <ian.campbell@xxxxxxxxxx>
>   Date:   Thu Jul 18 09:41:41 2013 +0100
>   
>       xen: x86: drop the ".gz" suffix when installing
>       
>       As Jan says it is pretty meaningless under /boot anyway. However I am 
> slightly
>       concerned about breaking bootloaders (or more specifically their help 
> scripts
>       which automatically generate config files). By inspection at least grub 
> 2's
>       update-grub script (as present in Debian Wheezy) seems to cope (it 
> matches on
>       xen* not xen*.gz)

Looks like update-grub in Squeeze doesn't handle this case well.
http://www.chiark.greenend.org.uk/~xensrcts/logs/18537/test-amd64-amd64-xl/4.ts-xen-install.log
 shows osstest failing to find any hypervisor stanzas in grub.cfg and 
http://www.chiark.greenend.org.uk/~xensrcts/logs/18537/test-amd64-amd64-xl/field-cricket--grub.cfg.1
 shows that there are indeed none present...

Lets just undo things for now:

8<------------------------------

From 5f7b0c68d3721fd2eef80f7e23466425b55d21af Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@xxxxxxxxxx>
Date: Sun, 21 Jul 2013 06:24:30 +0100
Subject: [PATCH] xen: x86: put back .gz suffix on installed hypervisor binary.

This reverts the effect of 524b93def23b "xen: x86: drop the ".gz" suffix when
installing" which broke things in osstest (Debian Squeeze update-grub apparently
can't cope). It is not a direct revert because of other changes made since.

We continue to omit the suffix on ARM.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: jbeulich@xxxxxxxx
---
 xen/Makefile |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/xen/Makefile b/xen/Makefile
index 2abfa58..597972d 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -34,12 +34,13 @@ _build: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
 .PHONY: _install
 _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)$(CONFIG_XEN_INSTALL_SUFFIX) 
$(D)/boot/$(T)-$(XEN_FULLVERSION)
-       ln -f -s $(T)-$(XEN_FULLVERSION) 
$(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)
-       ln -f -s $(T)-$(XEN_FULLVERSION) $(D)/boot/$(T)-$(XEN_VERSION)
-       ln -f -s $(T)-$(XEN_FULLVERSION) $(D)/boot/$(T)
+       $(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)
        if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \
                [ -d $(D)$(EFI_DIR) ] || $(INSTALL_DIR) $(D)$(EFI_DIR); \
@@ -57,11 +58,12 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
 .PHONY: _uninstall
 _uninstall: D=$(DESTDIR)
 _uninstall: T=$(notdir $(TARGET))
+_uninstall: Z=$(CONFIG_XEN_INSTALL_SUFFIX)
 _uninstall:
-       rm -f $(D)/boot/$(T)-$(XEN_FULLVERSION)
-       rm -f $(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)
-       rm -f $(D)/boot/$(T)-$(XEN_VERSION)
-       rm -f $(D)/boot/$(T)
+       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)$(EFI_DIR)/$(T)-$(XEN_FULLVERSION).efi
        rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi
-- 
1.7.2.5




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