From 43640872d9a53f9d15e5f0054cafe4e4e2e718c6 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 14 May 2016 20:12:28 +0100 Subject: [PATCH] debian/control,debian/rules: Support a 'pkg.linux.notools' build profile ...which does not build tools packages --- debian/changelog | 2 ++ debian/rules | 3 ++ debian/templates/control.source.in | 44 +++++++++++++++--------------- debian/templates/control.tools.in | 22 +++++++-------- 4 files changed, 38 insertions(+), 33 deletions(-) diff --git a/debian/changelog b/debian/changelog index d192efd22..8fb720033 100644 --- a/debian/changelog +++ b/debian/changelog @@ -99,6 +99,8 @@ linux (4.5.4-1) UNRELEASED; urgency=medium * gencontrol.py: Fix implementation of [packages]tools config option, thanks to Yves-Alexis Perez * debian/control: Exclude tools from 'stage1' build profile + * debian/control,debian/rules: Support a 'pkg.linux.notools' build profile + which does not build tools packages -- Aurelien Jarno Tue, 10 May 2016 23:58:07 +0200 diff --git a/debian/rules b/debian/rules index c1bbc80d3..17646a4d5 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,9 @@ ifdef DEBIAN_KERNEL_JOBS MAKEFLAGS += -j$(DEBIAN_KERNEL_JOBS) endif BUILD_STAGE1 := $(filter stage1,$(DEB_BUILD_PROFILES)) +ifneq (,$(filter pkg.linux.notools,$(DEB_BUILD_PROFILES))) + MAKEFLAGS += DO_TOOLS=False +endif .NOTPARALLEL: diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index f82c9b266..71d465d70 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -23,34 +23,34 @@ Build-Depends: libssl-dev , openssl , # used by upstream to build perf documentation - asciidoc , - xmlto , + asciidoc , + xmlto , # used by upstream to build perf - bison , - flex , - gcc-multilib [amd64 ppc64 s390x sparc64] , - libaudit-dev , - libdw-dev , - libelf-dev , - libiberty-dev | binutils-dev (<< 2.23.91.20131123-1) , - libnewt-dev , - libnuma-dev [amd64 arm64 hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sparc x32] , - libperl-dev , - libunwind8-dev [amd64 armel armhf arm64 i386] , - python-dev , + bison , + flex , + gcc-multilib [amd64 ppc64 s390x sparc64] , + libaudit-dev , + libdw-dev , + libelf-dev , + libiberty-dev | binutils-dev (<< 2.23.91.20131123-1) , + libnewt-dev , + libnuma-dev [amd64 arm64 hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sparc x32] , + libperl-dev , + libunwind8-dev [amd64 armel armhf arm64 i386] , + python-dev , # used by upstream to build usbip - autoconf , - automake , - libtool , - libglib2.0-dev , - libudev-dev , - libwrap0-dev , + autoconf , + automake , + libtool , + libglib2.0-dev , + libudev-dev , + libwrap0-dev , # used by upstream to build cpupower - libpci-dev , + libpci-dev , # used by debian/rules.real to build linux-perf and linux-support dh-python , # used by debian/rules.real to build hyperv-daemons - dh-systemd , + dh-systemd , Build-Depends-Indep: # used by debian/rules.real to build linux-source patchutils , diff --git a/debian/templates/control.tools.in b/debian/templates/control.tools.in index 550584f17..ed2d9af30 100644 --- a/debian/templates/control.tools.in +++ b/debian/templates/control.tools.in @@ -1,5 +1,5 @@ Package: linux-kbuild-@version@ -Build-Profiles: +Build-Profiles: Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: foreign @@ -7,7 +7,7 @@ Description: Kbuild infrastructure for Linux @version@ This package provides the kbuild infrastructure for the headers packages for Linux kernel version @version@. Package: linux-cpupower -Build-Profiles: +Build-Profiles: Section: admin Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -20,7 +20,7 @@ Description: CPU frequency and voltage scaling tools for Linux cpufrequtils. Package: libcpupower0 -Build-Profiles: +Build-Profiles: Section: libs Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -28,7 +28,7 @@ Description: CPU frequency and voltage scaling tools for Linux (libraries) This package contains the shared library. Package: libcpupower-dev -Build-Profiles: +Build-Profiles: Section: libdevel Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -39,7 +39,7 @@ Description: CPU frequency and voltage scaling tools for Linux (development file This package contains the 'power/cpupower' headers and library shared objects. Package: linux-perf-@version@ -Build-Profiles: +Build-Profiles: Section: devel Architecture: alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends} @@ -56,7 +56,7 @@ Description: Performance analysis tools for Linux @version@ appropriate version for the running kernel. Package: libusbip-dev -Build-Profiles: +Build-Profiles: Architecture: linux-any Depends: ${misc:Depends} Section: libdevel @@ -67,7 +67,7 @@ Description: USB device sharing system over IP network (development files) the library itself for static linking. Package: usbip -Build-Profiles: +Build-Profiles: Architecture: linux-any Depends: usbutils, ${shlibs:Depends}, ${misc:Depends} Section: admin @@ -90,7 +90,7 @@ Description: USB device sharing system over IP network client tool 'usbip'. Package: hyperv-daemons -Build-Profiles: +Build-Profiles: Architecture: i386 amd64 x32 Depends: lsb-base (>= 3.2-14), ${shlibs:Depends}, ${misc:Depends} Section: admin @@ -109,7 +109,7 @@ Description: Support daemons for Linux running on Hyper-V the host to freeze the guest filesystems while taking a snapshot. Package: lockdep -Build-Profiles: +Build-Profiles: Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, liblockdep@version@ Recommends: liblockdep-dev @@ -120,7 +120,7 @@ Description: Runtime locking correctness validator actual and potential deadlocks and other locking bugs. Package: liblockdep@version@ -Build-Profiles: +Build-Profiles: Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} Section: libs @@ -130,7 +130,7 @@ Description: Runtime locking correctness validator (shared library) be used to detect actual and potential deadlocks and other locking bugs. Package: liblockdep-dev -Build-Profiles: +Build-Profiles: Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} Section: libdevel