diff options
| author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-04 11:21:37 +0000 |
|---|---|---|
| committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-04 11:21:37 +0000 |
| commit | d92e2b4207e90f63307006a176c7d2756d293e04 (patch) | |
| tree | 85f25df0a728c4cfebaee3420c8ec98d693a2019 | |
| parent | e8f1fadf6c149fec9e1e54a360ea0369d62b59f9 (diff) | |
allow targets to define a default subtarget when using automatic subtarget detection from r27407
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27444 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/target.mk | 1 | ||||
| -rwxr-xr-x | scripts/metadata.pl | 9 |
2 files changed, 10 insertions, 0 deletions
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) { |