xen: allow architecture to choose how/whether to compress installed xen binary

This is a follow up to "xen: arm: make zImage the default target which we
install".

On ARM the xen.gz binary installed into /boot is not immediately useful because
bootloaders (e.g. u-boot) do not unconditionally support decompression (except
via the uImage wrapper, which we currently do not support via our build system)

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
Acked-by: Julien Grall <julien.grall@linaro.org>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/config/arm32.mk b/config/arm32.mk
index d8e958b8b8375c14ffee5a3047f861017fe9550a..3bc642df2afcfa8deb989742a5869b0bb95cd28d 100644 (file)
--- a/config/arm32.mk
+++ b/config/arm32.mk
@@ -2,6 +2,8 @@ CONFIG_ARM := y
 CONFIG_ARM_32 := y
 CONFIG_ARM_$(XEN_OS) := y
 
+CONFIG_XEN_INSTALL_SUFFIX :=
+
 # -march= -mcpu=
 
 # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:

diff --git a/config/arm64.mk b/config/arm64.mk
index b2457ebc651b003694436dea5cd6c244c5a4812b..1130630256f0567d90dd8f97c9f67ac8ca41e288 100644 (file)
--- a/config/arm64.mk
+++ b/config/arm64.mk
@@ -2,6 +2,8 @@ CONFIG_ARM := y
 CONFIG_ARM_64 := y
 CONFIG_ARM_$(XEN_OS) := y
 
+CONFIG_XEN_INSTALL_SUFFIX :=
+
 CFLAGS += #-marm -march= -mcpu= etc
 
 HAS_PL011 := y

diff --git a/config/x86_64.mk b/config/x86_64.mk
index 4ec6cc196be7b6ceda0d4cff211d9295ff6ca8e0..70c0d8d47e067ac409365fca93d61ddec2fad054 100644 (file)
--- a/config/x86_64.mk
+++ b/config/x86_64.mk
@@ -8,6 +8,8 @@ CONFIG_MIGRATE := y
 CONFIG_XCUTILS := y
 CONFIG_IOEMU ?= y
 
+CONFIG_XEN_INSTALL_SUFFIX := .gz
+
 CFLAGS += -m64
 
 SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64)

diff --git a/xen/Makefile b/xen/Makefile
index 8994cd6e4e7050d58faadacb35fae9742e872319..2abfa589a06bf1dfd7cf08842ab9bdce875d7ab7 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -29,14 +29,14 @@ else
 endif
 
 .PHONY: _build
-_build: $(TARGET).gz
+_build: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
 
 .PHONY: _install
 _install: D=$(DESTDIR)
 _install: T=$(notdir $(TARGET))
-_install: $(TARGET).gz
+_install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
        [ -d $(D)/boot ] || $(INSTALL_DIR) $(D)/boot
-       $(INSTALL_DATA) $(TARGET).gz $(D)/boot/$(T)-$(XEN_FULLVERSION)
+       $(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)