summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-11-17 18:00:37 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-11-17 18:00:37 +0000
commitc12f9a3d889ad4c054f42841718fdda72e8c2c63 (patch)
tree4c64fd01bd359169a157ec255cb8df0e4c978949
parentd74a180b3c747b78a284bb369ffd0b63da7c28df (diff)
downloaddrakx-c12f9a3d889ad4c054f42841718fdda72e8c2c63.tar
drakx-c12f9a3d889ad4c054f42841718fdda72e8c2c63.tar.gz
drakx-c12f9a3d889ad4c054f42841718fdda72e8c2c63.tar.bz2
drakx-c12f9a3d889ad4c054f42841718fdda72e8c2c63.tar.xz
drakx-c12f9a3d889ad4c054f42841718fdda72e8c2c63.zip
on 10.0, b44 failled on newer cards; let's try bcm4400 too
-rw-r--r--perl-install/modules.pm21
1 files changed, 11 insertions, 10 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index cb4d2ae2e..4a96caf9f 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -25,17 +25,17 @@ sub category2modules_and_description {
map { $_ => $modules_descriptions{$_} } category2modules($categories);
}
-%mappings_24_26 = ("usb-ohci" => "ohci-hcd",
- "usb-uhci" => "uhci-hcd",
- "uhci" => "uhci-hcd",
- "printer" => "usblp",
- "bcm4400" => "b44",
- "3c559" => "3c359",
- "3c90x" => "3c59x",
- "dc395x_trm" => "dc395x");
+%mappings_24_26 = ("usb-ohci" => [ "ohci-hcd" ],
+ "usb-uhci" => [ "uhci-hcd" ],
+ "uhci" => [ "uhci-hcd" ],
+ "printer" => [ "usblp" ],
+ "bcm4400" => [ "b44", "bcm4400" ],
+ "3c559" => [ "3c359" ],
+ "3c90x" => [ "3c59x" ],
+ "dc395x_trm" => [ "dc395x" ]);
%mappings_26_24 = reverse %mappings_24_26;
sub mapping_24_26 {
- return map { c::kernel_version() =~ /^\Q2.6/ ? $mappings_24_26{$_} || $_ : $_ } @_;
+ map { c::kernel_version() =~ /^\Q2.6/ ? $mappings_24_26{$_} || [ $_ ] : [ $_ ] } @_;
}
sub mapping_26_24 {
my ($modname) = @_;
@@ -60,7 +60,8 @@ sub load {
my @l = map {
my ($name, @options) = ref($_) ? @$_ : $_;
$options{$name} = \@options;
- dependencies_closure(mapping_24_26($name));
+ my ($a) = mapping_24_26($name);
+ map { dependencies_closure($_) } @$a;
} @_;
@l = difference2([ uniq(@l) ], [ map { my $s = $_; $s =~ s/_/-/g; $s, $_ } loaded_modules() ]) or return;