debian/bin/gencontrol.py: Skip linux-perf lintian-overrides if we won't build it

This commit is contained in:
Ben Hutchings
2019-10-23 19:02:06 +01:00
parent 719d7878c3
commit a5f3bebd0b
2 changed files with 5 additions and 4 deletions

View File

@@ -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()

2
debian/changelog vendored
View File

@@ -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 <ben@decadent.org.uk> Wed, 23 Oct 2019 18:32:15 +0100