summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-08-21 11:03:37 +0000
committerOlivier Blin <oblin@mandriva.com>2007-08-21 11:03:37 +0000
commit4544c200517e5430ad7458e3d9ae62bbb5f0b8f4 (patch)
treef831618d622e324d3e8cd7c467ecf4509f2ecb8a /kernel
parenta9b47d5e9c996c01887a9deabb7b7512b936ce87 (diff)
downloaddrakx-backup-do-not-use-4544c200517e5430ad7458e3d9ae62bbb5f0b8f4.tar
drakx-backup-do-not-use-4544c200517e5430ad7458e3d9ae62bbb5f0b8f4.tar.gz
drakx-backup-do-not-use-4544c200517e5430ad7458e3d9ae62bbb5f0b8f4.tar.bz2
drakx-backup-do-not-use-4544c200517e5430ad7458e3d9ae62bbb5f0b8f4.tar.xz
drakx-backup-do-not-use-4544c200517e5430ad7458e3d9ae62bbb5f0b8f4.zip
keep modules without dependencies in modules.dep, this file is used to get the module filename
Diffstat (limited to 'kernel')
-rw-r--r--kernel/modules.pl9
1 files changed, 3 insertions, 6 deletions
diff --git a/kernel/modules.pl b/kernel/modules.pl
index 6f9bfac50..49ce8efb9 100644
--- a/kernel/modules.pl
+++ b/kernel/modules.pl
@@ -69,17 +69,14 @@ sub filter_modules_dep {
my @l = cat_("all.kernels/$kern_ver/modules.dep");
@l = map {
- if (/(\S+):\s+(.*)/) {
- my ($module, @deps) = map { m!.*/(.*)\.k?o(\.gz)$! && $1 } $1, split(' ', $2);
+ 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;
} elsif ($module eq 'vfat') {
push @deps, 'nls_cp437', 'nls_iso8859-1';
}
- if_(@deps, join(' ', "$module:", @deps));
- } else {
- ();
- }
+ join(' ', "$module:", @deps);
} @l;
output("all.kernels/$kern_ver/modules.dep", map { "$_\n" } @l);