allow targets to define a default subtarget when using automatic subtarget detection from r27407
SVN-Revision: 27444
This commit is contained in:
parent
04fefa4a28
commit
ad250089aa
2 changed files with 10 additions and 0 deletions
|
@ -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 '@@'; \
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue