this allows automatically running abi-check in non-fatal mode if an ABI bump has just been done.
Signed-off-by: Fabian Grünbichler <[email protected]> --- debian/rules | 4 ++-- debian/scripts/abi-check | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/debian/rules b/debian/rules index a26cf61..f7cd286 100755 --- a/debian/rules +++ b/debian/rules @@ -205,7 +205,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 d6d856a..9fb49f1 100755 --- 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"; -- 2.14.2 _______________________________________________ pve-devel mailing list [email protected] https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
