fix image preconfiguration

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

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 2fcbf82dfa8ce785b9d2327da95f0e62e36cdddc..03041f97c4c3ccacfc7aea48bf5afddb9c1969c3 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -5,6 +5,7 @@ my %package;
 my %srcpackage;
 my %category;
 my %subdir;
+my %board;
 
 sub get_multiline {
        my $prefix = shift;
@@ -18,21 +19,28 @@ sub get_multiline {
        return $str;
 }
 
+sub confstr($) {
+       my $conf = shift;
+       $conf =~ tr#/\.\-/#___#;
+       return $conf;
+}
+
 sub parse_target_metadata() {
        my ($target, @target, $profile);        
        while (<>) {
                chomp;
                /^Target:\s*(.+)\s*$/ and do {
-                       my $conf = $1;
-                       $conf =~ tr#/\.\-/#___#;
                        $target = {
                                id => $1,
-                               conf => $conf,
+                               conf => confstr($1),
                                profiles => []
                        };
                        push @target, $target;
                };
-               /^Target-Board:\s*(.+)\s*$/ and $target->{board} = $1;
+               /^Target-Board:\s*(.+)\s*$/ and do {
+                       $target->{board} = $1;
+                       $target->{boardconf} = confstr($1);
+               };
                /^Target-Kernel:\s*(\d+\.\d+)\s*$/ and $target->{kernel} = $1;
                /^Target-Name:\s*(.+)\s*$/ and $target->{name} = $1;
                /^Target-Path:\s*(.+)\s*$/ and $target->{path} = $1;
@@ -124,11 +132,15 @@ sub parse_package_metadata() {
                /^Prereq-Check:/ and $pkg->{prereq} = 1;
                /^Preconfig:\s*(.+)\s*$/ and do {
                        my $pkgname = $pkg->{name};
-                       $preconfig{$pkgname} or $preconfig{$pkgname} = [];
-                       $preconfig = {
-                               id => $1
-                       };
-                       push @{$preconfig{$pkgname}}, $preconfig;
+                       $preconfig{$pkgname} or $preconfig{$pkgname} = {};
+                       if (exists $preconfig{$pkgname}->{$1}) {
+                               $preconfig = $preconfig{$pkgname}->{$1};
+                       } else {
+                               $preconfig = {
+                                       id => $1
+                               };
+                               $preconfig{$pkgname}->{$1} = $preconfig;
+                       }
                };
                /^Preconfig-Type:\s*(.*?)\s*$/ and $preconfig->{type} = $1;
                /^Preconfig-Label:\s*(.*?)\s*$/ and $preconfig->{label} = $1;
@@ -247,14 +259,16 @@ EOF
                        undef $help;
                }
        
-               print <<EOF
+               print <<EOF;
 config TARGET_$target->{conf}
        bool "$target->{name}"
        select $target->{arch}
        select LINUX_$kernel
-$features$help
-
 EOF
+               if ($target->{id} ne $target->{board}) {
+                       print "\tselect TARGET_".$target->{boardconf}."\n";
+               }
+               print "$features$help\n\n"
        }
 
        print <<EOF;
@@ -266,6 +280,15 @@ EOF
        foreach my $target (@target) {
                print "\t\tdefault \"".$target->{board}."\" if TARGET_".$target->{conf}."\n";
        }
+
+       # add hidden target config options 
+       foreach my $target (@target) {
+               next if $board{$target->{board}};
+               if ($target->{id} ne $target->{board}) {
+                       print "\nconfig TARGET_".$target->{boardconf}."\n\tbool\n";
+                       $board{$target->{board}} = 1;
+               }
+       }
        print <<EOF;
 
 choice
@@ -432,14 +455,14 @@ sub gen_package_config() {
        parse_package_metadata();
        print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n";
        foreach my $preconfig (keys %preconfig) {
-               foreach my $cfg (@{$preconfig{$preconfig}}) {
-                       my $conf = $cfg->{id};
+               foreach my $cfg (keys %{$preconfig{$preconfig}}) {
+                       my $conf = $preconfig{$preconfig}->{$cfg}->{id};
                        $conf =~ tr/\.-/__/;
                        print <<EOF
        config UCI_PRECONFIG_$conf
-               string "$cfg->{label}" if UCI_PRECONFIG
+               string "$preconfig{$preconfig}->{$cfg}->{label}" if UCI_PRECONFIG
                depends PACKAGE_$preconfig
-               default "$cfg->{default}"
+               default "$preconfig{$preconfig}->{$cfg}->{default}"
 
 EOF
                }
@@ -505,10 +528,10 @@ sub gen_package_mk() {
        }
        foreach my $preconfig (keys %preconfig) {
                my $cmds;
-               foreach my $cfg (@{$preconfig{$preconfig}}) {
-                       my $conf = $cfg->{id};
+               foreach my $cfg (keys %{$preconfig{$preconfig}}) {
+                       my $conf = $preconfig{$preconfig}->{$cfg}->{id};
                        $conf =~ tr/\.-/__/;
-                       $cmds .= "\techo \"uci set '$cfg->{id}=\$(subst \",,\$(CONFIG_UCI_PRECONFIG_$conf))'\"; \\\n";
+                       $cmds .= "\techo \"uci set '$preconfig{$preconfig}->{$cfg}->{id}=\$(subst \",,\$(CONFIG_UCI_PRECONFIG_$conf))'\"; \\\n";
                }
                next unless $cmds;
                print <<EOF