annoying initrd bug introduced by 2.6.17

[openwrt-10.03/.git] / scripts / gen_menuconfig.pl

diff --git a/scripts/gen_menuconfig.pl b/scripts/gen_menuconfig.pl
index e304f188139fae83e495f441042d7a7f60a2b78f..eff78dcd90e37c4d0e994f56562121c78abe8493 100755 (executable)
--- a/scripts/gen_menuconfig.pl
+++ b/scripts/gen_menuconfig.pl
@@ -24,12 +24,16 @@ sub print_category($) {
                        $pkg->{menu} and print "menu";
                        print "config PACKAGE_".$pkg->{name}."\n";
                        print "\t\ttristate \"$title\"\n";
-                       print "\t\tdefault ".$pkg->{default}."\n";
-                       foreach my $depend (@{$pkg->{depends}}) {
-                               print "\t\tdepends PACKAGE_$depend\n";
+                       foreach my $default (split /\s*,\s*/, $pkg->{default}) {
+                               print "\t\tdefault $default\n";
                        }
-                       foreach my $need (@{$pkg->{needs}}) {
-                               print "\t\tselect PACKAGE_$need\n";
+                       foreach my $depend (@{$pkg->{depends}}) {
+                               my $m = "depends";
+                               $depend =~ s/^([@\+]+)//;
+                               my $flags = $1;
+                               $flags =~ /@/ or $depend = "PACKAGE_$depend";
+                               $flags =~ /\+/ and $m = "select";
+                               print "\t\t$m $depend\n";
                        }
                        print "\t\thelp\n";
                        print $pkg->{description};
@@ -63,13 +67,9 @@ while ($line = <>) {
        $line =~ /^Menu: \s*(.+)\s*$/ and $pkg->{menu} = $1;
        $line =~ /^Default: \s*(.+)\s*$/ and $pkg->{default} = $1;
        $line =~ /^Depends: \s*(.+)\s*$/ and do {
-               my @dep = split /,\s*/, $1;
+               my @dep = split /\s+/, $1;
                $pkg->{depends} = \@dep;
        };
-       $line =~ /^Needs: \s*(.+)\s*$/ and do {
-               my @need = split /,\s*/, $1;
-               $pkg->{needs} = \@need;
-       };
        $line =~ /^Category: \s*(.+)\s*$/ and do {
                $pkg->{category} = $1;
                defined $category{$1} or $category{$1} = {};