* [PATCH v2 0/3] xen: various changes to what we install in /boot
@ 2013-07-18 8:41 Ian Campbell
2013-07-18 8:41 ` [PATCH v2 1/3] xen: x86: drop the ".gz" suffix when installing Ian Campbell
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Ian Campbell @ 2013-07-18 8:41 UTC (permalink / raw)
To: xen-devel
Cc: Julien Grall, Stefano Stabellini, Keir Fraser, Tim Deegan, Jan Beulich
Jan suggested a couple of cleanups based upon my "xen: allow
architecture to choose whether to compress installed xen binary" patch.
So this series now consists of:
xen: x86: drop the ".gz" suffix when installing
xen: Use $(T) and $(D) aliases in install target
xen: allow architecture to choose how/whether to compress installed xen binary
I have reordered to reduce the churn (i.e. introducing variables just to
remove them again), which became more obvious when implementing some of
Jan's feedback.
This is based on my "xen: arm: make zImage the default target which we
install" patch but I don't think there is any actual interaction.
Ian.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 1/3] xen: x86: drop the ".gz" suffix when installing
2013-07-18 8:41 [PATCH v2 0/3] xen: various changes to what we install in /boot Ian Campbell
@ 2013-07-18 8:41 ` Ian Campbell
2013-07-18 10:04 ` Jan Beulich
2013-07-18 8:41 ` [PATCH v2 2/3] xen: Use $(T) and $(D) aliases in install target Ian Campbell
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Ian Campbell @ 2013-07-18 8:41 UTC (permalink / raw)
To: xen-devel
Cc: keir, Ian Campbell, stefano.stabellini, tim, julien.grall, jbeulich
As Jan says it is pretty meaningless under /boot anyway. However I am slightly
concerned about breaking bootloaders (or more specifically their help scripts
which automatically generate config files). By inspection at least grub 2's
update-grub script (as present in Debian Wheezy) seems to cope (it matches on
xen* not xen*.gz)
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
Acked-by: Julien Grall <julien.grall@linaro.org>
Cc: jbeulich@suse.com
---
v2: reordered in series to reduce unnecessary churn
---
xen/Makefile | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/xen/Makefile b/xen/Makefile
index 854a370..1106c26 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -34,10 +34,10 @@ _build: $(TARGET).gz
.PHONY: _install
_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)
+ ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION) $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)
+ ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION) $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION)
+ ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION) $(DESTDIR)/boot/$(notdir $(TARGET))
$(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 +56,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)
+ 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)-syms-$(XEN_FULLVERSION)
rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_FULLVERSION).efi
rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi
--
1.7.2.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 2/3] xen: Use $(T) and $(D) aliases in install target
2013-07-18 8:41 [PATCH v2 0/3] xen: various changes to what we install in /boot Ian Campbell
2013-07-18 8:41 ` [PATCH v2 1/3] xen: x86: drop the ".gz" suffix when installing Ian Campbell
@ 2013-07-18 8:41 ` Ian Campbell
2013-07-18 10:05 ` Jan Beulich
2013-07-18 8:41 ` [PATCH v2 3/3] xen: allow architecture to choose how/whether to compress installed xen binary Ian Campbell
2013-07-19 14:18 ` [PATCH v2 0/3] xen: various changes to what we install in /boot Ian Campbell
3 siblings, 1 reply; 8+ messages in thread
From: Ian Campbell @ 2013-07-18 8:41 UTC (permalink / raw)
To: xen-devel
Cc: keir, Ian Campbell, stefano.stabellini, tim, julien.grall, jbeulich
This is consistent with the uninstall target and also shortens some longish
lines.
Suggested-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
Acked-by: Julien Grall <julien.grall@linaro.org>
---
xen/Makefile | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/xen/Makefile b/xen/Makefile
index 1106c26..8994cd6 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -32,22 +32,24 @@ endif
_build: $(TARGET).gz
.PHONY: _install
+_install: D=$(DESTDIR)
+_install: T=$(notdir $(TARGET))
_install: $(TARGET).gz
- [ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot
- $(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_FULLVERSION)
- ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION) $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)
- ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION) $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION)
- ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION) $(DESTDIR)/boot/$(notdir $(TARGET))
- $(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot/$(notdir $(TARGET))-syms-$(XEN_FULLVERSION)
+ [ -d $(D)/boot ] || $(INSTALL_DIR) $(D)/boot
+ $(INSTALL_DATA) $(TARGET).gz $(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)-syms $(D)/boot/$(T)-syms-$(XEN_FULLVERSION)
if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \
- [ -d $(DESTDIR)$(EFI_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(EFI_DIR); \
- $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \
- ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \
- ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_VERSION).efi; \
- ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET)).efi; \
+ [ -d $(D)$(EFI_DIR) ] || $(INSTALL_DIR) $(D)$(EFI_DIR); \
+ $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_DIR)/$(T)-$(XEN_FULLVERSION).efi; \
+ ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \
+ ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi; \
+ ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T).efi; \
if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \
- $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \
- elif [ "$(DESTDIR)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(DESTDIR))" ]; then \
+ $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \
+ elif [ "$(D)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(D))" ]; then \
echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \
fi; \
fi
--
1.7.2.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 3/3] xen: allow architecture to choose how/whether to compress installed xen binary
2013-07-18 8:41 [PATCH v2 0/3] xen: various changes to what we install in /boot Ian Campbell
2013-07-18 8:41 ` [PATCH v2 1/3] xen: x86: drop the ".gz" suffix when installing Ian Campbell
2013-07-18 8:41 ` [PATCH v2 2/3] xen: Use $(T) and $(D) aliases in install target Ian Campbell
@ 2013-07-18 8:41 ` Ian Campbell
2013-07-18 10:07 ` Jan Beulich
2013-07-19 14:18 ` [PATCH v2 0/3] xen: various changes to what we install in /boot Ian Campbell
3 siblings, 1 reply; 8+ messages in thread
From: Ian Campbell @ 2013-07-18 8:41 UTC (permalink / raw)
To: xen-devel
Cc: keir, Ian Campbell, stefano.stabellini, tim, julien.grall, jbeulich
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>
---
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/3] xen: x86: drop the ".gz" suffix when installing
2013-07-18 8:41 ` [PATCH v2 1/3] xen: x86: drop the ".gz" suffix when installing Ian Campbell
@ 2013-07-18 10:04 ` Jan Beulich
0 siblings, 0 replies; 8+ messages in thread
From: Jan Beulich @ 2013-07-18 10:04 UTC (permalink / raw)
To: Ian Campbell; +Cc: julien.grall, tim, xen-devel, keir, stefano.stabellini
>>> On 18.07.13 at 10:41, Ian Campbell <ian.campbell@citrix.com> wrote:
> As Jan says it is pretty meaningless under /boot anyway. However I am
> slightly
> concerned about breaking bootloaders (or more specifically their help
> scripts
> which automatically generate config files). By inspection at least grub 2's
> update-grub script (as present in Debian Wheezy) seems to cope (it matches on
> xen* not xen*.gz)
>
> 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>
> ---
> v2: reordered in series to reduce unnecessary churn
> ---
> xen/Makefile | 16 ++++++++--------
> 1 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/xen/Makefile b/xen/Makefile
> index 854a370..1106c26 100644
> --- a/xen/Makefile
> +++ b/xen/Makefile
> @@ -34,10 +34,10 @@ _build: $(TARGET).gz
> .PHONY: _install
> _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)
> + ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION) $(DESTDIR)/boot/$(notdir
> $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)
> + ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION) $(DESTDIR)/boot/$(notdir
> $(TARGET))-$(XEN_VERSION)
> + ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION) $(DESTDIR)/boot/$(notdir
> $(TARGET))
> $(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 +56,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)
> + 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)-syms-$(XEN_FULLVERSION)
> rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_FULLVERSION).efi
> rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi
> --
> 1.7.2.5
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/3] xen: Use $(T) and $(D) aliases in install target
2013-07-18 8:41 ` [PATCH v2 2/3] xen: Use $(T) and $(D) aliases in install target Ian Campbell
@ 2013-07-18 10:05 ` Jan Beulich
0 siblings, 0 replies; 8+ messages in thread
From: Jan Beulich @ 2013-07-18 10:05 UTC (permalink / raw)
To: Ian Campbell; +Cc: julien.grall, tim, xen-devel, keir, stefano.stabellini
>>> On 18.07.13 at 10:41, Ian Campbell <ian.campbell@citrix.com> wrote:
> This is consistent with the uninstall target and also shortens some longish
> lines.
>
> Suggested-by: Jan Beulich <jbeulich@suse.com>
> 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>
> ---
> xen/Makefile | 28 +++++++++++++++-------------
> 1 files changed, 15 insertions(+), 13 deletions(-)
>
> diff --git a/xen/Makefile b/xen/Makefile
> index 1106c26..8994cd6 100644
> --- a/xen/Makefile
> +++ b/xen/Makefile
> @@ -32,22 +32,24 @@ endif
> _build: $(TARGET).gz
>
> .PHONY: _install
> +_install: D=$(DESTDIR)
> +_install: T=$(notdir $(TARGET))
> _install: $(TARGET).gz
> - [ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot
> - $(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot/$(notdir
> $(TARGET))-$(XEN_FULLVERSION)
> - ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION) $(DESTDIR)/boot/$(notdir
> $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)
> - ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION) $(DESTDIR)/boot/$(notdir
> $(TARGET))-$(XEN_VERSION)
> - ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION) $(DESTDIR)/boot/$(notdir
> $(TARGET))
> - $(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot/$(notdir
> $(TARGET))-syms-$(XEN_FULLVERSION)
> + [ -d $(D)/boot ] || $(INSTALL_DIR) $(D)/boot
> + $(INSTALL_DATA) $(TARGET).gz $(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)-syms $(D)/boot/$(T)-syms-$(XEN_FULLVERSION)
> if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \
> - [ -d $(DESTDIR)$(EFI_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(EFI_DIR); \
> - $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_DIR)/$(notdir
> $(TARGET))-$(XEN_FULLVERSION).efi; \
> - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi
> $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).efi;
> \
> - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi
> $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_VERSION).efi; \
> - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi
> $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET)).efi; \
> + [ -d $(D)$(EFI_DIR) ] || $(INSTALL_DIR) $(D)$(EFI_DIR); \
> + $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_DIR)/$(T)-$(XEN_FULLVERSION).efi; \
> + ln -sf $(T)-$(XEN_FULLVERSION).efi
> $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \
> + ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi; \
> + ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T).efi; \
> if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \
> - $(INSTALL_DATA) $(TARGET).efi
> $(DESTDIR)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(notdir
> $(TARGET))-$(XEN_FULLVERSION).efi; \
> - elif [ "$(DESTDIR)" = "$(patsubst $(shell cd $(XEN_ROOT) &&
> pwd)/%,%,$(DESTDIR))" ]; then \
> + $(INSTALL_DATA) $(TARGET).efi
> $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \
> + elif [ "$(D)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(D))" ]; then
> \
> echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \
> fi; \
> fi
> --
> 1.7.2.5
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 3/3] xen: allow architecture to choose how/whether to compress installed xen binary
2013-07-18 8:41 ` [PATCH v2 3/3] xen: allow architecture to choose how/whether to compress installed xen binary Ian Campbell
@ 2013-07-18 10:07 ` Jan Beulich
0 siblings, 0 replies; 8+ messages in thread
From: Jan Beulich @ 2013-07-18 10:07 UTC (permalink / raw)
To: Ian Campbell; +Cc: julien.grall, tim, xen-devel, keir, stefano.stabellini
>>> On 18.07.13 at 10:41, Ian Campbell <ian.campbell@citrix.com> wrote:
> 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>
This really became neat and short with the re-ordering, thanks
for doing this!
Jan
> ---
> 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 0/3] xen: various changes to what we install in /boot
2013-07-18 8:41 [PATCH v2 0/3] xen: various changes to what we install in /boot Ian Campbell
` (2 preceding siblings ...)
2013-07-18 8:41 ` [PATCH v2 3/3] xen: allow architecture to choose how/whether to compress installed xen binary Ian Campbell
@ 2013-07-19 14:18 ` Ian Campbell
3 siblings, 0 replies; 8+ messages in thread
From: Ian Campbell @ 2013-07-19 14:18 UTC (permalink / raw)
To: xen-devel
Cc: Julien Grall, Keir Fraser, Stefano Stabellini, Jan Beulich, Tim Deegan
On Thu, 2013-07-18 at 09:41 +0100, Ian Campbell wrote:
Applied this whole series with the various acks.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-07-19 14:18 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-18 8:41 [PATCH v2 0/3] xen: various changes to what we install in /boot Ian Campbell
2013-07-18 8:41 ` [PATCH v2 1/3] xen: x86: drop the ".gz" suffix when installing Ian Campbell
2013-07-18 10:04 ` Jan Beulich
2013-07-18 8:41 ` [PATCH v2 2/3] xen: Use $(T) and $(D) aliases in install target Ian Campbell
2013-07-18 10:05 ` Jan Beulich
2013-07-18 8:41 ` [PATCH v2 3/3] xen: allow architecture to choose how/whether to compress installed xen binary Ian Campbell
2013-07-18 10:07 ` Jan Beulich
2013-07-19 14:18 ` [PATCH v2 0/3] xen: various changes to what we install in /boot Ian Campbell
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.