[Pkg-xen-changes] [xen] 02/08: Paramterize the Xen binary suffix

[Bastian Blank]

This is an automated email from the git hooks/post-receive script.

waldi pushed a commit to branch develop
in repository xen.

commit b3113e178cae996a8e12ebc8a098727c177cb404
Author: Ian Campbell <ijc at hellion.org.uk>
Date:   Sat Jul 12 16:15:25 2014 +0100

    Paramterize the Xen binary suffix
    
    This will differ under ARM.
---
 debian/arch/amd64/defines | 1 +
 debian/bin/gencontrol.py  | 1 +
 debian/rules.real         | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/arch/amd64/defines b/debian/arch/amd64/defines
index 6bfd197..8585798 100644
--- a/debian/arch/amd64/defines
+++ b/debian/arch/amd64/defines
@@ -2,6 +2,7 @@
 flavours:
  amd64
 xen-arch: x86_64
+image-suffix: .gz
 
 [amd64_description]
 hardware: AMD64
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 5973409..40f8837 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -70,6 +70,7 @@ class Gencontrol(Base):
 
         for i in (
             ('xen-arch', 'XEN_ARCH'),
+            ('image-suffix', 'IMAGE_SUFFIX'),
         ):
             if config_entry.has_key(i[0]):
                 makeflags[i[1]] = config_entry[i[0]]
diff --git a/debian/rules.real b/debian/rules.real
index fa44253..bd35e55 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -149,7 +149,7 @@ install-hypervisor_$(ARCH)_$(FLAVOUR): $(STAMPS_DIR)/build-hypervisor_$(ARCH)_$(
 	dh_testroot
 	dh_prep
 	dh_installdirs boot
-	cp $(DIR)/xen/xen.gz debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)-$(FLAVOUR).gz
+	cp $(DIR)/xen/xen$(IMAGE_SUFFIX) debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)-$(FLAVOUR)$(IMAGE_SUFFIX)
 	+$(MAKE_SELF) install-base
 
 install-libxen_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git