[SCM] Debian package checker branch, master, updated. 2.2.10-91-gd717679
The following commit has been merged in the master branch:
commit d717679346cbec2aaa4423d2453ba777ae9f8a69
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Fri Jun 5 22:27:50 2009 +0100
Generalise the "i386/amd64" kernel module check to other architectures
* checks/binaries:
+ [ADB] Don't consider an 64-bit kernel module shipped in a binary
package for the corresponding 32-bit architecture to be "from other
architecture". (Closes: #532013)
diff --git a/checks/binaries b/checks/binaries
index 937e50d..3b37808 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -56,6 +56,16 @@ our %ARCH_REGEX = (
'sparc' => qr'ELF 32-bit MSB .* SPARC',
'sparc64' => qr'ELF 64-bit MSB .* SPARC');
+our %arch_64bit_equivs = (
+ 'i386' => 'amd64',
+ 'kfreebsd-i386' => 'kfreebsd-amd64',
+ 'mips' => 'mips64',
+ 'mipsel' => 'mipsel64',
+ 'powerpc' => 'ppc64',
+ 's390' => 's390x',
+ 'sparc' => 'sparc64',
+);
+
our $multiarch;
sub run {
@@ -206,8 +216,8 @@ foreach my $file (sort keys %{$info->file_info}) {
unless ($fileinfo =~ m/$ARCH_REGEX{$1}/);
} elsif ($arch eq 'amd64' and $fileinfo =~ m/$ARCH_REGEX{i386}/) {
# Ignore i386 binaries in amd64 packages for right now.
- } elsif ($arch eq 'i386' and
- $file =~ m,^./lib/modules/[^/]+-amd64/,) {
+ } elsif (exists $arch_64bit_equivs{$arch} and
+ $fileinfo =~ m/$ARCH_REGEX{$arch_64bit_equivs{$arch}}/) {
# Allow amd64 kernel modules to be installed on i386.
} else {
$multiarch = Lintian::Data->new('binaries/multiarch')
diff --git a/debian/changelog b/debian/changelog
index 3432dea..8da8a32 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ lintian (2.2.11) UNRELEASED; urgency=low
and Paul Gevers. (Closes: #526435)
+ [RA] Downgrade certainty of tags for which we recommend overrides.
Patch from Raphael Geissert. (Closes: #530008)
- + [ADB] Don't consider an amd64 kernel module shipped in an i386
- binary package to be "from other architecture". (Closes: #532013)
+ + [ADB] Don't consider an 64-bit kernel module shipped in a binary
+ package for the corresponding 32-bit architecture to be "from other
+ architecture". (Closes: #532013)
* checks/control-file{,.desc}:
+ [ADB] Refer to main, contrib and non-free as archive areas rather
than categories.
--
Debian package checker
Reply to: