From a5f3bebd0b840686f8dafeec78bfb693cfb0d339 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 23 Oct 2019 19:02:06 +0100 Subject: [PATCH] debian/bin/gencontrol.py: Skip linux-perf lintian-overrides if we won't build it --- debian/bin/gencontrol.py | 7 +++---- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index a8167d9f8db7..ffa10fbb4662 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -191,6 +191,9 @@ class Gencontrol(Base): if self.config.merge('packages').get('tools-versioned', True): packages.extend(self.process_packages( self.templates["control.tools-versioned"], self.vars)) + self._substitute_file('perf.lintian-overrides', self.vars, + 'debian/linux-perf-%s.lintian-overrides' % + self.vars['version']) if do_meta: packages.extend(self.process_packages( self.templates["control.tools-versioned.meta"], vars)) @@ -201,10 +204,6 @@ class Gencontrol(Base): packages.extend(self.process_packages( self.templates["control.sourcebin.meta"], vars)) - self._substitute_file('perf.lintian-overrides', self.vars, - 'debian/linux-perf-%s.lintian-overrides' % - self.vars['version']) - def do_indep_featureset_setup(self, vars, makeflags, featureset, extra): makeflags['LOCALVERSION'] = vars['localversion'] kernel_arches = set() diff --git a/debian/changelog b/debian/changelog index 10b2226bf98f..366eb4db8a49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ linux (5.3.7-2) UNRELEASED; urgency=medium * debian/bin/gencontrol_signed.py: Fix code style error + * debian/bin/gencontrol.py: Skip linux-perf lintian-overrides if we won't + build it -- Ben Hutchings Wed, 23 Oct 2019 18:32:15 +0100