scripts/abi-check: don't fail after ABI bump

this allows automatically running abi-check in non-fatal mode if an ABI
bump has just been done.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/debian/rules b/debian/rules
index 5498ff0a92439bd46054447b72bc8ba9be2c8163..6596254d6811c220145af6c615d9b4ce831a1e0c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -208,7 +208,7 @@ abi-${KVNAME}: .compile_mark
        debian/scripts/abi-generate debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}/Module.symvers abi-${KVNAME} ${KVNAME}
 
 .PHONY: abicheck
-abicheck: debian/scripts/abi-check abi-${KVNAME} abi-previous abi-blacklist
-       debian/scripts/abi-check abi-${KVNAME} abi-previous ${SKIPABI}
+abicheck: debian/scripts/abi-check abi-${KVNAME} abi-prev-* abi-blacklist
+       debian/scripts/abi-check abi-${KVNAME} abi-prev-* ${SKIPABI}
 
 .PHONY: clean

diff --git a/debian/scripts/abi-check b/debian/scripts/abi-check
index d6d856a3c6d4ca83a6f9e56b40e422e1a3064d0b..9fb49f121cf5984100730604f990e05757ba26f9 100755 (executable)
--- a/debian/scripts/abi-check
+++ b/debian/scripts/abi-check
@@ -4,8 +4,14 @@ my $abinew = shift;
 my $abiold = shift;
 my $skipabi = shift;
 
+# to catch multiple abi-prev-* files being passed in
+die "invalid value for skipabi parameter\n"
+       if (defined($skipabi) && $skipabi !~ /^[01]$/);
+
 $abinew =~ /abi-(.*)/;
-my $abinum = $1;
+my $abistr = $1;
+$abiold =~ /abi-prev-(.*)/;
+my $prev_abistr = $1;
 
 my $fail_exit = 1;
 my $EE = "EE:";
@@ -23,12 +29,12 @@ if ($skipabi) {
        $EE = "WW:";
 }
 
-#if ($prev_abinum != $abinum) {
-#      print "II: Different ABI's, running in no-fail mode\n";
-#      $fail_exit = 0;
-#      $EE = "WW:";
-#}
-#
+if ($prev_abistr ne $abistr) {
+       print "II: Different ABI's, running in no-fail mode\n";
+       $fail_exit = 0;
+       $EE = "WW:";
+}
+
 if (not -f "$abinew" or not -f "$abiold") {
        print "EE: Previous or current ABI file missing!\n";
        print "    $abinew\n" if not -f "$abinew";
@@ -83,7 +89,7 @@ sub is_ignored($$) {
 }
 
 # Read new syms first
-print "    Reading new symbols ($abinum)...";
+print "    Reading new symbols ($abistr)...";
 $count = 0;
 open(NEW, "< $abinew") or
        die "Could not open $abinew";