X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=scripts%2Fmetadata.pl;h=914b5127b4ad1dbf61d88976bd371c2e6abccc2f;hp=aa5df6fb9d49fbebe2e5b11a1f4eccb79778af56;hb=a1d481a507a84527e76d87feb067001d5c6cebf3;hpb=051340251b17ef15c569e6f18381f18edf9866d9 diff --git a/scripts/metadata.pl b/scripts/metadata.pl index aa5df6fb9d..914b5127b4 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -15,6 +15,8 @@ sub confstr($) { sub parse_target_metadata() { my $file = shift @ARGV; my ($target, @target, $profile); + my %target; + open FILE, "<$file" or do { warn "Can't open file '$file': $!\n"; return; @@ -22,22 +24,33 @@ sub parse_target_metadata() { while () { chomp; /^Target:\s*(.+)\s*$/ and do { + my $name = $1; $target = { - id => $1, - conf => confstr($1), - profiles => [] + id => $name, + board => $name, + boardconf => confstr($name), + conf => confstr($name), + profiles => [], + features => [], + depends => [], + subtargets => [] }; push @target, $target; - }; - /^Target-Board:\s*(.+)\s*$/ and do { - $target->{board} = $1; - $target->{boardconf} = confstr($1); + $target{$name} = $target; + if ($name =~ /([^\/]+)\/([^\/]+)/) { + push @{$target{$1}->{subtargets}}, $2; + $target->{board} = $1; + $target->{boardconf} = confstr($1); + $target->{subtarget} = 1; + $target->{parent} = $target{$1}; + } }; /^Target-Kernel:\s*(\d+\.\d+)\s*$/ and $target->{kernel} = $1; /^Target-Name:\s*(.+)\s*$/ and $target->{name} = $1; /^Target-Path:\s*(.+)\s*$/ and $target->{path} = $1; /^Target-Arch:\s*(.+)\s*$/ and $target->{arch} = $1; /^Target-Features:\s*(.+)\s*$/ and $target->{features} = [ split(/\s+/, $1) ]; + /^Target-Depends:\s*(.+)\s*$/ and $target->{depends} = [ split(/\s+/, $1) ]; /^Target-Description:/ and $target->{desc} = get_multiline(*FILE); /^Linux-Version:\s*(.+)\s*$/ and $target->{version} = $1; /^Linux-Release:\s*(.+)\s*$/ and $target->{release} = $1; @@ -59,6 +72,7 @@ sub parse_target_metadata() { } close FILE; foreach my $target (@target) { + next if @{$target->{subtargets}} > 0; @{$target->{profiles}} > 0 or $target->{profiles} = [ { id => 'Default', @@ -137,6 +151,7 @@ sub target_config_features(@) { while ($_ = shift @_) { /broken/ and $ret .= "\tdepends BROKEN\n"; + /display/ and $ret .= "\tselect DISPLAY_SUPPORT\n"; /pci/ and $ret .= "\tselect PCI_SUPPORT\n"; /usb/ and $ret .= "\tselect USB_SUPPORT\n"; /pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n"; @@ -148,15 +163,73 @@ sub target_config_features(@) { return $ret; } +sub target_name($) { + my $target = shift; + my $parent = $target->{parent}; + if ($parent) { + return $target->{parent}->{name}." - ".$target->{name}; + } else { + return $target->{name}; + } +} + +sub print_target($) { + my $target = shift; + my $features = target_config_features(@{$target->{features}}); + my $help = $target->{desc}; + my $kernel = $target->{kernel}; + my $confstr; + $kernel =~ tr/./_/; + + chomp $features; + $features .= "\n"; + if ($help =~ /\w+/) { + $help =~ s/^\s*/\t /mg; + $help = "\thelp\n$help"; + } else { + undef $help; + } + + $confstr = <{conf} + bool "$target->{name}" + select LINUX_$kernel +EOF + if ($target->{subtarget}) { + $confstr .= "\tdepends TARGET_$target->{boardconf}\n"; + } + if (@{$target->{subtargets}} > 0) { + $confstr .= "\tselect HAS_SUBTARGETS\n"; + } else { + $confstr .= "\tselect $target->{arch}\n"; + foreach my $dep (@{$target->{depends}}) { + my $mode = "depends"; + my $flags; + my $name; + + $dep =~ /^([@\+\-]+)(.+)$/; + $flags = $1; + $name = $2; + + $flags =~ /-/ and $mode = "deselect"; + $flags =~ /\+/ and $mode = "select"; + $flags =~ /@/ and $confstr .= "\t$mode $name\n"; + } + $confstr .= $features; + } + + $confstr .= "$help\n\n"; + print $confstr; +} sub gen_target_config() { my @target = parse_target_metadata(); - @target = sort { - $a->{name} cmp $b->{name} + my @target_sort = sort { + target_name($a) cmp target_name($b); } @target; - - + + print <{features}}); - my $help = $target->{desc}; - my $kernel = $target->{kernel}; - $kernel =~ tr/./_/; - - chomp $features; - $features .= "\n"; - if ($help =~ /\w+/) { - $help =~ s/^\s*/\t /mg; - $help = "\thelp\n$help"; - } else { - undef $help; - } - - print <{conf} - bool "$target->{name}" - select $target->{arch} - select LINUX_$kernel -EOF - if ($target->{id} ne $target->{board}) { - print "\tselect TARGET_".$target->{boardconf}."\n"; - } - print "$features$help\n\n" + foreach my $target (@target_sort) { + next if $target->{subtarget}; + print_target($target); } print <{board}."\" if TARGET_".$target->{conf}."\n"; + next unless $target->{subtarget}; + print_target($target); } - # add hidden target config options - foreach my $target (@target) { - next if $board{$target->{board}}; - if ($target->{id} ne $target->{board}) { - print "\nconfig TARGET_".$target->{boardconf}."\n\tbool\n"; - $board{$target->{board}} = 1; - } - } - print <{profiles}; - + foreach my $profile (@$profiles) { print <{conf}_$profile->{id} @@ -236,7 +282,20 @@ EOF } } - print "endchoice\n"; + print <{subtarget} or print "\t\tdefault \"".$target->{board}."\" if TARGET_".$target->{conf}."\n"; + } + } my %dep_check; @@ -284,6 +343,8 @@ sub mconf_depends($$) { my $depends = shift; my $only_dep = shift; my $res; + my $dep = shift; + $dep or $dep = {}; $depends or return; my @depends = @$depends; @@ -292,7 +353,7 @@ sub mconf_depends($$) { $depend =~ s/^([@\+]+)//; my $flags = $1; my $vdep; - + if ($vdep = $package{$depend}->{vdepends}) { $depend = join("||", map { "PACKAGE_".$_ } @$vdep); } else { @@ -304,10 +365,14 @@ sub mconf_depends($$) { # thus if FOO depends on other config options, these dependencies # will not be checked. To fix this, we simply emit all of FOO's # depends here as well. - $package{$depend} and $res .= mconf_depends($package{$depend}->{depends}, 1); + $package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep); }; $flags =~ /@/ or $depend = "PACKAGE_$depend"; } + $dep->{$depend} =~ /select/ or $dep->{$depend} = $m; + } + foreach my $depend (keys %$dep) { + my $m = $dep->{$depend}; $res .= "\t\t$m $depend\n"; } return $res; @@ -317,12 +382,12 @@ sub print_package_config_category($) { my $cat = shift; my %menus; my %menu_dep; - + return unless $category{$cat}; - + print "menu \"$cat\"\n\n"; my %spkg = %{$category{$cat}}; - + foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) { foreach my $pkg (@{$spkg{$spkg}}) { my $menu = $pkg->{submenu}; @@ -379,7 +444,7 @@ sub print_package_config_category($) { } } print "endmenu\n\n"; - + undef $category{$cat}; } @@ -414,7 +479,7 @@ sub gen_package_mk() { foreach my $name (sort {uc($a) cmp uc($b)} keys %package) { my $config; my $pkg = $package{$name}; - + next if defined $pkg->{vdepends}; if ($ENV{SDK}) { $conf{$pkg->{src}} or do { @@ -428,7 +493,7 @@ sub gen_package_mk() { print "package-$config += $pkg->{subdir}$pkg->{src}\n"; $pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n"; } - + my $hasdeps = 0; my $depline = ""; foreach my $dep (@{$pkg->{depends}}, @{$pkg->{builddepends}}) { @@ -454,7 +519,7 @@ sub gen_package_mk() { $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n"; } } - + if ($line ne "") { print "\n$line"; }