All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ian Campbell <ian.campbell@citrix.com>
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 2/3] xen: x86: drop the ".gz" suffix when installing
Date: Wed, 17 Jul 2013 16:37:52 +0100	[thread overview]
Message-ID: <1374075473-32502-2-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1374075441.26728.14.camel@kazak.uk.xensource.com>

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 leastr 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>
Cc: jbeulich@suse.com
Cc: keir@xen.org
---
 xen/Makefile |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/xen/Makefile b/xen/Makefile
index 8bc8f3a..0a20662 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -36,10 +36,10 @@ _build: $(TARGET)$(Z)
 _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX)
 _install: $(TARGET)$(Z)
 	[ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot
-	$(INSTALL_DATA) $(TARGET)$(Z) $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_FULLVERSION)$(Z)
-	ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION)$(Z) $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
-	ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION)$(Z) $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION)$(Z)
-	ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION)$(Z) $(DESTDIR)/boot/$(notdir $(TARGET))$(Z)
+	$(INSTALL_DATA) $(TARGET)$(Z) $(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); \
@@ -59,10 +59,10 @@ _uninstall: Z=$(CONFIG_XEN_INSTALL_SUFFIX)
 _uninstall: D=$(DESTDIR)
 _uninstall: T=$(notdir $(TARGET))
 _uninstall:
-	rm -f $(D)/boot/$(T)-$(XEN_FULLVERSION)$(Z)
-	rm -f $(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
-	rm -f $(D)/boot/$(T)-$(XEN_VERSION)$(Z)
-	rm -f $(D)/boot/$(T)$(Z)
+	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

  parent reply	other threads:[~2013-07-17 15:37 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-17 15:37 [PATCH 0/3] xen: various changes to what we install in /boot Ian Campbell
2013-07-17 15:37 ` [PATCH 1/3] xen: allow architecture to choose how/whether to compress installed xen binary Ian Campbell
2013-07-17 16:32   ` Keir Fraser
2013-07-17 16:44   ` Julien Grall
2013-07-18  7:34   ` Jan Beulich
2013-07-18  7:54     ` Ian Campbell
2013-07-17 15:37 ` Ian Campbell [this message]
2013-07-17 16:33   ` [PATCH 2/3] xen: x86: drop the ".gz" suffix when installing Keir Fraser
2013-07-17 16:53   ` Julien Grall
2013-07-17 15:37 ` [PATCH 3/3] xen: Use $(T) and $(D) aliases in install target Ian Campbell
2013-07-17 16:33   ` Keir Fraser
2013-07-17 16:54   ` Julien Grall
2013-07-18  7:26   ` Jan Beulich
2013-07-18  7:54     ` 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=1374075473-32502-2-git-send-email-ian.campbell@citrix.com \
    --to=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.