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@citrix.com>

diff --git a/xen/Makefile b/xen/Makefile
index 2abfa589a06bf1dfd7cf08842ab9bdce875d7ab7..597972dae7762aaeb5a92ffab9f6082022d046c1 100644 (file)
--- 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