[linux-tools] 06/13: hyperv-daemons: Only attempt to build package on i386, amd64 (fixes FTBFS on other architectures)

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Thu Nov 5 22:56:29 UTC 2015


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

benh pushed a commit to branch jessie
in repository linux-tools.

commit aa7ad74198522b253cf3390bf3c33baf2f14d5a4
Author: Ben Hutchings <benh at debian.org>
Date:   Thu Jul 16 18:59:30 2015 +0000

    hyperv-daemons: Only attempt to build package on i386, amd64 (fixes FTBFS on other architectures)
    
    (cherry picked from commit b3cf7793e22175296403564a7dcb52e2bf62339a)
    
    Conflicts:
    	debian/changelog
    	debian/rules.real
---
 debian/changelog  | 2 +-
 debian/rules.real | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 022171e..a2c799e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 linux-tools (3.16-4) UNRELEASED; urgency=medium
 
-  * Add hyperv-daemons package, thanks to Hideki Yamane (closes: #782761)
+  * [x86] Add hyperv-daemons package, thanks to Hideki Yamane (closes: #782761)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 04 Nov 2015 12:49:40 +0000
 
diff --git a/debian/rules.real b/debian/rules.real
index 59ba186..9e485a5 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -8,10 +8,13 @@ DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 # includes any binNMU part.
 VERSION_DEBIAN_FULL := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
 
-binary-arch: install-kbuild install-usbip install-hyperv-daemons
+binary-arch: install-kbuild install-usbip
 ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
   binary-arch: install-tools
 endif
+ifneq ($(filter i386 amd64,$(DEB_BUILD_ARCH)),)
+  binary-arch: install-hyperv-daemons
+endif
 
 build: $(STAMPS_DIR)/build
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-tools.git



More information about the Kernel-svn-changes mailing list