Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
@@ -136,6 +136,7 @@ sub parse_target_metadata($) {
|
||||
/^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-Default-Profile:\s*(.+)\s*$/ and $target->{default_profile} = $1;
|
||||
/^Target-Profile:\s*(.+)\s*$/ and do {
|
||||
$profile = {
|
||||
id => $1,
|
||||
|
||||
@@ -179,7 +179,7 @@ EOF
|
||||
print <<EOF;
|
||||
choice
|
||||
prompt "Target System"
|
||||
default TARGET_x86
|
||||
default TARGET_mediatek
|
||||
reset if !DEVEL
|
||||
|
||||
EOF
|
||||
@@ -219,6 +219,14 @@ choice
|
||||
EOF
|
||||
foreach my $target (@target) {
|
||||
my $profile = $target->{profiles}->[0];
|
||||
foreach my $p (@{$target->{profiles}}) {
|
||||
last unless $target->{default_profile};
|
||||
my $name = $p->{id};
|
||||
$name =~ s/^DEVICE_//;
|
||||
next unless $name eq $target->{default_profile};
|
||||
$profile = $p;
|
||||
last;
|
||||
}
|
||||
$profile or next;
|
||||
print <<EOF;
|
||||
default TARGET_$target->{conf}_$profile->{id} if TARGET_$target->{conf} && !BUILDBOT
|
||||
|
||||
Reference in New Issue
Block a user