From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 18 Jul 2013 13:11:46 +0000 (+0000)
Subject: scripts: change metadata.pm and metadata.pl to not emit "default m if ALL" Kconfig... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=09cd0c4332e15e5c8c4ba86b369ac1ceb2e50bf4;p=openwrt%2Fsvn-archive%2Farchive.git

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

SVN-Revision: 37397
---

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 41f4690f2d..f26d8fa5e5 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -548,8 +548,13 @@ sub print_package_config_category($) {
 			$pkg->{hidden} and $title = "";
 			print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." $title\n";
 			print "\t\tdefault y if DEFAULT_".$pkg->{name}."\n";
-			foreach my $default (split /\s*,\s*/, $pkg->{default}) {
-				print "\t\tdefault $default\n";
+			unless ($pkg->{hidden}) {
+				$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->{mdepends}, 0);
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index 5efef46924..6f86e67eaf 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -64,7 +64,6 @@ sub parse_package_metadata($) {
 			$pkg->{makefile} = $makefile;
 			$pkg->{name} = $1;
 			$pkg->{title} = "";
-			$pkg->{default} = "m if ALL";
 			$pkg->{depends} = [];
 			$pkg->{mdepends} = [];
 			$pkg->{builddepends} = [];