From 85be660d2bb504fe2e85c4ac024d5e171ba764e7 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 9 Jan 2022 20:48:56 +0100 Subject: [PATCH] lintian: Refresh lintian-overrides - source: Update filename for the first override of license-problem-gfdl-invariants. Drop the second override as it's no longer detected. - source: Add overrides for field-too-long in the .dsc file, as this is not a bug. - source: Add overrides for source-contains-prebuilt-windows-binary, as these are test cases for perf and their source is provided. - hyperv-daemons: Add override for maintainer-script-calls-systemctl; our use of systemctl is properly conditional on systemd running. - libcpupower1: Add override for symbols-file-contains-debian-revision: we really have changed symbols in Debian revisions, and those were experimental uploads that won't get backported so we don't need to append ~. - linux-image--dbg: Replace shlib-without-PT_GNU_STACK-section with the new name shared-library-lacks-stack-section. - [amd64] linux-image--dbg: Drop override for binary-from-other-architecture on vdso32.so, which is now allowed. - linux-image--dbg: Drop override for debug-package-should-be-priority-extra, which has been removed. - linux-perf-: Add override for shared-library-lacks-prerequisites in plugins. Some of these only need symbols from libtraceevent, which loads them and should not have a NEEDED entry. - linux-perf-: Drop override of binary-from-other-architecture for perf-read-vdso32, and apply the override for perf-read-vdsox32 only on amd64. --- debian/changelog | 1 + debian/hyperv-daemons.lintian-overrides | 2 ++ debian/libcpupower1.lintian-overrides | 2 ++ debian/rules.real | 1 + debian/source/lintian-overrides | 14 +++++++++----- debian/templates/image-dbg.lintian-overrides.in | 13 +++++++------ .../templates/image-dbg.meta.lintian-overrides.in | 1 - debian/templates/perf.lintian-overrides.in | 9 +++++++-- 8 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 debian/hyperv-daemons.lintian-overrides create mode 100644 debian/libcpupower1.lintian-overrides mode change 100644 => 100755 debian/templates/perf.lintian-overrides.in diff --git a/debian/changelog b/debian/changelog index 53cce3c709..4fad9079b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ linux (5.16-1~exp1) UNRELEASED; urgency=medium * d/watch: Rewrite to find all upstream versions through Git * d/bin/genorig.py, d/README.source: Only support Git as upstream * d/bin/genorig.py, d/README.source: Add support for remote upstream repos + * lintian: Refresh lintian-overrides [ Vincent Blut ] * drivers/net/wireless/realtek/rtw89: Enable RTW89 and RTW89_8852AE as diff --git a/debian/hyperv-daemons.lintian-overrides b/debian/hyperv-daemons.lintian-overrides new file mode 100644 index 0000000000..43e0e412d5 --- /dev/null +++ b/debian/hyperv-daemons.lintian-overrides @@ -0,0 +1,2 @@ +# Our use of systemctl is properly conditional on systemd +hyperv-daemons: maintainer-script-calls-systemctl * diff --git a/debian/libcpupower1.lintian-overrides b/debian/libcpupower1.lintian-overrides new file mode 100644 index 0000000000..665d61221d --- /dev/null +++ b/debian/libcpupower1.lintian-overrides @@ -0,0 +1,2 @@ +# Experimental uploads don't get backported so we don't need to append ~ +libcpupower1: symbols-file-contains-debian-revision on symbol * (libcpupower.so.1) diff --git a/debian/rules.real b/debian/rules.real index 4478037e5d..a03a689fcd 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -703,6 +703,7 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES))) dh_installdocs dh_installman endif + dh_lintian dh_strip dh_compress dh_fixperms diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index cdc205b9d1..4d71cbb925 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -1,14 +1,18 @@ # The copyright notice in the GFDL itself, mentioning invariant # sections, is just an example. lintian seems to whitelist the # plain-text version but that doesn't cover this ReST version. -linux source: license-problem-gfdl-invariants Documentation/media/uapi/fdl-appendix.rst invariant part is: with the :ref:`invariant sections ` being list their titles, with the :ref:`front-cover texts ` being list, and with the :ref:`back-cover texts ` being list - -# lintian fails to recognise that these notices say "with no invariant -# sections ...", presumably due to the ReST markup (bug #924581). -linux source: license-problem-gfdl-invariants Documentation/*.rst invariant part is: published by the free software .. foundation, with no invariant sections, no front-cover texts .. and no back-cover texts +linux source: license-problem-gfdl-invariants Documentation/userspace-api/media/fdl-appendix.rst invariant part is: with the :ref:`invariant sections ` being list their titles, with the :ref:`front-cover texts ` being list, and with the :ref:`back-cover texts ` being list # Kernel dbg packages contain a full image with debug data. linux source: dbg-package-missing-depends # We repack the orig tarball linux source: orig-tarball-missing-upstream-signature * + +# Not a bug, we're just big and complex +linux source: field-too-long Binary * +linux source: field-too-long Build-Depends-Arch * + +# These executables are test cases and source is provided +linux source: source-contains-prebuilt-windows-binary tools/perf/tests/pe-file.exe +linux source: source-contains-prebuilt-windows-binary tools/perf/tests/pe-file.exe.debug diff --git a/debian/templates/image-dbg.lintian-overrides.in b/debian/templates/image-dbg.lintian-overrides.in index 4290c15664..5cc3d9c847 100755 --- a/debian/templates/image-dbg.lintian-overrides.in +++ b/debian/templates/image-dbg.lintian-overrides.in @@ -5,11 +5,12 @@ linux-image-@abiname@@localversion@-dbg: dbg-package-missing-depends # glibc doesn't seem to check for a PT_GNU_STACK section in vDSOs, so # it's OK that they don't have it -[arm64 armhf] linux-image-@abiname@@localversion@-dbg: shlib-without-PT_GNU_STACK-section usr/lib/debug/lib/modules/@abiname@@localversion@/vdso/vdso.so -[amd64 i386 ppc64el s390x] linux-image-@abiname@@localversion@-dbg: shlib-without-PT_GNU_STACK-section usr/lib/debug/lib/modules/@abiname@@localversion@/vdso/vdso32.so -[amd64 ppc64el s390x] linux-image-@abiname@@localversion@-dbg: shlib-without-PT_GNU_STACK-section usr/lib/debug/lib/modules/@abiname@@localversion@/vdso/vdso64.so -[amd64] linux-image-@abiname@@localversion@-dbg: shlib-without-PT_GNU_STACK-section usr/lib/debug/lib/modules/@abiname@@localversion@/vdso/vdsox32.so +[arm64 armhf] linux-image-@abiname@@localversion@-dbg: shared-library-lacks-stack-section usr/lib/debug/lib/modules/@abiname@@localversion@/vdso/vdso.so +[amd64 i386 ppc64el s390x] linux-image-@abiname@@localversion@-dbg: shared-library-lacks-stack-section usr/lib/debug/lib/modules/@abiname@@localversion@/vdso/vdso32.so +[amd64 ppc64el s390x] linux-image-@abiname@@localversion@-dbg: shared-library-lacks-stack-section usr/lib/debug/lib/modules/@abiname@@localversion@/vdso/vdso64.so +[amd64] linux-image-@abiname@@localversion@-dbg: shared-library-lacks-stack-section usr/lib/debug/lib/modules/@abiname@@localversion@/vdso/vdsox32.so -# It is intended that 64-bit kernels provide vDSOs for 32-bit executables -[amd64 ppc64el s390x] linux-image-@abiname@@localversion@-dbg: binary-from-other-architecture usr/lib/debug/lib/modules/@abiname@@localversion@/vdso/vdso32.so +# It is intended that 64-bit kernels provide vDSOs for 32-bit executables. +# lintian currently allows i386 executables on amd64. +[ppc64el s390x] linux-image-@abiname@@localversion@-dbg: binary-from-other-architecture usr/lib/debug/lib/modules/@abiname@@localversion@/vdso/vdso32.so [amd64] linux-image-@abiname@@localversion@-dbg: binary-from-other-architecture usr/lib/debug/lib/modules/@abiname@@localversion@/vdso/vdsox32.so diff --git a/debian/templates/image-dbg.meta.lintian-overrides.in b/debian/templates/image-dbg.meta.lintian-overrides.in index a3c7e848c5..1dcd137954 100644 --- a/debian/templates/image-dbg.meta.lintian-overrides.in +++ b/debian/templates/image-dbg.meta.lintian-overrides.in @@ -1,2 +1 @@ linux-image@source_suffix@-@flavour@-dbg: wrong-section-according-to-package-name linux-image@source_suffix@-@flavour@-dbg => debug -linux-image@source_suffix@-@flavour@-dbg: debug-package-should-be-priority-extra linux-image@source_suffix@-@flavour@-dbg diff --git a/debian/templates/perf.lintian-overrides.in b/debian/templates/perf.lintian-overrides.in old mode 100644 new mode 100755 index 858faa782e..f987d31f89 --- a/debian/templates/perf.lintian-overrides.in +++ b/debian/templates/perf.lintian-overrides.in @@ -1,3 +1,8 @@ +#!/usr/bin/dh-exec + # 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 +[amd64] linux-perf-@version@: binary-from-other-architecture usr/lib/perf_@version@-core/perf-read-vdsox32 + +# Some of these plugins only need symbols from libtraceevent, which +# loads them and should not have a NEEDED entry +linux-perf-@version@: shared-library-lacks-prerequisites usr/lib/traceevent_@version@/plugins/plugin_*.so