scripts: metadata: use the new "Repository" field

[openwrt/staging/yousong.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 99fdba1c819665746200c1e82cc0fd4b6bc5a71a..a55b7990f71d8bdd9d1a4859f0bf90bd5619ef91 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -321,6 +321,18 @@ EOF
                $target->{subtarget} or print "\t\tdefault \"".$target->{board}."\" if TARGET_".$target->{conf}."\n";
        }
        print <<EOF;
+config TARGET_SUBTARGET
+       string
+       default "generic" if !HAS_SUBTARGETS
+
+EOF
+
+       foreach my $target (@target) {
+               foreach my $subtarget (@{$target->{subtargets}}) {
+                       print "\t\tdefault \"$subtarget\" if TARGET_".$target->{conf}."_$subtarget\n";
+               }
+       }
+       print <<EOF;
 config TARGET_ARCH_PACKAGES
        string
        
@@ -837,8 +849,8 @@ sub gen_package_subdirs() {
        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->{package_subdir}) {
-                       print "Package/$name/subdir = $pkg->{package_subdir}\n";
+               if ($pkg->{name} && $pkg->{repository}) {
+                       print "Package/$name/subdir = $pkg->{repository}\n";
                }
        }
 }