Patchwork [1/2] UBUNTU: abi-check -- be more forgiving of the ABI element type

login
register
mail settings
Submitter Andy Whitcroft
Date May 6, 2010, 9:08 a.m.
Message ID <1273136927-24974-2-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/51807/
State Accepted
Delegated to: Andy Whitcroft
Headers show

Comments

Andy Whitcroft - May 6, 2010, 9:08 a.m.
BugLink: http://bugs.launchpad.net/bugs/576274

With some configurations we may find entries in the ABI which are not
EXPORT_*.  For example with CONFIG_UNUSED_SYMBOLS=n entries marked as
UNUSED are listed as below:

    (unknown) vmlinux 0xc48a85c4    simple_prepare_write

This leads to an undiagnosable error from abi-check:

    Missing module name in is_ignored() at debian/scripts/abi-check line 77.

There is no obvious reason to limit ourselves to EXPORT_* in the abi files.
Separatly we should ensure that CONFIG_UNUSED_SYMBOLS is set.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian/scripts/abi-check |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/debian/scripts/abi-check b/debian/scripts/abi-check
index b7df0d8..c7a02c5 100755
--- a/debian/scripts/abi-check
+++ b/debian/scripts/abi-check
@@ -90,7 +90,7 @@  open(NEW, "< $abidir/$flavour") or
 	die "Could not open $abidir/$flavour";
 while (<NEW>) {
 	chomp;
-	m/^(EXPORT_.+)\s(.+)\s(0x[0-9a-f]+)\s(.+)$/;
+	m/^(\S+)\s(.+)\s(0x[0-9a-f]+)\s(.+)$/;
 	$symbols{$4}{'type'} = $1;
 	$symbols{$4}{'loc'} = $2;
 	$symbols{$4}{'hash'} = $3;
@@ -107,7 +107,7 @@  open(OLD, "< $prev_abidir/$flavour") or
 	die "Could not open $prev_abidir/$flavour";
 while (<OLD>) {
 	chomp;
-	m/^(EXPORT_.+)\s(.+)\s(0x[0-9a-f]+)\s(.+)$/;
+	m/^(\S+)\s(.+)\s(0x[0-9a-f]+)\s(.+)$/;
 	$symbols{$4}{'old_type'} = $1;
 	$symbols{$4}{'old_loc'} = $2;
 	$symbols{$4}{'old_hash'} = $3;