From 466e99f39753af7b4dd3fc0fe444efc44a1e1c58 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 20 Mar 2016 16:19:25 +0000 Subject: [PATCH] linux-perf: Override lintian errors for perf-read-vdso{,x}32 in 64-bit packages --- debian/bin/gencontrol.py | 7 +++++++ debian/changelog | 2 ++ debian/rules.real | 1 + debian/templates/lintian-overrides.perf.in | 3 +++ 4 files changed, 13 insertions(+) create mode 100644 debian/templates/lintian-overrides.perf.in diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index d299ef252..33f4241fd 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -51,6 +51,13 @@ class gencontrol(Gencontrol): main = self.templates["control.main"] packages.extend(self.process_packages(main, self.vars)) + def substitute_file(template, target): + with codecs.open(target, 'w', 'utf-8') as f: + f.write(self.substitute(self.templates[template], self.vars)) + substitute_file('lintian-overrides.perf', + 'debian/linux-perf-%s.lintian-overrides' % + self.vars['version']) + def process_changelog(self): changelog = Changelog(version = VersionLinux) self.version = version = changelog[0].version diff --git a/debian/changelog b/debian/changelog index 7674e585b..b09489845 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ linux-tools (4.4.6-1) UNRELEASED; urgency=medium [ Ben Hutchings ] * debian/control: Update policy version to 3.9.7; no changes required + * linux-perf: Override lintian errors for perf-read-vdso{,x}32 in + 64-bit packages -- Ben Hutchings Sun, 20 Mar 2016 15:35:32 +0000 diff --git a/debian/rules.real b/debian/rules.real index 891c39ba1..dd3980a64 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -76,6 +76,7 @@ install-perf: $(STAMPS_DIR)/build dh_python2 /usr/share/perf_$(VERSION)-core/scripts/python/Perf-Trace-Util/lib/ dh_installchangelogs dh_installdocs + dh_lintian dh_strip dh_compress dh_fixperms diff --git a/debian/templates/lintian-overrides.perf.in b/debian/templates/lintian-overrides.perf.in new file mode 100644 index 000000000..858faa782 --- /dev/null +++ b/debian/templates/lintian-overrides.perf.in @@ -0,0 +1,3 @@ +# These executables are needed to handle processes running in compat mode +linux-perf-@version@: binary-from-other-architecture usr/lib/perf_@version@-core/perf-read-vdso32 +linux-perf-@version@: binary-from-other-architecture usr/lib/perf_@version@-core/perf-read-vdsox32