From fde68c83d9976ebb1dd6c747a7f2ef81ea1118a0 Mon Sep 17 00:00:00 2001 From: Hans van Kranenburg Date: Sat, 6 Aug 2022 11:55:52 +0200 Subject: [PATCH] d/*lintian-overrides*: deal with formatting changes The message output of lintian is changing, and the override lines are meant to match those messages to silence them. THEN: statically-linked-binary usr/lib/xen-4.16/boot/xen-shim NOW: statically-linked-binary [usr/lib/xen-4.16/boot/xen-shim] Also see: https://bugs.debian.org/1007002 So, the goal while writing these overrides is not to be as specific as possible, it's better to be more generic and aim for the lowest chance to accidentally match (hide) another problem. For example, for the no-symbols-control-file one in libxenmisc it's the case for ALL of the so files in the package, so there's not really a need to put more effort in matching them specifically. For others, we mostly can just put a * before and after the file names, so that this will work with old and new lintian versions. For binary-has-unneeded-section and spelling-error-in-binary, it seems the order of stuff on the line has changed (filename is now in brackets and is moved to the beginning of the line), so for them just also use only the file name with some added *'s... O_o --- debian/libxenmiscV.lintian-overrides.vsn-in | 2 +- debian/xen-hypervisor-V-F.lintian-overrides.vsn-in | 2 +- debian/xen-utils-V.lintian-overrides.vsn-in | 10 +++++----- debian/xenstore-utils.lintian-overrides | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/libxenmiscV.lintian-overrides.vsn-in b/debian/libxenmiscV.lintian-overrides.vsn-in index e2ab9a8af7..7eb58e9765 100644 --- a/debian/libxenmiscV.lintian-overrides.vsn-in +++ b/debian/libxenmiscV.lintian-overrides.vsn-in @@ -1,7 +1,7 @@ # The ABI changes every Xen release and every Debian release anyway # and we do not upload to Debian packages based on Xen upstream # versions which are at least an rc with a stable ABI. -no-symbols-control-file usr/lib/*/lib*.so.@version@.0 +no-symbols-control-file # Yes, this is a portmanteau package. They all change at once. package-name-doesnt-match-sonames diff --git a/debian/xen-hypervisor-V-F.lintian-overrides.vsn-in b/debian/xen-hypervisor-V-F.lintian-overrides.vsn-in index 5c6df104ac..e8ea833200 100644 --- a/debian/xen-hypervisor-V-F.lintian-overrides.vsn-in +++ b/debian/xen-hypervisor-V-F.lintian-overrides.vsn-in @@ -1,4 +1,4 @@ # Aas is traditional for kernels too, we ship the debug information # in the hypervisor package rather than creating yet another # package just for this file, which is only 50K or so anyway. -debug-suffix-not-dbg usr/lib/debug/xen-*.efi.map.gz +debug-suffix-not-dbg *usr/lib/debug/xen-*.efi.map.gz* diff --git a/debian/xen-utils-V.lintian-overrides.vsn-in b/debian/xen-utils-V.lintian-overrides.vsn-in index 2fb84c24a4..cb1e5c477f 100644 --- a/debian/xen-utils-V.lintian-overrides.vsn-in +++ b/debian/xen-utils-V.lintian-overrides.vsn-in @@ -1,6 +1,6 @@ -statically-linked-binary usr/lib/xen-@version@/boot/hvmloader -statically-linked-binary usr/lib/xen-@version@/boot/xen-shim +statically-linked-binary *usr/lib/xen-@version@/boot/hvmloader* +statically-linked-binary *usr/lib/xen-@version@/boot/xen-shim* -# That section is certainly needed for the tools etc. to be able -# to load it! -binary-has-unneeded-section usr/lib/xen-@version@/boot/xen-shim .note +# The .note section is certainly needed for the tools etc. to be +# able to load it! +binary-has-unneeded-section *usr/lib/xen-@version@/boot/xen-shim* diff --git a/debian/xenstore-utils.lintian-overrides b/debian/xenstore-utils.lintian-overrides index e82a32baab..ef8c4110a8 100644 --- a/debian/xenstore-utils.lintian-overrides +++ b/debian/xenstore-utils.lintian-overrides @@ -1,2 +1,2 @@ # These have --upto as a command line argument -spelling-error-in-binary usr/bin/xenstore* upto up to +spelling-error-in-binary *usr/bin/xenstore* -- 2.30.2