diff options
| -rwxr-xr-x | kernel/check_mar.pl | 30 | ||||
| -rwxr-xr-x | kernel/update_kernel | 9 |
2 files changed, 5 insertions, 34 deletions
diff --git a/kernel/check_mar.pl b/kernel/check_mar.pl deleted file mode 100755 index f9f8ae217..000000000 --- a/kernel/check_mar.pl +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/perl - -use MDK::Common; - -my $mar = '../mdk-stage1/mar/mar'; --x $mar or die "ERROR: Sorry, need $mar binary\n"; - -my %sanity_check = ( - cdrom => [ - qw(aic7xxx), -# if_(arch() !~ /ppc|x86_64/, 'advansys'), - ], - all => [ - qw(3c59x eepro100 tulip via-rhine ne2k-pci 8139too), - if_(arch() !~ /ppc/, 'e100'), - if_(arch() !~ /ppc|ia64/, 'tlan'), - ], -); - -my $main_version = chomp_(cat_("all.kernels/.main")); - -foreach (keys %sanity_check) { - my $marfile = "all.modules/$main_version/${_}_modules.mar"; - -e $marfile or die "ERROR: missing $marfile\n"; - - my @l = map { /(\S+)\.k?o/ } `$mar -l $marfile`; - my @pbs = difference2($sanity_check{$_}, \@l); - - @pbs and die "ERROR: sanity check should prove that " . join(" ", @pbs) . " be part of $marfile\n"; -} diff --git a/kernel/update_kernel b/kernel/update_kernel index 5ffabbe31..92d53b8bc 100755 --- a/kernel/update_kernel +++ b/kernel/update_kernel @@ -80,7 +80,11 @@ function create_modules_mar() { for i in $images; do eval "modules=\$${i}_modules_raw" modules_with_deps=`perl -I $GIBASEDIR/kernel $GIBASEDIR/kernel/dependencies.pl $version modules.dep $modules` - eval "create_marfile ${i}_modules.mar $modules_with_deps" + if [ $i = "all" ]; then + echo $modules_with_deps > "${i}_modules.list" + else + eval "create_marfile ${i}_modules.mar $modules_with_deps" + fi done echo } @@ -181,6 +185,3 @@ for i in $ALL_KERNELS/*; do fi ) || exit 1 done - - -./check_mar.pl |