Changeset 181

Timestamp:

12/25/06 14:04:24 (5 years ago)

Author:

root

Message:

More than one module didn't work, fixed.

Files:

• floppyfw-3.0/perl/modpick.pl (modified) (11 diffs)

floppyfw-3.0/perl/modpick.pl

@@ -98 +98 @@
 my ($allmodules, $p) = &readModulesDep();
 
-# print Dumper($allmodules);
+# print STDERR Dumper($allmodules);
 
 my (@deplist);
@@ -106 +106 @@
 foreach my $module ( quotewords('\s+', 0, $modules) ) {
 
-# print "this: ($module)\n";
+# print STDERR "this: ($module)\n";
 
         # Ok, first we have to check for options.
@@ -153 +153 @@
         }
 
-# print "getDependFiles($module)\n";
+# print STDERR "getDependFiles($module)\n";
 
         push @deplist,  getDependFiles($module);
@@ -164 +164 @@
 
         foreach my $module (@deplist) {
-# print "copyto($module)\n";
+# print STDERR "copyto($module)\n";
                 # Quick and dirty:
                 my ($dn) = dirname($module);
@@ -170 +170 @@
                 my ($nd) = "$copyto/lib/modules/$kernelversion/kernel/$dn";
 
-# print "$nd\n";
+# print STDERR "$nd\n";
 
                 system('mkdir', '-p', $nd);
@@ -205 +205 @@
 }
 
-# print "PATHS:\n\n";
+# print STDERR "PATHS:\n\n";
 # &printPaths($m, $p);
 
@@ -212 +212 @@
         my (@retarr);
 
-# print "Testing $mod\n";
+# print STDERR "Testing $mod\n";
 
         # First, check if there are (more) dependencies:
@@ -218 +218 @@
         if (exists($allmodules->{$mod}->{depends})) {
                 foreach my $mo (@{$allmodules->{$mod}->{depends}}) {
-# print "Checking $mo\n";
+# print STDERR "Checking $mo\n";
                         push @retarr, getDependFiles($mo);
                 }
@@ -244 +244 @@
 
                 my ($line) = /\w+\/kernel\/(.*)/;
+
+# print STDERR "\n\n" . $line . "\n";
 
                 if ($line =~ /\:/) {
@@ -289 +291 @@
 
                         }
-# print $module . ";" . $lastp . ";" . $lastp1 . ";" . $lastp2 . ";" . "$lastp3;\n";
+# print STDERR $module . ";" . $lastp . ";" . $lastp1 . ";" . $lastp2 . ";" . "$lastp3;\n";
 
                         if ($dep) {
-                                my ($dmodule) = $1 if ($dep =~ /\/(\w+-?\w+\.o)/);
-# print "DEPM: $module-$dmodule\n";
-                                push @{$modules->{$module}->{'depends'}}, $dmodule;
-                                $last_module = $module;
+# print STDERR "DEP: $dep\n";
+                                foreach my $single (split(/\s+/, $dep)) {
+                                        my ($dmodule) = $1 if ($single =~ /\/(\w+-?\w+\.o)/);
+                                        next unless $dmodule;
+# print STDERR "DEPM: $module-$dmodule-$single\n";
+                                        push @{$modules->{$module}->{'depends'}}, $dmodule;
+                                        $last_module = $module;
+                                }
 
                         }
@@ -305 +311 @@
                 if ($last_module && $line =~ /^\t/) {
                         my ($dmodule) = $1 if ( $_ =~ /(.*\.o)/ );
-# print "DEPM2: $dmodule\n";
+# print STDERR "DEPM2: $dmodule\n";
 
                         push @{$modules->{$last_module}->{'depends'}}, $dmodule;