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

[Ian Campbell <ian.campbell@citrix.com>]

On Sun, 2013-07-21 at 06:30 +0100, Ian Campbell wrote:
> 8<------------------------------
> 
> From 5f7b0c68d3721fd2eef80f7e23466425b55d21af Mon Sep 17 00:00:00 2001
> From: Ian Campbell <ian.campbell@citrix.com>
> 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.

Since this is (functionally if not literally) a revert which fixes the
tests I've gone ahead and pushed it without any acks.

> 
> We continue to omit the suffix on ARM.
> 
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> Cc: jbeulich@suse.com
> ---
>  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