metadata.pl: use alphabetical order for menuconfig categories, also fixes random...

[15.05/openwrt.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index ade86c8..41f4690 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -616,7 +616,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 +757,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;