diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-02-11 23:18:33 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-02-11 23:18:33 +0000 |
| commit | cad0628b21c98bc472725ed4bdc15eca0d6a031b (patch) | |
| tree | 22dc3555acbdddcec330d202cade810c53b722d7 | |
| parent | d488dbbcf96a1ba339b663cfec33d74302d7a0f8 (diff) | |
| download | drakx-cad0628b21c98bc472725ed4bdc15eca0d6a031b.tar drakx-cad0628b21c98bc472725ed4bdc15eca0d6a031b.tar.gz drakx-cad0628b21c98bc472725ed4bdc15eca0d6a031b.tar.bz2 drakx-cad0628b21c98bc472725ed4bdc15eca0d6a031b.tar.xz drakx-cad0628b21c98bc472725ed4bdc15eca0d6a031b.zip | |
do not modify modules.dep to load parport_pc for parport, but inline in code (to keep a "clean" modules.dep)
| -rw-r--r-- | kernel/modules.pl | 3 | ||||
| -rw-r--r-- | perl-install/modules.pm | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/kernel/modules.pl b/kernel/modules.pl index de6ce1b7b..23af8c099 100644 --- a/kernel/modules.pl +++ b/kernel/modules.pl @@ -72,9 +72,6 @@ sub filter_modules_dep { @l = map { my ($f, $d) = split ':'; my ($module, @deps) = map { m!.*/(.*)\.k?o(\.gz)$! && $1 } $f, split(' ', $d); - if (member($module, 'plip', 'ppa', 'imm')) { - @deps = map { $_ eq 'parport' ? 'parport_pc' : $_ } @deps; - } join(' ', "$module:", @deps); } @l; diff --git a/perl-install/modules.pm b/perl-install/modules.pm index d6e9e10fb..6c7f564dd 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -90,6 +90,7 @@ sub load_with_options { my ($l, $h_options) = @_; my @l = map { + if_(member($_, 'plip', 'ppa', 'imm'), 'parport_pc'), if_($_ eq 'vfat', 'nls_cp437', 'nls_iso8859_1'), dependencies_closure(cond_mapping_24_26($_)); } @$l; |