Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cope with different issues found in testing the code for ABI udebs 

Deal with various edge cases
This commit is contained in:
Steve McIntyre 2020-09-27 02:14:05 +01:00
parent 692a5012f1
commit b60845a775
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/generate_di_list
View File

@ -144,10 +144,14 @@ foreach my $arch (@ARCHES) {
} }
} }
close PZ; close PZ;
$output .= "/* First, generic udebs */\n"; $output .= "/* Udebs found in $pz: */\n";
if (scalar (@output_udebs) > 0) {
$output .= "/* Non-kernel udebs */\n";
foreach my $udeb (@output_udebs) { foreach my $udeb (@output_udebs) {
$output .= "$udeb\n"; $output .= "$udeb\n";
} }
}
if ($highest_kernel_ver != 0) {
my $num_this_abi = scalar (@{ $driver_udebs{$highest_kernel_ver}}); my $num_this_abi = scalar (@{ $driver_udebs{$highest_kernel_ver}});
$output .= "/* Next: $num_this_abi udebs for kernel/ABI version "; $output .= "/* Next: $num_this_abi udebs for kernel/ABI version ";
$output .= number_to_di_ker_abi($highest_kernel_ver); $output .= number_to_di_ker_abi($highest_kernel_ver);
@ -164,6 +168,7 @@ foreach my $arch (@ARCHES) {
} }
} }
} }
}
next unless $output; next unless $output;
print OUT "#ifdef ARCH_$cpparch\n"; print OUT "#ifdef ARCH_$cpparch\n";