c/pve-kernel-qoup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Fabian Grünbichler 2018-03-21 11:27:31 +01:00 committed by Thomas Lamprecht
parent 40af2e3b0f
commit 4062c10346
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/rules vendored
View File

@ -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} debian/scripts/abi-generate debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}/Module.symvers abi-${KVNAME} ${KVNAME}
.PHONY: abicheck .PHONY: abicheck
abicheck: debian/scripts/abi-check abi-${KVNAME} abi-previous abi-blacklist abicheck: debian/scripts/abi-check abi-${KVNAME} abi-prev-* abi-blacklist
debian/scripts/abi-check abi-${KVNAME} abi-previous ${SKIPABI} debian/scripts/abi-check abi-${KVNAME} abi-prev-* ${SKIPABI}
.PHONY: clean .PHONY: clean

22
debian/scripts/abi-check vendored
View File

@ -4,8 +4,14 @@ my $abinew = shift;
my $abiold = shift; my $abiold = shift;
my $skipabi = 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-(.*)/; $abinew =~ /abi-(.*)/;
my $abinum = $1; my $abistr = $1;
$abiold =~ /abi-prev-(.*)/;
my $prev_abistr = $1;
my $fail_exit = 1; my $fail_exit = 1;
my $EE = "EE:"; my $EE = "EE:";
@ -23,12 +29,12 @@ if ($skipabi) {
$EE = "WW:"; $EE = "WW:";
} }
#if ($prev_abinum != $abinum) { if ($prev_abistr ne $abistr) {
# print "II: Different ABI's, running in no-fail mode\n"; print "II: Different ABI's, running in no-fail mode\n";
# $fail_exit = 0; $fail_exit = 0;
# $EE = "WW:"; $EE = "WW:";
#} }
#
if (not -f "$abinew" or not -f "$abiold") { if (not -f "$abinew" or not -f "$abiold") {
print "EE: Previous or current ABI file missing!\n"; print "EE: Previous or current ABI file missing!\n";
print " $abinew\n" if not -f "$abinew"; print " $abinew\n" if not -f "$abinew";
@ -83,7 +89,7 @@ sub is_ignored($$) {
} }
# Read new syms first # Read new syms first
print " Reading new symbols ($abinum)..."; print " Reading new symbols ($abistr)...";
$count = 0; $count = 0;
open(NEW, "< $abinew") or open(NEW, "< $abinew") or
die "Could not open $abinew"; die "Could not open $abinew";