fixes for recursive package scanning

[openwrt.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index e196003..e8a7c1b 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -72,12 +72,15 @@ sub parse_package_metadata() {
        my $pkg;
        my $makefile;
        my $preconfig;
+       my $subdir;
        my $src;
        while (<>) {
                chomp;
-               /^Source-Makefile: \s*(.+\/([^\/]+)\/Makefile)\s*$/ and do {
+               /^Source-Makefile: \s*((.+\/)([^\/]+)\/Makefile)\s*$/ and do {
                        $makefile = $1;
-                       $src = $2;
+                       $subdir = $2;
+                       $src = $3;
+                       $subdir =~ s/^package\///;
                        $srcpackage{$src} = [];
                        undef $pkg;
                };
@@ -89,6 +92,7 @@ sub parse_package_metadata() {
                        $pkg->{default} = "m if ALL";
                        $pkg->{depends} = [];
                        $pkg->{builddepends} = [];
+                       $pkg->{subdir} = $subdir;
                        $package{$1} = $pkg;
                        push @{$srcpackage{$src}}, $pkg;
                };
@@ -131,6 +135,20 @@ sub parse_package_metadata() {
        return %category;
 }
 
+sub merge_package_lists($$) {
+       my $list1 = shift;
+       my $list2 = shift;
+       my @l = ();
+       my %pkgs;
+
+       foreach my $pkg (@$list1, @$list2) {
+               $pkgs{$pkg} = 1;
+       }
+       foreach my $pkg (keys %pkgs) {
+               push @l, $pkg unless ($pkg =~ /^-/ or $pkgs{"-$pkg"});
+       }
+       return sort(@l);
+}
 
 sub gen_target_mk() {
        my @target = parse_target_metadata();
@@ -149,7 +167,7 @@ sub gen_target_mk() {
   define Profile/$conf\_$profile->{id}
     ID:=$profile->{id}
     NAME:=$profile->{name}
-    PACKAGES:=".join(" ", @{$profile->{packages}})."\n";
+    PACKAGES:=".join(" ", merge_package_lists($target->{packages}, $profile->{packages}))."\n";
                        $profile->{kconfig} and $profiles_def .= "    KCONFIG:=1\n";
                        $profiles_def .= "  endef";
                        $profiles_eval .= "
@@ -303,12 +321,9 @@ config LINUX_$target->{conf}_$profile->{id}
 $profile->{config}
 EOF
                        $profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";
-                       my %pkgs;
-                       foreach my $pkg (@{$target->{packages}}, @{$profile->{packages}}) {
-                               $pkgs{$pkg} = 1;
-                       }
-                       foreach my $pkg (keys %pkgs) {
-                               print "\tselect DEFAULT_$pkg\n" unless ($pkg =~ /^-/ or $pkgs{"-$pkg"});
+                       my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
+                       foreach my $pkg (@pkglist) {
+                               print "\tselect DEFAULT_$pkg\n";
                        }
                        print "\n";
                }
@@ -317,6 +332,7 @@ EOF
        print "endchoice\n";
 }
 
+
 sub find_package_dep($$) {
        my $pkg = shift;
        my $name = shift;
@@ -491,7 +507,7 @@ sub gen_package_mk() {
                        $config = "\$(CONFIG_PACKAGE_$name)"
                }
                if ($config) {
-                       print "package-$config += $pkg->{src}\n";
+                       print "package-$config += $pkg->{subdir}$pkg->{src}\n";
                        $pkg->{prereq} and print "prereq-$config += $pkg->{src}\n";
                }
        
@@ -507,7 +523,7 @@ sub gen_package_mk() {
                        next if defined $pkg_dep->{vdepends};
 
                        if (defined $pkg_dep->{src}) {
-                               ($pkg->{src} ne $pkg_dep->{src}) and $idx = $pkg_dep->{src};
+                               ($pkg->{src} ne $pkg_dep->{src}) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
                        } elsif (defined($pkg_dep) && !defined($ENV{SDK})) {
                                $idx = $dep;
                        }
@@ -519,7 +535,7 @@ sub gen_package_mk() {
                        }
                }
                if ($depline) {
-                       $line .= "$pkg->{src}-compile: $depline\n";
+                       $line .= $pkg->{subdir}."$pkg->{src}-compile: $depline\n";
                }
        }