X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=scripts%2Fmetadata.pl;h=cfda69351bfc1240c616da304e18c6e43cc55baf;hp=2898289bcc22dffe782e08fc3e3d80e98a8efa0d;hb=243fb9ec3fa9113202a12dbcae5c50de8eb1080f;hpb=cd4bf2c0f26a4dd7216ff770048ae92bdc3a17d6 diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 2898289bcc..cfda69351b 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl use FindBin; use lib "$FindBin::Bin"; use strict; @@ -152,6 +152,7 @@ sub target_config_features(@) { while ($_ = shift @_) { /broken/ and $ret .= "\tdepends BROKEN\n"; /display/ and $ret .= "\tselect DISPLAY_SUPPORT\n"; + /gpio/ and $ret .= "\tselect GPIO_SUPPORT\n"; /pci/ and $ret .= "\tselect PCI_SUPPORT\n"; /usb/ and $ret .= "\tselect USB_SUPPORT\n"; /pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n"; @@ -159,6 +160,8 @@ sub target_config_features(@) { /jffs2/ and $ret .= "\tselect USES_JFFS2\n"; /ext2/ and $ret .= "\tselect USES_EXT2\n"; /tgz/ and $ret .= "\tselect USES_TGZ\n"; + /cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n"; + /fpu/ and $ret .= "\tselect HAS_FPU\n"; } return $ret; } @@ -220,6 +223,7 @@ EOF $flags = $1; $name = $2; + next if $name =~ /:/; $flags =~ /-/ and $mode = "deselect"; $flags =~ /\+/ and $mode = "select"; $flags =~ /@/ and $confstr .= "\t$mode $name\n"; @@ -233,6 +237,7 @@ EOF sub gen_target_config() { my @target = parse_target_metadata(); + my %defaults; my @target_sort = sort { target_name($a) cmp target_name($b); @@ -286,6 +291,7 @@ EOF my @pkglist = merge_package_lists($target->{packages}, $profile->{packages}); foreach my $pkg (@pkglist) { print "\tselect DEFAULT_$pkg\n"; + $defaults{$pkg} = 1; } print "\n"; } @@ -315,6 +321,10 @@ config LINUX_$v bool EOF } + foreach my $def (sort keys %defaults) { + print "\tconfig DEFAULT_".$def."\n"; + print "\t\tbool\n\n"; + } } my %dep_check; @@ -363,7 +373,10 @@ sub mconf_depends($$) { my $only_dep = shift; my $res; my $dep = shift; + my $seen = shift; + my $condition = shift; $dep or $dep = {}; + $seen or $seen = {}; $depends or return; my @depends = @$depends; @@ -373,20 +386,27 @@ sub mconf_depends($$) { my $flags = $1; my $vdep; + if ($depend =~ /^(.+):(.+)$/) { + $condition and $condition = "$condition && $1" or $condition = $1; + $depend = $2; + } + next if $seen->{$depend}; + $seen->{$depend} = 1; if ($vdep = $package{$depend}->{vdepends}) { $depend = join("||", map { "PACKAGE_".$_ } @$vdep); } else { $flags =~ /\+/ and do { - next if $only_dep; - $m = "select"; - # Menuconfig will not treat 'select FOO' as a real dependency # 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 mconf_depends($package{$depend}->{depends}, 1, $dep); + $package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep, $seen, $condition); + + $m = "select"; + next if $only_dep; }; $flags =~ /@/ or $depend = "PACKAGE_$depend"; + $condition and ($m =~ /select/ and $depend = "$depend if $condition" or $depend = "!($condition) || $depend"); } $dep->{$depend} =~ /select/ or $dep->{$depend} = $m; } @@ -417,8 +437,6 @@ sub print_package_config_category($) { } $menus{$menu} or $menus{$menu} = []; push @{$menus{$menu}}, $pkg; - print "\tconfig DEFAULT_".$pkg->{name}."\n"; - print "\t\tbool\n\n"; } } my @menus = sort { @@ -469,7 +487,7 @@ sub print_package_config_category($) { sub gen_package_config() { parse_package_metadata($ARGV[0]) or exit 1; - print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n"; + print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n" if %preconfig; foreach my $preconfig (keys %preconfig) { foreach my $cfg (keys %{$preconfig{$preconfig}}) { my $conf = $preconfig{$preconfig}->{$cfg}->{id}; @@ -492,14 +510,17 @@ EOF sub gen_package_mk() { my %conf; my %dep; + my %done; my $line; parse_package_metadata($ARGV[0]) or exit 1; foreach my $name (sort {uc($a) cmp uc($b)} keys %package) { my $config; my $pkg = $package{$name}; + my @srcdeps; next if defined $pkg->{vdepends}; + if ($ENV{SDK}) { $conf{$pkg->{src}} or do { $config = 'm'; @@ -513,25 +534,69 @@ sub gen_package_mk() { $pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n"; } + next if $done{$pkg->{src}}; + $done{$pkg->{src}} = 1; + + foreach my $spkg (@{$srcpackage{$pkg->{src}}}) { + foreach my $dep (@{$spkg->{depends}}, @{$spkg->{builddepends}}) { + $dep =~ /@/ or do { + $dep =~ s/\+//g; + push @srcdeps, $dep; + }; + } + } + my $hasdeps = 0; my $depline = ""; - foreach my $dep (@{$pkg->{depends}}, @{$pkg->{builddepends}}) { - next if $dep =~ /@/; - $dep =~ s/\+//; + foreach my $deps (@srcdeps) { my $idx; - my $pkg_dep = $package{$dep}; - next if defined $pkg_dep->{vdepends}; + my $condition; + + if ($deps =~ /^(.+):(.+)/) { + $condition = $1; + $deps = $2; + } - if (defined $pkg_dep->{src}) { - ($pkg->{src} ne $pkg_dep->{src}) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src}; - } elsif (defined($srcpackage{$dep})) { - $idx = $subdir{$dep}.$dep; + my $pkg_dep = $package{$deps}; + my @deps; + + if ($pkg_dep->{vdepends}) { + @deps = @{$pkg_dep->{vdepends}}; + } else { + @deps = ($deps); } - undef $idx if $idx =~ /^(kernel)|(base-files)$/; - if ($idx) { - next if $dep{$pkg->{src}."->".$idx}; - $depline .= " \$(curdir)/$idx/compile"; - $dep{$pkg->{src}."->".$idx} = 1; + + foreach my $dep (@deps) { + $pkg_dep = $package{$deps}; + if (defined $pkg_dep->{src}) { + ($pkg->{src} ne $pkg_dep->{src}) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src}; + } elsif (defined($srcpackage{$dep})) { + $idx = $subdir{$dep}.$dep; + } + undef $idx if $idx =~ /^(kernel)|(base-files)$/; + if ($idx) { + next if $pkg->{src} eq $pkg_dep->{src}; + next if $dep{$pkg->{src}."->".$idx}; + next if $dep{$pkg->{src}."->($dep)".$idx}; + my $depstr; + + if ($pkg_dep->{vdepends}) { + $depstr = "\$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)"; + $dep{$pkg->{src}."->($dep)".$idx} = 1; + } else { + $depstr = "\$(curdir)/$idx/compile"; + $dep{$pkg->{src}."->".$idx} = 1; + } + if ($condition) { + if ($condition =~ /^!(.+)/) { + $depline .= " \$(if \$(CONFIG_$1),,$depstr)"; + } else { + $depline .= " \$(if \$(CONFIG_$condition),$depstr)"; + } + } else { + $depline .= " $depstr"; + } + } } } if ($depline) { @@ -576,7 +641,7 @@ sub parse_command() { print <