linux: kmod-ipt-filter depends on kmod-ipt-conntrack

[openwrt.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index ade86c867c85ed11c8db876c3e2c0072098c4654..f26d8fa5e5db6cfb104f5f2ac29150d9b050bd4d 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -548,8 +548,13 @@ sub print_package_config_category($) {
                        $pkg->{hidden} and $title = "";
                        print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." $title\n";
                        print "\t\tdefault y if DEFAULT_".$pkg->{name}."\n";
-                       foreach my $default (split /\s*,\s*/, $pkg->{default}) {
-                               print "\t\tdefault $default\n";
+                       unless ($pkg->{hidden}) {
+                               $pkg->{default} ||= "m if ALL";
+                       }
+                       if ($pkg->{default}) {
+                               foreach my $default (split /\s*,\s*/, $pkg->{default}) {
+                                       print "\t\tdefault $default\n";
+                               }
                        }
                        print mconf_depends($pkg->{name}, $pkg->{depends}, 0);
                        print mconf_depends($pkg->{name}, $pkg->{mdepends}, 0);
@@ -616,7 +621,7 @@ EOF
        }
        print_package_features();
        print_package_config_category 'Base system';
-       foreach my $cat (keys %category) {
+       foreach my $cat (sort {uc($a) cmp uc($b)} keys %category) {
                print_package_config_category $cat;
        }
 }
@@ -757,7 +762,7 @@ sub gen_package_mk() {
                                        $idx = $subdir{$dep}.$dep;
                                }
                                $idx .= $suffix;
-                               undef $idx if $idx =~ /^(kernel)|(base-files)$/;
+                               undef $idx if $idx =~ /^(kernel\/linux)|(base-files)$/;
                                if ($idx) {
                                        my $depline;
                                        next if $pkg->{src} eq $pkg_dep->{src}.$suffix;