From 2f7603fb207135a07746cfeb325ad15ac463963c Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 10 Jul 2010 20:53:49 +0000 Subject: [PATCH] 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. svn path=/dists/trunk/linux-2.6/; revision=15974 --- debian/rules.real | 6 ++++-- debian/templates/control.main.in | 2 +- debian/templates/control.source.in | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/rules.real b/debian/rules.real index 01a549eef..4304a15a6 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -32,14 +32,16 @@ setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTION_UPLOADER=$(UPLOADER) DIS 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) diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in index 3ad15802a..62b6ab265 100644 --- a/debian/templates/control.main.in +++ b/debian/templates/control.main.in @@ -1,5 +1,5 @@ Package: linux-tools-@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-@version@ diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index 89e601894..377d3b46d 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Kernel Team Uploaders: Bastian Blank , Frederik Schüler , maximilian attems , Ben Hutchings 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