metadata: make srcpackage extensible

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

diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 261490b868160115e9e42a575b360f277f1db8d7..f03547a0d4478ee56be8bc3d0d848bd31fe853e7 100755 (executable)
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -445,7 +445,7 @@ sub gen_package_mk() {
                        print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join(' ', @{$pkg->{buildtypes}})."\n";
                }
 
-               foreach my $spkg (@{$srcpackage{$pkg->{src}}}) {
+               foreach my $spkg (@{$srcpackage{$pkg->{src}}{packages}}) {
                        foreach my $dep (@{$spkg->{depends}}, @{$spkg->{builddepends}}) {
                                $dep =~ /@/ or do {
                                        $dep =~ s/\+//g;
@@ -535,16 +535,11 @@ sub gen_package_mk() {
                                                        $pkg->{makefile}, $pkg_dep->{src}, $deptype, $pkg_dep->{makefile}, $deptype;
                                                next;
                                        }
-                                       unless ($pkg->{src} ne $pkg_dep->{sec}.$suffix) {
-                                               warn sprintf "WARNING: Makefile '%s' has a build dependency on itself\n",
-                                                       $pkg->{makefile};
-                                               next;
-                                       }
                                        $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
                                } elsif (defined($srcpackage{$dep})) {
                                        $idx = $subdir{$dep}.$dep;
                                }
-                               undef $idx if $idx eq 'base-files';
+
                                if ($idx) {
                                        $idx .= $suffix;