X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=scripts%2Fmetadata.pl;h=b04cd8cc3d943c470a952b7bce79b42d9b36caef;hp=3de408798004b6df53d40daf4c77c266475c89b2;hb=a26c58d3b4f8b06dc0eefd18ef8a51ca6de863a0;hpb=d9fa067a9c523616dfdb96717f21bbae10bb51f3

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 3de4087980..b04cd8cc3d 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -45,7 +45,6 @@ sub parse_target_metadata() {
 				$target->{parent} = $target{$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;
 		/^Target-Arch:\s*(.+)\s*$/ and $target->{arch} = $1;
@@ -57,6 +56,7 @@ sub parse_target_metadata() {
 		/^Linux-Version:\s*(.+)\s*$/ and $target->{version} = $1;
 		/^Linux-Release:\s*(.+)\s*$/ and $target->{release} = $1;
 		/^Linux-Kernel-Arch:\s*(.+)\s*$/ and $target->{karch} = $1;
+		/^Default-Subtarget:\s*(.+)\s*$/ and $target->{def_subtarget} = $1;
 		/^Default-Packages:\s*(.+)\s*$/ and $target->{packages} = [ split(/\s+/, $1) ];
 		/^Target-Profile:\s*(.+)\s*$/ and do {
 			$profile = {
@@ -115,6 +115,7 @@ sub gen_kconfig_overrides() {
 					$val = $2;
 				}
 				if ($config{"CONFIG_PACKAGE_$package"} and ($config ne 'n')) {
+					next if $kconfig{$config} eq 'y';
 					$kconfig{$config} = $val;
 				} elsif (!$override) {
 					$kconfig{$config} or $kconfig{$config} = 'n';
@@ -161,6 +162,7 @@ sub target_config_features(@) {
 		/usb/ and $ret .= "\tselect USB_SUPPORT\n";
 		/usbgadget/ and $ret .= "\tselect USB_GADGET_SUPPORT\n";
 		/pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";
+		/rtc/ and $ret .= "\tselect RTC_SUPPORT\n";
 		/squashfs/ and $ret .= "\tselect USES_SQUASHFS\n";
 		/jffs2/ and $ret .= "\tselect USES_JFFS2\n";
 		/ext4/ and $ret .= "\tselect USES_EXT4\n";
@@ -189,7 +191,11 @@ sub target_name($) {
 sub kver($) {
 	my $v = shift;
 	$v =~ tr/\./_/;
-	$v =~ /(\d+_\d+_\d+)(_\d+)?/ and $v = $1;
+	if (substr($v,0,2) eq "2_") {
+		$v =~ /(\d+_\d+_\d+)(_\d+)?/ and $v = $1;
+	} else {
+		$v =~ /(\d+_\d+)(_\d+)?/ and $v = $1;
+	}
 	return $v;
 }
 
@@ -227,6 +233,7 @@ EOF
 	}
 	if (@{$target->{subtargets}} > 0) {
 		$confstr .= "\tselect HAS_SUBTARGETS\n";
+		grep { /broken/ } @{$target->{features}} and $confstr .= "\tdepends BROKEN\n";
 	} else {
 		$confstr .= $features;
 	}
@@ -264,7 +271,7 @@ sub gen_target_config() {
 	print <<EOF;
 choice
 	prompt "Target System"
-	default TARGET_brcm47xx
+	default TARGET_ar71xx
 	reset if !DEVEL
 	
 EOF
@@ -279,6 +286,14 @@ endchoice
 
 choice
 	prompt "Subtarget" if HAS_SUBTARGETS
+EOF
+	foreach my $target (@target) {
+		next unless $target->{def_subtarget};
+		print <<EOF;
+	default TARGET_$target->{conf}_$target->{def_subtarget} if TARGET_$target->{conf}
+EOF
+	}
+	print <<EOF;
 
 EOF
 	foreach my $target (@target) {
@@ -463,6 +478,7 @@ sub mconf_depends {
 			$flags =~ /@/ or $depend = "PACKAGE_$depend";
 			if ($condition) {
 				if ($m =~ /select/) {
+					next if $depend eq $condition;
 					$depend = "$depend if $condition";
 				} else {
 					$depend = "!($condition) || $depend";
@@ -522,10 +538,12 @@ sub print_package_config_category($) {
 			if ($c > 0) {
 				$title .= ("." x $c). " ". $pkg->{title};
 			}
+			$title = "\"$title\"";
 			print "\t";
 			$pkg->{menu} and print "menu";
 			print "config PACKAGE_".$pkg->{name}."\n";
-			print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." \"$title\"\n";
+			$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";
@@ -693,10 +711,10 @@ sub gen_package_mk() {
 				my $depstr = "\$(curdir)/$idx$suffix/compile";
 				my $depline = get_conditional_dep($condition, $depstr);
 				if ($depline) {
-					$deplines{$dep} = $depline;
+					$deplines{$depline}++;
 				}
 			}
-			my $depline = join(" ", values %deplines);
+			my $depline = join(" ", sort keys %deplines);
 			if ($depline) {
 				$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/$type/compile += $depline\n";
 			}
@@ -753,12 +771,12 @@ sub gen_package_mk() {
 					}
 					$depline = get_conditional_dep($condition, $depstr);
 					if ($depline) {
-						$deplines{$idx.$dep} = $depline;
+						$deplines{$depline}++;
 					}
 				}
 			}
 		}
-		my $depline = join(" ", values %deplines);
+		my $depline = join(" ", sort keys %deplines);
 		if ($depline) {
 			$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
 		}