diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-11-05 01:24:30 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-11-05 01:24:30 +0000 |
commit | ea4600ff65ca71a211a2b820dfecc114790aef4a (patch) | |
tree | f28dc9432f556fa36c36e4fe1faba98d333b704b | |
parent | e0ac739a84089bbc8c9331b0119b5b88aca2fdbe (diff) |
metadata: process dependencies for targets that have subtargets as well - hides the ramips target unless the user has requested to play with broken packages/targets (related to #6051)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18306 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-x | scripts/metadata.pl | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 2da8851171..ca00fcae6d 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -225,25 +225,26 @@ EOF } if (@{$target->{subtargets}} > 0) { $confstr .= "\tselect HAS_SUBTARGETS\n"; - } else { + } + + if ($target->{arch} =~ /\w/) { $confstr .= "\tselect $target->{arch}\n"; - foreach my $dep (@{$target->{depends}}) { - my $mode = "depends"; - my $flags; - my $name; - - $dep =~ /^([@\+\-]+)(.+)$/; - $flags = $1; - $name = $2; - - next if $name =~ /:/; - $flags =~ /-/ and $mode = "deselect"; - $flags =~ /\+/ and $mode = "select"; - $flags =~ /@/ and $confstr .= "\t$mode $name\n"; - } - $confstr .= $features; } + foreach my $dep (@{$target->{depends}}) { + my $mode = "depends"; + my $flags; + my $name; + + $dep =~ /^([@\+\-]+)(.+)$/; + $flags = $1; + $name = $2; + next if $name =~ /:/; + $flags =~ /-/ and $mode = "deselect"; + $flags =~ /\+/ and $mode = "select"; + $flags =~ /@/ and $confstr .= "\t$mode $name\n"; + } + $confstr .= $features; $confstr .= "$help\n\n"; print $confstr; } |