X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=scripts%2Fmetadata.pl;h=43e5ccc6d0ea20caba880e7f855f84d9e946bb1e;hp=50d636a67393226ba63f84f32d9509e48ef061d6;hb=ff0ce3b563dff2ee49fce1069abe7a0674382035;hpb=a23758a049fab4a320f868c2d190ee6cc9080bf2 diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 50d636a673..43e5ccc6d0 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; @@ -223,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"; @@ -236,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); @@ -289,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"; } @@ -318,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; @@ -361,12 +368,16 @@ sub package_depends($$) { return $ret; } -sub mconf_depends($$) { +sub mconf_depends { + my $pkgname = shift; my $depends = shift; 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; @@ -376,20 +387,39 @@ sub mconf_depends($$) { my $flags = $1; my $vdep; + if ($depend =~ /^(.+):(.+)$/) { + if ($1 ne "PACKAGE_$pkgname") { + if ($condition) { + $condition = "$condition && $1"; + } else { + $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($pkgname, $package{$depend}->{depends}, 1, $dep, $seen, $condition); + + $m = "select"; + next if $only_dep; }; $flags =~ /@/ or $depend = "PACKAGE_$depend"; + if ($condition) { + if ($m =~ /select/) { + $depend = "$depend if $condition"; + } else { + $depend = "!($condition) || $depend"; + } + } } $dep->{$depend} =~ /select/ or $dep->{$depend} = $m; } @@ -420,8 +450,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 { @@ -453,7 +481,7 @@ sub print_package_config_category($) { foreach my $default (split /\s*,\s*/, $pkg->{default}) { print "\t\tdefault $default\n"; } - print mconf_depends($pkg->{depends}, 0); + print mconf_depends($pkg->{name}, $pkg->{depends}, 0); print "\t\thelp\n"; print $pkg->{description}; print "\n"; @@ -472,7 +500,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}; @@ -502,10 +530,9 @@ sub gen_package_mk() { foreach my $name (sort {uc($a) cmp uc($b)} keys %package) { my $config; my $pkg = $package{$name}; + my @srcdeps; next if defined $pkg->{vdepends}; - next if $done{$pkg->{src}}; - $done{$pkg->{src}} = 1; if ($ENV{SDK}) { $conf{$pkg->{src}} or do { @@ -520,12 +547,29 @@ 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 $deps (@{$pkg->{depends}}, @{$pkg->{builddepends}}) { - next if $deps =~ /@/; - $deps =~ s/\+//; + foreach my $deps (@srcdeps) { my $idx; + my $condition; + + if ($deps =~ /^(.+):(.+)/) { + $condition = $1; + $deps = $2; + } + my $pkg_dep = $package{$deps}; my @deps; @@ -544,14 +588,27 @@ sub gen_package_mk() { } undef $idx if $idx =~ /^(kernel)|(base-files)$/; if ($idx) { - next if $dep{$pkg->{src}."->".$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}) { - $depline .= " \$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)"; + $depstr = "\$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)"; + $dep{$pkg->{src}."->($dep)".$idx} = 1; } else { - $depline .= " \$(curdir)/$idx/compile"; + $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"; + } } } } @@ -597,7 +654,7 @@ sub parse_command() { print <