[Xen-devel] [PATCH v2 3/3] xen: allow architecture to choose how/whether to compress installed xen binary

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

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@xxxxxxxxxx>
Acked-by: Keir Fraser <keir@xxxxxxx>
Acked-by: Julien Grall <julien.grall@xxxxxxxxxx>
---
v4: Reordering means that $(Z) isn't really needed anymore
v3: Restrict $(Z) to just the rules which use it
v2: Allowarch to specify the compression suffix to use
---
 config/arm32.mk  |    2 ++
 config/arm64.mk  |    2 ++
 config/x86_64.mk |    2 ++
 xen/Makefile     |    6 +++---
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/config/arm32.mk b/config/arm32.mk
index d8e958b..3bc642d 100644
--- 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 b2457eb..1130630 100644
--- 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 4ec6cc1..70c0d8d 100644
--- 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 8994cd6..2abfa58 100644
--- 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)
-- 
1.7.2.5


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