crans/openwrt-chaoscalmer-uappro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scripts: change metadata.pm and metadata.pl to not emit "default m if ALL" Kconfig instructions for hidden packages

Browse source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37397 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2013-07-18 13:11:46 +00:00
parent bb0b4d6249
commit 0faa1d3aa3
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scripts/metadata.pl
View file

@ -548,8 +548,13 @@ sub print_package_config_category($) {
$pkg->{hidden} and $title = ""; $pkg->{hidden} and $title = "";
print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." $title\n"; print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." $title\n";
print "\t\tdefault y if DEFAULT_".$pkg->{name}."\n"; print "\t\tdefault y if DEFAULT_".$pkg->{name}."\n";
foreach my $default (split /\s*,\s*/, $pkg->{default}) { unless ($pkg->{hidden}) {
print "\t\tdefault $default\n"; $pkg->{default} ||= "m if ALL";
}
if ($pkg->{default}) {
foreach my $default (split /\s*,\s*/, $pkg->{default}) {
print "\t\tdefault $default\n";
}
} }
print mconf_depends($pkg->{name}, $pkg->{depends}, 0); print mconf_depends($pkg->{name}, $pkg->{depends}, 0);
print mconf_depends($pkg->{name}, $pkg->{mdepends}, 0); print mconf_depends($pkg->{name}, $pkg->{mdepends}, 0);

1
scripts/metadata.pm
View file

@ -64,7 +64,6 @@ sub parse_package_metadata($) {
$pkg->{makefile} = $makefile; $pkg->{makefile} = $makefile;
$pkg->{name} = $1; $pkg->{name} = $1;
$pkg->{title} = ""; $pkg->{title} = "";
$pkg->{default} = "m if ALL";
$pkg->{depends} = []; $pkg->{depends} = [];
$pkg->{mdepends} = []; $pkg->{mdepends} = [];
$pkg->{builddepends} = []; $pkg->{builddepends} = [];