diff options
| author | Eugene Konev <ejka@imfi.kspu.ru> | 2007-09-21 17:01:46 +0000 |
|---|---|---|
| committer | Eugene Konev <ejka@imfi.kspu.ru> | 2007-09-21 17:01:46 +0000 |
| commit | dd44ecc578864e11559152643f1a56dce84e0cb1 (patch) | |
| tree | 3d132dddc2e084d972343212807bbee7812dc8c8 /scripts | |
| parent | 6e7564b6409dd89e7b53940840021d9568593dae (diff) | |
| download | upstream-dd44ecc578864e11559152643f1a56dce84e0cb1.tar.gz upstream-dd44ecc578864e11559152643f1a56dce84e0cb1.tar.bz2 upstream-dd44ecc578864e11559152643f1a56dce84e0cb1.zip | |
fix image preconfiguration
SVN-Revision: 8921
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/metadata.pl | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 695abf7b32..03041f97c4 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -132,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; @@ -451,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 } @@ -524,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 |