[linux-tools] 01/01: hyperv-daemons: Only build the progarams on x86 (fixes FTBFS)

[debian-kernel at lists.debian.org]

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

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

commit f02b94c349eb10bd00d1cec99641c0c3f752b3b7
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Feb 21 16:58:27 2016 +0000

    hyperv-daemons: Only build the progarams on x86 (fixes FTBFS)
    
    The daemons themselves can be built for any architecture, although on
    !x86 they are useless and won't be included in any package.  However,
    the newly introduced check-hyperv.c include inline assembly which
    breaks the build.
    
    (cherry picked from commit 68b1d566ae480617872c21a5efc2de8323c8776a)
---
 debian/build/tools/hv/Makefile | 9 +++++++++
 debian/changelog               | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/debian/build/tools/hv/Makefile b/debian/build/tools/hv/Makefile
index fb3ff37..c958962 100644
--- a/debian/build/tools/hv/Makefile
+++ b/debian/build/tools/hv/Makefile
@@ -1,3 +1,10 @@
+ifeq ($(filter i386 amd64 x32,$(DEB_BUILD_ARCH)),)
+
+# Build nothing
+include ../../Makefile.inc
+
+else
+
 PROGS = \
 	hv_fcopy_daemon \
 	hv_kvp_daemon \
@@ -15,3 +22,5 @@ install-local-progs: $(PROGS)
 	  install -D -m755 "$$p" "$(DESTDIR)/$(prefix)/$$(basename $$p)"; \
 	done
 	install -D -m755 check-hyperv '$(DESTDIR)/lib/hyperv-daemons/check-hyperv'
+
+endif
diff --git a/debian/changelog b/debian/changelog
index 9978ebc..e94308e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-tools (3.16.7-ckt20-1~bpo70+2) wheezy-backports; urgency=medium
+
+  * hyperv-daemons: Only build the progarams on x86 (fixes FTBFS)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 21 Feb 2016 17:26:06 +0000
+
 linux-tools (3.16.7-ckt20-1~bpo70+1) wheezy-backports; urgency=medium
 
   * Rebuild for wheezy

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