[linux] 02/03: debian/control, debian/rules: Support a 'pkg.linux.notools' build profile
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sat May 14 22:36:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch sid
in repository linux.
commit 43640872d9a53f9d15e5f0054cafe4e4e2e718c6
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Sat May 14 20:12:28 2016 +0100
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 d192efd..8fb7200 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 <aurel32 at debian.org> Tue, 10 May 2016 23:58:07 +0200
diff --git a/debian/rules b/debian/rules
index c1bbc80..17646a4 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 f82c9b2..71d465d 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -23,34 +23,34 @@ Build-Depends:
libssl-dev <!stage1>,
openssl <!stage1>,
# used by upstream to build perf documentation
- asciidoc <!stage1>,
- xmlto <!stage1>,
+ asciidoc <!stage1 !pkg.linux.notools>,
+ xmlto <!stage1 !pkg.linux.notools>,
# used by upstream to build perf
- bison <!stage1>,
- flex <!stage1>,
- gcc-multilib [amd64 ppc64 s390x sparc64] <!stage1>,
- libaudit-dev <!stage1>,
- libdw-dev <!stage1>,
- libelf-dev <!stage1>,
- libiberty-dev <!stage1> | binutils-dev (<< 2.23.91.20131123-1) <!stage1>,
- libnewt-dev <!stage1>,
- libnuma-dev [amd64 arm64 hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sparc x32] <!stage1>,
- libperl-dev <!stage1>,
- libunwind8-dev [amd64 armel armhf arm64 i386] <!stage1>,
- python-dev <!stage1>,
+ bison <!stage1 !pkg.linux.notools>,
+ flex <!stage1 !pkg.linux.notools>,
+ gcc-multilib [amd64 ppc64 s390x sparc64] <!stage1 !pkg.linux.notools>,
+ libaudit-dev <!stage1 !pkg.linux.notools>,
+ libdw-dev <!stage1 !pkg.linux.notools>,
+ libelf-dev <!stage1 !pkg.linux.notools>,
+ libiberty-dev <!stage1 !pkg.linux.notools> | binutils-dev (<< 2.23.91.20131123-1) <!stage1 !pkg.linux.notools>,
+ libnewt-dev <!stage1 !pkg.linux.notools>,
+ libnuma-dev [amd64 arm64 hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sparc x32] <!stage1 !pkg.linux.notools>,
+ libperl-dev <!stage1 !pkg.linux.notools>,
+ libunwind8-dev [amd64 armel armhf arm64 i386] <!stage1 !pkg.linux.notools>,
+ python-dev <!stage1 !pkg.linux.notools>,
# used by upstream to build usbip
- autoconf <!stage1>,
- automake <!stage1>,
- libtool <!stage1>,
- libglib2.0-dev <!stage1>,
- libudev-dev <!stage1>,
- libwrap0-dev <!stage1>,
+ autoconf <!stage1 !pkg.linux.notools>,
+ automake <!stage1 !pkg.linux.notools>,
+ libtool <!stage1 !pkg.linux.notools>,
+ libglib2.0-dev <!stage1 !pkg.linux.notools>,
+ libudev-dev <!stage1 !pkg.linux.notools>,
+ libwrap0-dev <!stage1 !pkg.linux.notools>,
# used by upstream to build cpupower
- libpci-dev <!stage1>,
+ libpci-dev <!stage1 !pkg.linux.notools>,
# used by debian/rules.real to build linux-perf and linux-support
dh-python <!stage1>,
# used by debian/rules.real to build hyperv-daemons
- dh-systemd <!stage1>,
+ dh-systemd <!stage1 !pkg.linux.notools>,
Build-Depends-Indep:
# used by debian/rules.real to build linux-source
patchutils <!stage1>,
diff --git a/debian/templates/control.tools.in b/debian/templates/control.tools.in
index 550584f..ed2d9af 100644
--- a/debian/templates/control.tools.in
+++ b/debian/templates/control.tools.in
@@ -1,5 +1,5 @@
Package: linux-kbuild- at version@
-Build-Profiles: <!stage1>
+Build-Profiles: <!stage1 !pkg.linux.notools>
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 at .
Package: linux-cpupower
-Build-Profiles: <!stage1>
+Build-Profiles: <!stage1 !pkg.linux.notools>
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: <!stage1>
+Build-Profiles: <!stage1 !pkg.linux.notools>
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: <!stage1>
+Build-Profiles: <!stage1 !pkg.linux.notools>
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- at version@
-Build-Profiles: <!stage1>
+Build-Profiles: <!stage1 !pkg.linux.notools>
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: <!stage1>
+Build-Profiles: <!stage1 !pkg.linux.notools>
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: <!stage1>
+Build-Profiles: <!stage1 !pkg.linux.notools>
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: <!stage1>
+Build-Profiles: <!stage1 !pkg.linux.notools>
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: <!stage1>
+Build-Profiles: <!stage1 !pkg.linux.notools>
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, liblockdep at version@
Recommends: liblockdep-dev
@@ -120,7 +120,7 @@ Description: Runtime locking correctness validator
actual and potential deadlocks and other locking bugs.
Package: liblockdep at version@
-Build-Profiles: <!stage1>
+Build-Profiles: <!stage1 !pkg.linux.notools>
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: <!stage1>
+Build-Profiles: <!stage1 !pkg.linux.notools>
Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}
Section: libdevel
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list