print "menu \"$menu\"\n";
}
foreach my $pkg (@pkgs) {
- next if $pkg->{ignore};
+ next if $pkg->{src}{ignore};
my $title = $pkg->{name};
my $c = (72 - length($pkg->{name}) - length($pkg->{title}));
if ($c > 0) {
sub gen_package_config() {
parse_package_metadata($ARGV[0]) or exit 1;
print "menuconfig IMAGEOPT\n\tbool \"Image configuration\"\n\tdefault n\n";
- foreach my $preconfig (keys %preconfig) {
- foreach my $cfg (keys %{$preconfig{$preconfig}}) {
- my $conf = $preconfig{$preconfig}->{$cfg}->{id};
- $conf =~ tr/\.-/__/;
- print <<EOF
- config UCI_PRECONFIG_$conf
- string "$preconfig{$preconfig}->{$cfg}->{label}" if IMAGEOPT
- depends on PACKAGE_$preconfig
- default "$preconfig{$preconfig}->{$cfg}->{default}"
-
-EOF
- }
- }
print "source \"package/*/image-config.in\"\n";
if (scalar glob "package/feeds/*/*/image-config.in") {
print "source \"package/feeds/*/*/image-config.in\"\n";
parse_package_metadata($ARGV[0]) or exit 1;
foreach my $srcname (sort {uc($a) cmp uc($b)} keys %srcpackage) {
my $src = $srcpackage{$srcname};
- my $path = $subdir{$srcname}.$srcname;
my $variant_default;
my @srcdeps;
+ my %deplines = ('' => {});
foreach my $pkg (@{$src->{packages}}) {
next if defined $pkg->{vdepends};
my $config = '';
$config = "\$(CONFIG_PACKAGE_$pkg->{name})" unless $pkg->{buildonly};
- $pkg->{prereq} and print "prereq-$config += $path\n";
+ $pkg->{prereq} and print "prereq-$config += $src->{path}\n";
next if $pkg->{buildonly};
- print "package-$config += $path\n";
+ print "package-$config += $src->{path}\n";
if ($pkg->{variant}) {
if (!defined($variant_default) or $pkg->{variant_default}) {
$variant_default = $pkg->{variant};
}
- print "\$(curdir)/$path/variants += \$(if $config,$pkg->{variant})\n";
+ print "\$(curdir)/$src->{path}/variants += \$(if $config,$pkg->{variant})\n";
}
}
if (defined($variant_default)) {
- print "\$(curdir)/$path/default-variant := $variant_default\n";
+ print "\$(curdir)/$src->{path}/default-variant := $variant_default\n";
}
unless (grep {!$_->{buildonly}} @{$src->{packages}}) {
- print "package- += $path\n";
+ print "package- += $src->{path}\n";
}
if (@{$src->{buildtypes}} > 0) {
- print "buildtypes-$path = ".join(' ', @{$src->{buildtypes}})."\n";
+ print "buildtypes-$src->{path} = ".join(' ', @{$src->{buildtypes}})."\n";
}
- foreach my $dep (@{$src->{builddepends}}, map { @{$_->{depends}} } @{$src->{packages}}) {
+ foreach my $dep (map { @{$_->{depends}} } @{$src->{packages}}) {
$dep =~ /@/ or do {
$dep =~ s/\+//g;
push @srcdeps, $dep;
};
}
- foreach my $type (@{$src->{buildtypes}}) {
- my @extra_deps;
- my %deplines;
+ foreach my $type ('', @{$src->{buildtypes}}) {
+ my $suffix = '';
+
+ $suffix = "/$type" if $type;
+
+ next unless $src->{"builddepends$suffix"};
- next unless $src->{"builddepends/$type"};
- foreach my $dep (@{$src->{"builddepends/$type"}}) {
- my $suffix = "";
+ defined $deplines{$suffix} or $deplines{$suffix} = {};
+
+ foreach my $dep (@{$src->{"builddepends$suffix"}}) {
+ my $depsuffix = "";
my $deptype = "";
my $condition;
if ($dep =~ /^(.+)\/(.+)/) {
$dep = $1;
$deptype = $2;
- $suffix = "/$2";
+ $depsuffix = "/$2";
}
- my $idx = "";
- my $pkg_dep = $package{$dep};
- if (defined($pkg_dep) && defined($pkg_dep->{src})) {
- unless (!$deptype || grep { $_ eq $deptype } @{$srcpackage{$pkg_dep->{src}}{buildtypes}}) {
- warn sprintf "WARNING: Makefile '%s' has a %s build dependency on '%s/%s' but '%s' does not implement a '%s' build type\n",
- $src->{makefile}, $type, $pkg_dep->{src}, $deptype, $pkg_dep->{makefile}, $deptype;
- next;
- }
- $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
- } elsif (defined($srcpackage{$dep})) {
- $idx = $subdir{$dep}.$dep;
- } else {
+ next if $srcname.$suffix eq $dep.$depsuffix;
+
+ 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;
next;
}
- my $depstr = "\$(curdir)/$idx$suffix/compile";
+
+ my $depstr = "\$(curdir)/$src_dep->{path}$depsuffix/compile";
my $depline = get_conditional_dep($condition, $depstr);
if ($depline) {
- $deplines{$depline}++;
+ $deplines{$suffix}{$depline}++;
}
}
- my $depline = join(" ", sort keys %deplines);
- if ($depline) {
- $line .= "\$(curdir)/$path/$type/compile += $depline\n";
- }
}
- my $hasdeps = 0;
- my %deplines;
foreach my $deps (@srcdeps) {
my $idx;
my $condition;
foreach my $dep (@deps) {
$pkg_dep = $package{$deps};
if (defined $pkg_dep->{src}) {
- unless (!$deptype || grep { $_ eq $deptype } @{$srcpackage{$pkg_dep->{src}}{buildtypes}}) {
+ unless (!$deptype || grep { $_ eq $deptype } @{$pkg_dep->{src}{buildtypes}}) {
warn sprintf "WARNING: Makefile '%s' has a build dependency on '%s/%s' but '%s' does not implement a '%s' build type\n",
- $src->{makefile}, $pkg_dep->{src}, $deptype, $pkg_dep->{makefile}, $deptype;
+ $src->{makefile}, $pkg_dep->{src}{name}, $deptype, $pkg_dep->{src}{makefile}, $deptype;
next;
}
- $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
+ $idx = $pkg_dep->{src}{path};
} elsif (defined($srcpackage{$dep})) {
- $idx = $subdir{$dep}.$dep;
+ $idx = $srcpackage{$dep}{path};
}
if ($idx) {
$idx .= $suffix;
my $depline;
- next if $srcname eq $pkg_dep->{src}.$suffix;
+ next if $srcname eq $pkg_dep->{src}{name}.$suffix;
next if $dep{$condition.":".$srcname."->".$idx};
next if $dep{$srcname."->($dep)".$idx} and $pkg_dep->{vdepends};
my $depstr;
}
$depline = get_conditional_dep($condition, $depstr);
if ($depline) {
- $deplines{$depline}++;
+ $deplines{''}{$depline}++;
}
}
}
}
- my $depline = join(" ", sort keys %deplines);
- if ($depline) {
- $line .= "\$(curdir)/$path/compile += $depline\n";
+ foreach my $suffix (sort keys %deplines) {
+ my $depline = join(" ", sort keys %{$deplines{$suffix}});
+ if ($depline) {
+ $line .= "\$(curdir)/$src->{path}$suffix/compile += $depline\n";
+ }
}
}
if ($line ne "") {
print "\n$line";
}
- foreach my $preconfig (keys %preconfig) {
- my $cmds;
- foreach my $cfg (keys %{$preconfig{$preconfig}}) {
- my $conf = $preconfig{$preconfig}->{$cfg}->{id};
- $conf =~ tr/\.-/__/;
- $cmds .= "\techo \"uci set '$preconfig{$preconfig}->{$cfg}->{id}=\$(subst \",,\$(CONFIG_UCI_PRECONFIG_$conf))'\"; \\\n";
- }
- next unless $cmds;
- print <<EOF
-
-ifndef DUMP_TARGET_DB
-\$(TARGET_DIR)/etc/uci-defaults/$preconfig: FORCE
- ( \\
-$cmds \\
- ) > \$@
-
-ifneq (\$(IMAGEOPT)\$(CONFIG_IMAGEOPT),)
- package/preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
-endif
-endif
-
-EOF
- }
}
sub gen_package_source() {
} else {
if ($level == 1) {
print "$pkg->{name}: Missing license! ";
- print "Please fix $pkg->{makefile}\n";
+ print "Please fix $pkg->{src}{makefile}\n";
}
}
}