From ea4600ff65ca71a211a2b820dfecc114790aef4a Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 5 Nov 2009 01:24:30 +0000 Subject: [PATCH] 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 --- scripts/metadata.pl | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 2da885117..ca00fcae6 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; } -- 2.20.1