diff options
Diffstat (limited to 'kernel/modules.pl')
| -rw-r--r-- | kernel/modules.pl | 210 |
1 files changed, 50 insertions, 160 deletions
diff --git a/kernel/modules.pl b/kernel/modules.pl index a08b7c46c..9ec6f5356 100644 --- a/kernel/modules.pl +++ b/kernel/modules.pl @@ -10,61 +10,6 @@ BEGIN { use MDK::Common; use list_modules; -#- seldom used modules -#- we don't bother making a special floppy for those -my %modules_only_for_all_img = ( - - 'network/main' => [ - qw(acenic), - qw(aironet4500_card com20020-pci hamachi starfire winbond-840), - - if_(arch() =~ /alpha|ppc/, qw(sb1000)), - qw(iph5526), - - qw(ac3200 at1700 atp ni5010 ni52 ni65), #- unused from Jeff - ], - - 'disk/scsi' => [ - # ISA cards: - qw(NCR53c406a aha152x psi240i qlogicfas qlogicfc wd7000 sim710 t128 ultrastor), '53c7,8xx', - qw(qla2x00 in2000 pas16 a100u2w seagate g_NCR5380), - if_(arch() =~ /x86_64/, qw(53c7,8xx nsp32 initio advansys atp870u)), #- old - qw(AM53C974), # deprecated by tmscsim - qw(u14-34f), #- duplicate from ultrastor.o - #- still used, keeping them: qw(aha1542 sym53c416), - qw(lpfcdd), #- HUGE!! - - qw(dc395x dc395x_trm dmx3191d qla1280 BusLogic fdomain), - qw(pci2220i eata eata_pio eata_dma), - 'aic7xxx_old', 'qlogicisp', - 'dtc', - ], - 'disk/sata' => [ - qw(ahci ata_piix sata_nv sata_promise sata_sil sata_sis sata_svw sata_sx4 sata_uli sata_via sata_vsc sx8), - ], - - 'disk/hardware_raid' => [ - qw(i2o_block qla2200 qla2300 cpqfc DAC960 gdth pdc-ultra mptscsih), - ], -); - -#- modules that will only be available in stage2 -#- those modules are NOT in all.img, network.img... -#- there should only be modules that can't be used on stage1 -#- completly unused modules should be removed directly from the kernel -#- (and so be removed from stage2 too) -my %modules_removed_from_stage1 = ( - 'network/main' => [ - 'plip' - ], - - 'disk/hardware_raid' => [ - qw(imm ppa), - ], -); - -my @modules_always_on_stage1 = qw(floppy); - sub flatten_and_check { my ($h) = @_; @@ -85,128 +30,55 @@ sub flatten_and_check { } keys %$h; } -my @modules_only_for_all_img = flatten_and_check(\%modules_only_for_all_img); -my @modules_removed_from_stage1 = flatten_and_check(\%modules_removed_from_stage1); - - -my %images = ( - pcmcia => 'fs/cdrom|loopback disk/cdrom|raw|pcmcia bus/pcmcia', - cdrom => 'fs/cdrom|loopback disk/cdrom|raw|scsi', - network => 'bus/usb|usb_keyboard|pcmcia disk/raw|usb', - network_drivers => 'fs/network|loopback network/main|pcmcia|usb|raw|gigabit', - all => 'fs/cdrom disk/cdrom|raw bus/usb|usb_keyboard disk/usb|scsi fs/loopback|local bus/pcmcia disk/ide|pcmcia|sata|hardware_raid fs/network network/main|pcmcia|usb|raw|gigabit bus/firewire disk/firewire', -); +my $images_cat = 'fs/* disk/* bus/* network/* input/* various/*'; #- ie everything except multimedia my $verbose = $ARGV[0] eq '-v' && shift; my ($f, @para) = @ARGV; $::{$f}->(@para); -sub image2modules { - my ($image) = @_; - my $l = $images{$image}; - - my @modules = if_($image !~ /drivers/, @modules_always_on_stage1); - push @modules, map { category2modules($_) } split(' ', $l); - - @modules = difference2(\@modules, \@modules_removed_from_stage1); - - if ($image !~ /all/) { - @modules = difference2(\@modules, \@modules_only_for_all_img); - } - - @modules; +sub modules() { + my @nls_modules = ('nls_cp437', 'nls_iso8859_1'); + @nls_modules, map { category2modules($_) } split(' ', $images_cat); } -sub remove_unneeded_modules { +sub list_needed_modules { my ($kern_ver) = @_; - #- need creating a first time the modules.dep for all modules - #- it will be redone in make_modules_dep when unneeded modules are removed - make_modules_dep($kern_ver); - load_dependencies("all.kernels/$kern_ver/modules.dep"); - - my $ext = module_extension($kern_ver); + load_dependencies("/lib/modules/$kern_ver/modules.dep"); - my @all = list_modules::all_modules(); + my @all = modules(); my @all_with_deps = map { dependencies_closure($_) } @all; - my %wanted_modules = map {; "$_.$ext" => 1 } @all_with_deps; - foreach (all("all.kernels/$kern_ver/modules")) { - $wanted_modules{$_} or unlink "all.kernels/$kern_ver/modules/$_"; + my %wanted_modules = map { (list_modules::modname2filename($_) => 1) } @all_with_deps; + foreach (`find /lib/modules/$kern_ver -name '*.ko.?z'`) { + my $modfile = basename($_); + $modfile =~ s/\.ko\.xz//; + $wanted_modules{$modfile} and print "$modfile\n"; } } -sub make_modules_per_image { +sub list_fake_modules { my ($kern_ver) = @_; - make_modules_dep($kern_ver); - load_dependencies("all.kernels/$kern_ver/modules.dep"); - - my $ext = module_extension($kern_ver); - - foreach my $image (keys %images) { - my @modules_with_deps = uniq(map { dependencies_closure($_) } image2modules($image)); - my @l = map { "$_.$ext" } @modules_with_deps; + load_dependencies("/lib/modules/$kern_ver/modules.dep"); - my $dir = "all.kernels/$kern_ver/modules"; - @l = grep { -e "$dir/$_" } @l; - - if ($image =~ /all/) { - system("cd $dir ; tar cf ../${image}_modules.tar @l") == 0 or die "tar failed\n"; - } else { - my $gi_base_dir = chomp_(`pwd`) . '/..'; - system("cd $dir ; $gi_base_dir/mdk-stage1/mar/mar -c ../${image}_modules.mar @l") == 0 or die "mar failed\n"; - } + my @all = map { category2modules($_) } split(' ', 'multimedia/*'); + my %wanted_modules = map { (list_modules::modname2filename($_) => 1) } @all; + foreach (`find /lib/modules/$kern_ver -name '*.ko.?z'`) { + my $modfile = basename($_); + $modfile =~ s/\.ko\.xz//; + $wanted_modules{$modfile} and print "$modfile\n"; } } -sub make_modules_dep { - my ($kern_ver) = @_; - - my @l = - kernel_is_26($kern_ver) ? - cat_("all.kernels/$kern_ver/lib/modules/$kern_ver/modules.dep") : - `/sbin/depmod-24 -F all.kernels/$kern_ver/boot/System.map-$kern_ver -e *.o | perl -pe 's/\\\n//'`; - - @l = map { - if (/(\S+):\s+(.*)/) { - my ($module, @deps) = map { m!.*/(.*)\.k?o(\.gz)$! && $1 } $1, split(' ', $2); - if (member($module, 'plip', 'ppa', 'imm')) { - @deps = map { $_ eq 'parport' ? 'parport_pc' : $_ } @deps; - } elsif ($module eq 'vfat') { - push @deps, 'nls_cp437', 'nls_iso8859-1'; - } - if_(@deps, join(' ', "$module:", @deps)); - } else { - (); - } - } @l; - - output("all.kernels/$kern_ver/modules.dep", map { "$_\n" } @l); -} - -sub make_modules_description { - my ($kern_ver) = @_; - my $ext = module_extension($kern_ver); - my $dir = "all.kernels/$kern_ver/modules"; - - my @l; - if (kernel_is_26(`uname -r`)) { #- modinfo behaves differently depending on the build kernel used - my $name; - @l = map { - $name = $1 if m!^filename:\s*(.*)\.$ext!; - if_($name && /^description:\s*(.*)/, "$name\t$1"); - } `cd $dir ; /sbin/modinfo *.$ext`; - } else { - @l = map { - if_(/(.*?)\.$ext "(.*)"/, "$1\t$2\n"); - } `cd $dir ; /sbin/modinfo-24 -f '%{filename} %{description}\n' *.$ext`; - } - output("modules.description", @l); +sub get_main_modules() { + my $base = dirname($0); + my $main = chomp_(cat_("$base/RPMS/.main")); + chomp_(`tar tf $base/all.kernels/$main/all_modules.tar`); } sub pci_modules4stage1 { my ($category) = @_; - my @modules = difference2([ category2modules($category) ], \@modules_removed_from_stage1); + my @modules = difference2([ category2modules($category) ]); print "$_\n" foreach uniq(map { dependencies_closure($_) } @modules); } @@ -231,7 +103,7 @@ sub check() { my ($mod) = m|([^/]*)\.k?o(\.gz)?$| or next; delete $deprecated_modules{$mod}; next if $listed{$mod}; - s|.*?mdk(BOOT)?/||; + s|.*?mdk/||; s|kernel/||; s|drivers/||; s|3rdparty/||; $_ = dirname $_; $_ = dirname $_ if $mod eq basename($_); @@ -242,8 +114,8 @@ sub check() { print "$msg $_: ", join(" ", @{$not_listed{$_}}), "\n" foreach sort keys %not_listed; } }; - $not_listed->('NOT LISTED', 1, `cd all.kernels/2.6* ; find -name "*.k?o" -o -name "*.k?o.gz"`); - $not_listed->('not listed', $verbose, `rpm -qpl /RPMS/kernel-2.6*`); + $not_listed->('NOT LISTED', 1, get_main_modules()); + $not_listed->('not listed', $verbose, chomp_(`rpm -qpl RPMS/kernel-*2.6*`)); if (%deprecated_modules) { my %per_cat; push @{$per_cat{$listed{$_}}}, $_ foreach keys %deprecated_modules; @@ -264,7 +136,7 @@ sub check() { if (my $l = delete $not_listed{''}) { print "bad/old pcitable modules : ", join(" ", @$l), "\n"; } - print STDERR "PCITABLE MODULES NOT LISTED $_: ", join(" ", @{$not_listed{$_}}), "\n" foreach sort keys %not_listed; + print STDERR "PCITABLE MODULES NOT LISTED $_: ", join(" ", sort @{$not_listed{$_}}), "\n" foreach sort keys %not_listed; #$error = 1; } @@ -272,11 +144,29 @@ sub check() { if (my @l = difference2(\@l2, [ keys %listed ])) { my %not_listed; push @{$not_listed{$module2category{$_}}}, $_ foreach @l; - if ($verbose) { - print "usbtable modules not listed $_: ", join(" ", @{$not_listed{$_}}), "\n" foreach sort keys %not_listed; - } + print STDERR "usbtable modules not listed $_: ", join(" ", sort @{$not_listed{$_}}), "\n" foreach sort keys %not_listed; } } exit $error; } + +sub list_additional_firmware { + my ($kern_ver) = @_; + + # The firmware reported by 'modinfo iwlwifi' is the latest supported version of each firmware + # type. Sometimes the latest supported version is not available, and the driver falls back to + # an older version. This means dracut doesn't automatically identify and include the necessary + # firmware files, so we need to list them here (mga#9541). + foreach (map { /^firmware:\s+(.*)/ ? $1 : () } split("\n", `modinfo -k $kern_ver iwlwifi`)) { + next if -f "/lib/firmware/$_"; + my ($basename, $version) = /(.*)-([0-9]+).ucode/; + while ($version-- > 0) { + my $filepath = "/lib/firmware/$basename-$version.ucode"; + if (-f $filepath) { + print "$filepath\n"; + last; + } + } + } +} |