From: John Crispin <john@openwrt.org>
Date: Mon, 4 Jul 2011 11:21:37 +0000 (+0000)
Subject: allow targets to define a default subtarget when using automatic subtarget detection... 
X-Git-Tag: v19.07.0-rc1~27011
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ad250089aa5d3152774f87941606837c3534f6bd;p=openwrt%2Fstaging%2Fhauke.git

allow targets to define a default subtarget when using automatic subtarget detection from r27407

SVN-Revision: 27444
---

diff --git a/include/target.mk b/include/target.mk
index cfd7c9f3c3..af3230925c 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -215,6 +215,7 @@ define BuildTargets/DumpCurrent
 	 echo 'Linux-Version: $(LINUX_VERSION)'; \
 	 echo 'Linux-Release: $(LINUX_RELEASE)'; \
 	 echo 'Linux-Kernel-Arch: $(LINUX_KARCH)'; \
+	$(if $(SUBTARGET),,$(if $(DEFAULT_SUBTARGET), echo 'Default-Subtarget: $(DEFAULT_SUBTARGET)'; ))
 	 echo 'Target-Description:'; \
 	 $(SH_FUNC) getvar $(call shvar,Target/Description); \
 	 echo '@@'; \
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 3acdb16a82..0f4ae9fe0a 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -56,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 = {
@@ -282,6 +283,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) {