rewrite of the metadata scanning - cleaner code, faster scanning, recursive scanning...

[openwrt.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 2527915..dbd6cce 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -131,6 +131,20 @@ sub parse_package_metadata() {
        return %category;
 }
 
        return %category;
 }
 

+sub merge_package_lists($$) {
+       my $list1 = shift;
+       my $list2 = shift;
+       my @l = ();
+       my %pkgs;
+
+       foreach my $pkg (@$list1, @$list2) {
+               $pkgs{$pkg} = 1;
+       }
+       foreach my $pkg (keys %pkgs) {
+               push @l, $pkg unless ($pkg =~ /^-/ or $pkgs{"-$pkg"});
+       }
+       return sort(@l);
+}

 
 sub gen_target_mk() {
        my @target = parse_target_metadata();
 
 sub gen_target_mk() {
        my @target = parse_target_metadata();


@@ -149,7 +163,7 @@ sub gen_target_mk() {
   define Profile/$conf\_$profile->{id}
     ID:=$profile->{id}
     NAME:=$profile->{name}
   define Profile/$conf\_$profile->{id}
     ID:=$profile->{id}
     NAME:=$profile->{name}

-    PACKAGES:=".join(" ", @{$profile->{packages}})."\n";
+    PACKAGES:=".join(" ", merge_package_lists($target->{packages}, $profile->{packages}))."\n";

                        $profile->{kconfig} and $profiles_def .= "    KCONFIG:=1\n";
                        $profiles_def .= "  endef";
                        $profiles_eval .= "
                        $profile->{kconfig} and $profiles_def .= "    KCONFIG:=1\n";
                        $profiles_def .= "  endef";
                        $profiles_eval .= "


@@ -303,12 +317,9 @@ config LINUX_$target->{conf}_$profile->{id}
 $profile->{config}
 EOF
                        $profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";
 $profile->{config}
 EOF
                        $profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";

-                       my %pkgs;
-                       foreach my $pkg (@{$target->{packages}}, @{$profile->{packages}}) {
-                               $pkgs{$pkg} = 1;
-                       }
-                       foreach my $pkg (keys %pkgs) {
-                               print "\tselect DEFAULT_$pkg\n" unless ($pkg =~ /^-/ or $pkgs{"-$pkg"});
+                       my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
+                       foreach my $pkg (@pkglist) {
+                               print "\tselect DEFAULT_$pkg\n";

                        }
                        print "\n";
                }
                        }
                        print "\n";
                }


@@ -317,6 +328,7 @@ EOF
        print "endchoice\n";
 }
 
        print "endchoice\n";
 }
 

+

 sub find_package_dep($$) {
        my $pkg = shift;
        my $name = shift;
 sub find_package_dep($$) {
        my $pkg = shift;
        my $name = shift;


@@ -451,22 +463,20 @@ sub print_package_config_category($) {
 
 sub gen_package_config() {
        parse_package_metadata();
 
 sub gen_package_config() {
        parse_package_metadata();

-       print "menu \"Image configuration\"\n";
+       print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n";

        foreach my $preconfig (keys %preconfig) {
        foreach my $preconfig (keys %preconfig) {

-               print "\tcomment \"$preconfig\"\n";

                foreach my $cfg (@{$preconfig{$preconfig}}) {
                        my $conf = $cfg->{id};
                        $conf =~ tr/\.-/__/;
                        print <<EOF
        config UCI_PRECONFIG_$conf
                foreach my $cfg (@{$preconfig{$preconfig}}) {
                        my $conf = $cfg->{id};
                        $conf =~ tr/\.-/__/;
                        print <<EOF
        config UCI_PRECONFIG_$conf

-               string "$cfg->{label}"
+               string "$cfg->{label}" if UCI_PRECONFIG

                depends PACKAGE_$preconfig
                default "$cfg->{default}"
 
 EOF
                }
        }
                depends PACKAGE_$preconfig
                default "$cfg->{default}"
 
 EOF
                }
        }

-       print "endmenu\n\n";

        print_package_config_category 'Base system';
        foreach my $cat (keys %category) {
                print_package_config_category $cat;
        print_package_config_category 'Base system';
        foreach my $cat (keys %category) {
                print_package_config_category $cat;


@@ -542,8 +552,10 @@ sub gen_package_mk() {
        ( \\
 $cmds \\
        ) > \$@
        ( \\
 $cmds \\
        ) > \$@

-
-preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
+       
+ifneq (\$(UCI_PRECONFIG)\$(CONFIG_UCI_PRECONFIG),)
+  preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
+endif

 EOF
        }
 }
 EOF
        }
 }