diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-05-05 10:06:10 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-05-05 10:06:10 +0000 |
| commit | 90237dd18c8792fd9c08a637623c011c8734c900 (patch) | |
| tree | c227634737135bfec6e384b1087eedf2f113edbd /scripts | |
| parent | 90acc0e779cfb43515bf2f08059778e31724dc40 (diff) | |
| download | master-31e0f0ae-90237dd18c8792fd9c08a637623c011c8734c900.tar.gz master-31e0f0ae-90237dd18c8792fd9c08a637623c011c8734c900.tar.bz2 master-31e0f0ae-90237dd18c8792fd9c08a637623c011c8734c900.zip | |
Make UCI preconfiguration optional and disabled by default
SVN-Revision: 7095
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/metadata.pl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 2527915bca..e196003326 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -451,22 +451,20 @@ sub print_package_config_category($) { 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) { - print "\tcomment \"$preconfig\"\n"; 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 } } - print "endmenu\n\n"; print_package_config_category 'Base system'; foreach my $cat (keys %category) { print_package_config_category $cat; @@ -542,8 +540,10 @@ sub gen_package_mk() { ( \\ $cmds \\ ) > \$@ - -preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig + +ifneq (\$(UCI_PRECONFIG)\$(CONFIG_UCI_PRECONFIG),) + preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig +endif EOF } } |