[Pkg-xen-changes] [xen] 02/07: Add support for armhf

[Ian Campbell]

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

ijc-guest pushed a commit to branch feature/arm
in repository xen.

commit 0f10c203b642fb14e50dc96e4fe794c6d5681117
Author: Ian Campbell <ijc at hellion.org.uk>
Date:   Sat Jul 12 16:38:47 2014 +0100

    Add support for armhf
---
 debian/arch/armhf/defines          | 10 ++++++++++
 debian/arch/defines                |  1 +
 debian/changelog                   |  1 +
 debian/rules.real                  |  2 ++
 debian/templates/control.source.in |  9 +++++----
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/arch/armhf/defines b/debian/arch/armhf/defines
new file mode 100644
index 0000000..ee6918e
--- /dev/null
+++ b/debian/arch/armhf/defines
@@ -0,0 +1,10 @@
+[base]
+flavours:
+ armhf
+xen-arch: arm32
+image-suffix:
+
+[armhf_description]
+hardware: ARMHF
+hardware-long: all 32bit ARMv7 with virtualisation extensions
+
diff --git a/debian/arch/defines b/debian/arch/defines
index 4ef9af2..151b75f 100644
--- a/debian/arch/defines
+++ b/debian/arch/defines
@@ -3,4 +3,5 @@
 [base]
 arches:
  amd64
+ armhf
  i386
diff --git a/debian/changelog b/debian/changelog
index 87a6536..c884019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ xen (4.4.0-1) UNRELEASED; urgency=medium
   * Use system qemu-xen via new configure option instead of patching.
   * Use system seabios via new configure option instead of patching.
   * Use APPEND_{CFLAGS,CPPFLAGS,LDFLAGS} during build.
+  * Add support for armhf.
 
  -- Bastian Blank <waldi at debian.org>  Sat, 05 Jul 2014 12:54:54 +0200
 
diff --git a/debian/rules.real b/debian/rules.real
index 4c10787..9e70f56 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -107,8 +107,10 @@ $(STAMPS_DIR)/install-utils_$(ARCH): $(STAMPS_DIR)/build-utils_$(ARCH)
 	@rm -rf $(INSTALL_DIR)
 	mkdir -p $(INSTALL_DIR)/$(OCAML_DLL_DIR)
 	+$(MAKE_CLEAN) -C $(DIR)/tools install DESTDIR=$(CURDIR)/$(INSTALL_DIR) $(CONFIG)
+ifneq ($(filter i386 amd64,$(ARCH)),)
 	# hvmloader
 	strip --remove-section=.comment --remove-section=.note $(INSTALL_DIR)/usr/lib/xen*/boot/*
+endif
 	touch $@
 
 $(STAMPS_DIR)/install-utils-common: DIR = $(BUILD_DIR)/build-docs
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 232cd8e..abadacd 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -7,12 +7,13 @@ Build-Depends:
  dpkg-dev (>= 1.16.0~),
  lsb-release,
  python-dev,
- bcc,
- gcc-multilib,
+ bcc [i386 amd64],
+ gcc-multilib [i386 amd64],
  e2fslibs-dev,
- iasl,
- seabios,
+ iasl [i386 amd64],
+ seabios [i386 amd64],
  libaio-dev,
+ libfdt-dev [armhf],
  libglib2.0-dev,
  libgnutls-dev,
  liblzma-dev,

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