metadata: handle target build depends together with host build depends

[openwrt/staging/ynezz.git] / scripts / package-metadata.pl

diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 7bffb2374ca9b9dcc7b275f173394b563dd5aabf..b092db3565084295a9cac1c814da0b2e3e332e96 100755 (executable)
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -372,19 +372,6 @@ sub print_package_overrides() {
 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";
@@ -421,6 +408,7 @@ sub gen_package_mk() {
                my $src = $srcpackage{$srcname};
                my $variant_default;
                my @srcdeps;
+               my %deplines = ('' => {});
 
                foreach my $pkg (@{$src->{packages}}) {
                        next if defined $pkg->{vdepends};
@@ -454,19 +442,23 @@ sub gen_package_mk() {
                        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"};
+
+                       defined $deplines{$suffix} or $deplines{$suffix} = {};
 
-                       next unless $src->{"builddepends/$type"};
-                       foreach my $dep (@{$src->{"builddepends/$type"}}) {
-                               my $suffix = "";
+                       foreach my $dep (@{$src->{"builddepends$suffix"}}) {
+                               my $depsuffix = "";
                                my $deptype = "";
                                my $condition;
 
@@ -477,37 +469,26 @@ sub gen_package_mk() {
                                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 } @{$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}{name}, $deptype, $pkg_dep->{src}{makefile}, $deptype;
-                                               next;
-                                       }
-                                       $idx = $pkg_dep->{src}{path};
-                               } elsif (defined($srcpackage{$dep})) {
-                                       $idx = $srcpackage{$dep}{path};
-                               } 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)/$src->{path}/$type/compile += $depline\n";
-                       }
                }
 
-               my $hasdeps = 0;
-               my %deplines;
                foreach my $deps (@srcdeps) {
                        my $idx;
                        my $condition;
@@ -565,43 +546,22 @@ sub gen_package_mk() {
                                        }
                                        $depline = get_conditional_dep($condition, $depstr);
                                        if ($depline) {
-                                               $deplines{$depline}++;
+                                               $deplines{''}{$depline}++;
                                        }
                                }
                        }
                }
-               my $depline = join(" ", sort keys %deplines);
-               if ($depline) {
-                       $line .= "\$(curdir)/$src->{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() {