All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ian Campbell <ijc@hellion.org.uk>
To: xen-devel@lists.xen.org
Cc: keir@xen.org, Ian Campbell <ian.campbell@citrix.com>,
	stefano.stabellini@eu.citrix.com, tim@xen.org,
	julien.grall@citrix.com, jbeulich@suse.com
Subject: [PATCH] xen: allow architecture to choose whether to compress installed xen binary
Date: Mon, 15 Jul 2013 09:38:30 +0100	[thread overview]
Message-ID: <1373877510-18967-1-git-send-email-ijc@hellion.org.uk> (raw)
In-Reply-To: <1373630398-20993-1-git-send-email-ijc@hellion.org.uk>

From: Ian Campbell <ian.campbell@citrix.com>

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>
---
 config/arm32.mk  |  2 ++
 config/arm64.mk  |  2 ++
 config/x86_64.mk |  2 ++
 xen/Makefile     | 26 ++++++++++++++++----------
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/config/arm32.mk b/config/arm32.mk
index d8e958b..f38ca3a 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_INSTALL_COMPRESSED_XEN := n
+
 # -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..c625d02 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_INSTALL_COMPRESSED_XEN := n
+
 CFLAGS += #-marm -march= -mcpu= etc
 
 HAS_PL011 := y
diff --git a/config/x86_64.mk b/config/x86_64.mk
index 4ec6cc1..be3273d 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_INSTALL_COMPRESSED_XEN := y
+
 CFLAGS += -m64
 
 SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64)
diff --git a/xen/Makefile b/xen/Makefile
index 854a370..8898d3f 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -28,16 +28,22 @@ else
 	echo "*** Xen x86/32 target no longer supported!"
 endif
 
+ifeq ($(CONFIG_INSTALL_COMPRESSED_XEN),y)
+GZ := .gz
+else
+GZ :=
+endif
+
 .PHONY: _build
-_build: $(TARGET).gz
+_build: $(TARGET)$(GZ)
 
 .PHONY: _install
-_install: $(TARGET).gz
+_install: $(TARGET)$(GZ)
 	[ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot
-	$(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_FULLVERSION).gz
-	ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).gz
-	ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz
-	ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET)).gz
+	$(INSTALL_DATA) $(TARGET)$(GZ) $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_FULLVERSION)$(GZ)
+	ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION)$(GZ) $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)$(GZ)
+	ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION)$(GZ) $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION)$(GZ)
+	ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION)$(GZ) $(DESTDIR)/boot/$(notdir $(TARGET))$(GZ)
 	$(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot/$(notdir $(TARGET))-syms-$(XEN_FULLVERSION)
 	if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \
 		[ -d $(DESTDIR)$(EFI_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(EFI_DIR); \
@@ -56,10 +62,10 @@ _install: $(TARGET).gz
 _uninstall: D=$(DESTDIR)
 _uninstall: T=$(notdir $(TARGET))
 _uninstall:
-	rm -f $(D)/boot/$(T)-$(XEN_FULLVERSION).gz
-	rm -f $(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).gz
-	rm -f $(D)/boot/$(T)-$(XEN_VERSION).gz
-	rm -f $(D)/boot/$(T).gz
+	rm -f $(D)/boot/$(T)-$(XEN_FULLVERSION)$(GZ)
+	rm -f $(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(GZ)
+	rm -f $(D)/boot/$(T)-$(XEN_VERSION)$(GZ)
+	rm -f $(D)/boot/$(T)$(GZ)
 	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
-- 
1.8.3.2

  reply	other threads:[~2013-07-15  8:38 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-12 11:59 [PATCH] xen: arm: make zImage the default target which we install Ian Campbell
2013-07-15  8:38 ` Ian Campbell [this message]
2013-07-15  9:44   ` [PATCH] xen: allow architecture to choose whether to compress installed xen binary Jan Beulich
2013-07-16  9:15     ` Ian Campbell
2013-07-16  9:20       ` Jan Beulich
2013-07-17 11:13         ` Ian Campbell
2013-07-17 11:31           ` Jan Beulich
2013-07-17 11:37             ` Ian Campbell
2013-07-17 11:13         ` [PATCH] xen: x86: drop the ".gz" suffix when installing Ian Campbell
2013-07-17 11:26           ` Jan Beulich
2013-07-17 11:35             ` Ian Campbell
2013-07-18 12:05 ` [PATCH] xen: arm: make zImage the default target which we install Julien Grall
2013-07-18 12:10   ` Ian Campbell
2013-07-18 12:12     ` Julien Grall
2013-07-19 14:18       ` Ian Campbell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1373877510-18967-1-git-send-email-ijc@hellion.org.uk \
    --to=ijc@hellion.org.uk \
    --cc=ian.campbell@citrix.com \
    --cc=jbeulich@suse.com \
    --cc=julien.grall@citrix.com \
    --cc=keir@xen.org \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=tim@xen.org \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.