[linux] 01/04: fix tools disabling in arch-specific rules
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sat May 14 18:59:12 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 0dd643da08422f584bd89e4e9a89b178fe979e8d
Author: Yves-Alexis Perez <corsac at debian.org>
Date: Mon May 9 13:44:27 2016 +0200
fix tools disabling in arch-specific rules
(cherry picked from commit 3aa2269f2b3162772d052154d8bed726ff18df1e)
[bwh: Note this in debian/changelog. Neaten vertical spacing.]
---
debian/bin/gencontrol.py | 2 ++
debian/changelog | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 6584b7c..434b9fd 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -175,6 +175,8 @@ class Gencontrol(Base):
else:
makeflags['DO_LIBC'] = False
+ if not self.config.merge('packages').get('tools', True):
+ makeflags['DO_TOOLS'] = False
self.merge_packages(packages, packages_headers_arch, arch)
diff --git a/debian/changelog b/debian/changelog
index de47552..34cd161 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -95,6 +95,10 @@ linux (4.5.4-1) UNRELEASED; urgency=medium
[ Salvatore Bonaccorso ]
* KEYS: Fix ASN.1 indefinite length object parsing (CVE-2016-0758)
+ [ Ben Hutchings ]
+ * gencontrol.py: Fix implementation of [packages]tools config option,
+ thanks to Yves-Alexis Perez
+
-- Aurelien Jarno <aurel32 at debian.org> Tue, 10 May 2016 23:58:07 +0200
linux (4.5.3-2) unstable; urgency=medium
--
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