sub __find_package_dep($$) {
my $pkg = shift;
my $name = shift;
- my $deps = ($pkg->{vdepends} or $pkg->{depends});
+ my $deps = $pkg->{depends};
return 0 unless defined $deps;
- foreach my $dep (@{$deps}) {
- next if $dep_check{$dep};
- $dep_check{$dep} = 1;
- return 1 if $dep eq $name;
- return 1 if ($package{$dep} and (__find_package_dep($package{$dep},$name) == 1));
+ foreach my $vpkg (@{$deps}) {
+ foreach my $dep (@{$vpackage{$vpkg}}) {
+ next if $dep_check{$dep->{name}};
+ $dep_check{$dep->{name}} = 1;
+ return 1 if $dep->{name} eq $name;
+ return 1 if (__find_package_dep($dep, $name) == 1);
+ }
}
return 0;
}
my $m = "depends on";
my $flags = "";
$depend =~ s/^([@\+]+)// and $flags = $1;
- my $vdep;
my $condition = $parent_condition;
next if $condition eq $depend;
}
$depend = $2;
}
- next if $package{$depend} and $package{$depend}->{buildonly};
if ($flags =~ /\+/) {
- if ($vdep = $package{$depend}->{vdepends}) {
+ my $vdep = $vpackage{$depend};
+ if ($vdep) {
my @vdeps;
- $depend = undef;
foreach my $v (@$vdep) {
- if ($package{$v} && $package{$v}->{variant_default}) {
- $depend = $v;
+ next if $v->{buildonly};
+ if ($v->{variant_default}) {
+ unshift @vdeps, $v->{name};
} else {
- push @vdeps, $v;
+ push @vdeps, $v->{name};
}
}
- if (!$depend) {
- $depend = shift @vdeps;
- }
+ $depend = shift @vdeps;
if (@vdeps > 1) {
$condition = ($condition ? "$condition && " : '') . '!('.join("||", map { "PACKAGE_".$_ } @vdeps).')';
$flags =~ /@/ or $depend = "PACKAGE_$depend";
} else {
- if ($vdep = $package{$depend}->{vdepends}) {
- $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
+ my $vdep = $vpackage{$depend};
+ if ($vdep && @$vdep > 0) {
+ $depend = join("||", map { "PACKAGE_".$_->{name} } @$vdep);
} else {
$flags =~ /@/ or $depend = "PACKAGE_$depend";
}
undef $category{$cat};
}
-sub print_package_features() {
- keys %features > 0 or return;
- print "menu \"Package features\"\n";
- foreach my $n (keys %features) {
- my @features = sort { $b->{priority} <=> $a->{priority} or $a->{title} cmp $b->{title} } @{$features{$n}};
- print <<EOF;
-choice
- prompt "$features[0]->{target_title}"
- default FEATURE_$features[0]->{name}
-EOF
-
- foreach my $feature (@features) {
- print <<EOF;
- config FEATURE_$feature->{name}
- bool "$feature->{title}"
-EOF
- $feature->{description} =~ /\w/ and do {
- print "\t\thelp\n".$feature->{description}."\n";
- };
- }
- print "endchoice\n"
- }
- print "endmenu\n\n";
-}
-
sub print_package_overrides() {
keys %overrides > 0 or return;
print "\tconfig OVERRIDE_PKGS\n";
if (scalar glob "package/feeds/*/*/image-config.in") {
print "source \"package/feeds/*/*/image-config.in\"\n";
}
- print_package_features();
print_package_config_category 'Base system';
foreach my $cat (sort {uc($a) cmp uc($b)} keys %category) {
print_package_config_category $cat;
$dep = $2;
}
- my $pkg_dep = $package{$dep};
- unless (defined $pkg_dep) {
+ my $vpkg_dep = $vpackage{$dep};
+ unless (defined $vpkg_dep) {
warn sprintf "WARNING: Makefile '%s' has a dependency on '%s', which does not exist\n",
$src->{makefile}, $dep;
next;
}
- unless ($pkg_dep->{vdepends}) {
- next if $srcname eq $pkg_dep->{src}{name};
+ # Filter out self-depends
+ my @vdeps = grep { $srcname ne $_->{src}{name} } @{$vpkg_dep};
- my $depstr = "\$(curdir)/$pkg_dep->{src}{path}/compile";
- my $depline = get_conditional_dep($condition, $depstr);
- if ($depline) {
- $deplines{''}{$depline}++;
+ foreach my $vdep (@vdeps) {
+ my $depstr = sprintf '$(curdir)/%s/compile', $vdep->{src}{path};
+ if (@vdeps > 1) {
+ $depstr = sprintf '$(if $(CONFIG_PACKAGE_%s),%s)', $vdep->{name}, $depstr;
}
- next;
- }
-
- foreach my $vdep (@{$pkg_dep->{vdepends}}) {
- my $pkg_vdep = $package{$vdep};
- next if $srcname eq $pkg_vdep->{src}{name};
-
- my $depstr = "\$(if \$(CONFIG_PACKAGE_$vdep),\$(curdir)/$pkg_vdep->{src}{path}/compile)";
my $depline = get_conditional_dep($condition, $depstr);
if ($depline) {
$deplines{''}{$depline}++;
}
}
- next if defined $pkg->{vdepends};
-
my $config = '';
- $config = "\$(CONFIG_PACKAGE_$pkg->{name})" unless $pkg->{buildonly};
+ $config = sprintf '$(CONFIG_PACKAGE_%s)', $pkg->{name} unless $pkg->{buildonly};
- $pkg->{prereq} and print "prereq-$config += $src->{path}\n";
+ $pkg->{prereq} and printf "prereq-%s += %s\n", $config, $src->{path};
next if $pkg->{buildonly};
- print "package-$config += $src->{path}\n";
+ printf "package-%s += %s\n", $config, $src->{path};
if ($pkg->{variant}) {
if (!defined($variant_default) or $pkg->{variant_default}) {
$variant_default = $pkg->{variant};
}
- print "\$(curdir)/$src->{path}/variants += \$(if $config,$pkg->{variant})\n";
+ printf "\$(curdir)/%s/variants += \$(if %s,%s)\n", $src->{path}, $config, $pkg->{variant};
}
}
if (defined($variant_default)) {
- print "\$(curdir)/$src->{path}/default-variant := $variant_default\n";
+ printf "\$(curdir)/%s/default-variant := %s\n", $src->{path}, $variant_default;
}
unless (grep {!$_->{buildonly}} @{$src->{packages}}) {
- print "package- += $src->{path}\n";
+ printf "package- += %s\n", $src->{path};
}
if (@{$src->{buildtypes}} > 0) {
- print "buildtypes-$src->{path} = ".join(' ', @{$src->{buildtypes}})."\n";
+ printf "buildtypes-%s = %s\n", $src->{path}, join(' ', @{$src->{buildtypes}});
}
foreach my $type ('', @{$src->{buildtypes}}) {
my $src_dep = $srcpackage{$dep};
unless (defined($src_dep) && (!$deptype || grep { $_ eq $deptype } @{$src_dep->{buildtypes}})) {
- warn sprintf "WARNING: Makefile '%s' has a build dependency on '%s%s', which does not exist\n",
- $src->{makefile}, $dep, $depsuffix;
+ warn sprintf "WARNING: Makefile '%s' has a build dependency on '%s', which does not exist\n",
+ $src->{makefile}, $dep.$depsuffix;
next;
}
- my $depstr = "\$(curdir)/$src_dep->{path}$depsuffix/compile";
+ my $depstr = sprintf '$(curdir)/%s/compile', $src_dep->{path}.$depsuffix;
my $depline = get_conditional_dep($condition, $depstr);
if ($depline) {
$deplines{$suffix}{$depline}++;
foreach my $suffix (sort keys %deplines) {
my $depline = join(" ", sort keys %{$deplines{$suffix}});
if ($depline) {
- $line .= "\$(curdir)/$src->{path}$suffix/compile += $depline\n";
+ $line .= sprintf "\$(curdir)/%s/compile += %s\n", $src->{path}.$suffix, $depline;
}
}
}
}
}
-sub gen_package_subdirs() {
+sub gen_package_auxiliary() {
parse_package_metadata($ARGV[0]) or exit 1;
foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
my $pkg = $package{$name};
if ($pkg->{name} && $pkg->{repository}) {
print "Package/$name/subdir = $pkg->{repository}\n";
}
+ if ($pkg->{name} && defined($pkg->{abiversion}) && length($pkg->{abiversion})) {
+ my $abiv;
+
+ if ($pkg->{abiversion} =~ m!^(\d{4})-(\d{2})-(\d{2})-[0-9a-f]{7,40}$!) {
+ print STDERR "WARNING: Reducing ABI version '$pkg->{abiversion}' of package '$name' to '$1$2$3'\n";
+ $abiv = "$1$2$3";
+ }
+ else {
+ $abiv = $pkg->{abiversion};
+ }
+
+ foreach my $n (@{$pkg->{provides}}) {
+ print "Package/$n/abiversion = $abiv\n";
+ }
+ }
}
}
/^config$/ and return gen_package_config();
/^kconfig/ and return gen_kconfig_overrides();
/^source$/ and return gen_package_source();
- /^subdirs$/ and return gen_package_subdirs();
+ /^pkgaux$/ and return gen_package_auxiliary();
/^license$/ and return gen_package_license(0);
/^licensefull$/ and return gen_package_license(1);
/^usergroup$/ and return gen_usergroup_list();
$0 config [file] Package metadata in Kconfig format
$0 kconfig [file] [config] [patchver] Kernel config overrides
$0 source [file] Package source file information
- $0 subdirs [file] Package subdir information in makefile format
+ $0 pkgaux [file] Package auxiliary variables in makefile format
$0 license [file] Package license information
$0 licensefull [file] Package license information (full list)
$0 usergroup [file] Package usergroup allocation list