[kernel] r15974 - in dists/trunk/linux-2.6/debian: . templates

[Ben Hutchings]

Author: benh
Date: Sat Jul 10 20:53:49 2010
New Revision: 15974

Log:
linux-tools: Restrict architectures

Don't attempt to build for architectures where perf events are not available.
Also set V=2 to help debug any build failures.

Modified:
   dists/trunk/linux-2.6/debian/rules.real
   dists/trunk/linux-2.6/debian/templates/control.main.in
   dists/trunk/linux-2.6/debian/templates/control.source.in

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Sat Jul 10 17:55:43 2010	(r15973)
+++ dists/trunk/linux-2.6/debian/rules.real	Sat Jul 10 20:53:49 2010	(r15974)
@@ -32,14 +32,16 @@
 MAKE_CLEAN = $(setup_env) $(MAKE)
 MAKE_SELF := $(MAKE) -f debian/rules.real $(MAKEOVERRIDES)
 MAKEOVERRIDES =
-MAKE_PERF_VARS = prefix=/usr NO_PERL=1 MBITS=
+MAKE_PERF_VARS = prefix=/usr NO_PERL=1 V=2
 
 #
 # Targets
 #
 binary-arch-arch: install-headers_$(ARCH)
 binary-arch-arch: install-libc-dev_$(ARCH)
-binary-arch-arch: install-tools_$(ARCH)
+ifneq ($(filter alpha amd64 armel hppa i386 powerpc s390 sh4 sparc sparc64,$(ARCH)),)
+  binary-arch-arch: install-tools_$(ARCH)
+endif
 binary-arch-featureset: install-headers_$(ARCH)_$(FEATURESET)
 binary-arch-flavour: install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
 ifeq ($(DEBUG),True)

Modified: dists/trunk/linux-2.6/debian/templates/control.main.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.main.in	Sat Jul 10 17:55:43 2010	(r15973)
+++ dists/trunk/linux-2.6/debian/templates/control.main.in	Sat Jul 10 20:53:49 2010	(r15974)
@@ -1,5 +1,5 @@
 Package: linux-tools- at version@
-Architecture: any
+Architecture: alpha amd64 armel hppa i386 powerpc s390 sh4 sparc sparc64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: linux-base (>= 2.6.32-16)
 Suggests: linux-doc- at version@

Modified: dists/trunk/linux-2.6/debian/templates/control.source.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.source.in	Sat Jul 10 17:55:43 2010	(r15973)
+++ dists/trunk/linux-2.6/debian/templates/control.source.in	Sat Jul 10 20:53:49 2010	(r15974)
@@ -3,7 +3,7 @@
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>, maximilian attems <maks at debian.org>, Ben Hutchings <ben at decadent.org.uk>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>> 7), cpio, module-init-tools, python, lzma [armel], libelf-dev, asciidoc, xmlto
+Build-Depends: debhelper (>> 7), cpio, module-init-tools, python, lzma [armel], libelf-dev, binutils-dev, asciidoc, xmlto
 Build-Depends-Indep: bzip2, python-support
 Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/sid/linux-2.6/
 Vcs-Browser: http://svn.debian.org/wsvn/kernel/dists/sid/linux-2.6/?op=log