diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2013-07-18 09:41:43 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-07-19 12:59:51 +0100 |
| commit | 2f044a6a6e4cb0ea24c856c1615e3fb878af2cfb (patch) | |
| tree | eff1b5673ac9023be07b9dcab132aa255dc1fdb8 | |
| parent | 23e37f599e8bc220aca9abd097171ee17f5630ab (diff) | |
| download | xen-2f044a6a6e4cb0ea24c856c1615e3fb878af2cfb.tar.gz xen-2f044a6a6e4cb0ea24c856c1615e3fb878af2cfb.tar.bz2 xen-2f044a6a6e4cb0ea24c856c1615e3fb878af2cfb.zip | |
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>
| -rw-r--r-- | config/arm32.mk | 2 | ||||
| -rw-r--r-- | config/arm64.mk | 2 | ||||
| -rw-r--r-- | config/x86_64.mk | 2 | ||||
| -rw-r--r-- | xen/Makefile | 6 |
4 files changed, 9 insertions, 3 deletions
diff --git a/config/arm32.mk b/config/arm32.mk index d8e958b8b8..3bc642df2a 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 b2457ebc65..1130630256 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 4ec6cc196b..70c0d8d47e 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 8994cd6e4e..2abfa589a0 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) |