metadata.pl: add support for selecting packages available only via PROVIDES
[openwrt.git] / scripts / metadata.pl
index 39304df..96d5ee4 100755 (executable)
@@ -3,86 +3,49 @@ use FindBin;
 use lib "$FindBin::Bin";
 use strict;
 use metadata;
+use Getopt::Long;
 
 my %board;
 
-sub confstr($) {
-       my $conf = shift;
-       $conf =~ tr#/\.\-/#___#;
-       return $conf;
+sub version_to_num($) {
+       my $str = shift;
+       my $num = 0;
+
+       if (defined($str) && $str =~ /^\d+(?:\.\d+)+$/)
+       {
+               my @n = (split(/\./, $str), 0, 0, 0, 0);
+               $num = ($n[0] << 24) | ($n[1] << 16) | ($n[2] << 8) | $n[3];
+       }
+
+       return $num;
 }
 
-sub parse_target_metadata() {
-       my $file = shift @ARGV;
-       my ($target, @target, $profile);
-       my %target;
+sub version_filter_list(@) {
+       my $cmpver = version_to_num(shift @_);
+       my @items;
 
-       open FILE, "<$file" or do {
-               warn "Can't open file '$file': $!\n";
-               return;
-       };
-       while (<FILE>) {
-               chomp;
-               /^Target:\s*(.+)\s*$/ and do {
-                       my $name = $1;
-                       $target = {
-                               id => $name,
-                               board => $name,
-                               boardconf => confstr($name),
-                               conf => confstr($name),
-                               profiles => [],
-                               features => [],
-                               depends => [],
-                               subtargets => []
-                       };
-                       push @target, $target;
-                       $target{$name} = $target;
-                       if ($name =~ /([^\/]+)\/([^\/]+)/) {
-                               push @{$target{$1}->{subtargets}}, $2;
-                               $target->{board} = $1;
-                               $target->{boardconf} = confstr($1);
-                               $target->{subtarget} = 1;
-                               $target->{parent} = $target{$1};
-                       }
-               };
-               /^Target-Kernel:\s*(\d+\.\d+)\s*$/ and $target->{kernel} = $1;
-               /^Target-Name:\s*(.+)\s*$/ and $target->{name} = $1;
-               /^Target-Path:\s*(.+)\s*$/ and $target->{path} = $1;
-               /^Target-Arch:\s*(.+)\s*$/ and $target->{arch} = $1;
-               /^Target-Features:\s*(.+)\s*$/ and $target->{features} = [ split(/\s+/, $1) ];
-               /^Target-Depends:\s*(.+)\s*$/ and $target->{depends} = [ split(/\s+/, $1) ];
-               /^Target-Description:/ and $target->{desc} = get_multiline(*FILE);
-               /^Target-Optimization:\s*(.+)\s*$/ and $target->{cflags} = $1;
-               /^Linux-Version:\s*(.+)\s*$/ and $target->{version} = $1;
-               /^Linux-Release:\s*(.+)\s*$/ and $target->{release} = $1;
-               /^Linux-Kernel-Arch:\s*(.+)\s*$/ and $target->{karch} = $1;
-               /^Default-Packages:\s*(.+)\s*$/ and $target->{packages} = [ split(/\s+/, $1) ];
-               /^Target-Profile:\s*(.+)\s*$/ and do {
-                       $profile = {
-                               id => $1,
-                               name => $1,
-                               packages => []
-                       };
-                       push @{$target->{profiles}}, $profile;
-               };
-               /^Target-Profile-Name:\s*(.+)\s*$/ and $profile->{name} = $1;
-               /^Target-Profile-Packages:\s*(.*)\s*$/ and $profile->{packages} = [ split(/\s+/, $1) ];
-               /^Target-Profile-Description:\s*(.*)\s*/ and $profile->{desc} = get_multiline(*FILE);
-               /^Target-Profile-Config:/ and $profile->{config} = get_multiline(*FILE, "\t");
-               /^Target-Profile-Kconfig:/ and $profile->{kconfig} = 1;
-       }
-       close FILE;
-       foreach my $target (@target) {
-               next if @{$target->{subtargets}} > 0;
-               @{$target->{profiles}} > 0 or $target->{profiles} = [
+       foreach my $item (@_)
+       {
+               if ($item =~ s/@(lt|le|gt|ge|eq|ne)(\d+(?:\.\d+)+)\b//)
+               {
+                       my $op = $1;
+                       my $symver = version_to_num($2);
+
+                       if ($symver > 0 && $cmpver > 0)
                        {
-                               id => 'Default',
-                               name => 'Default',
-                               packages => []
+                               next unless (($op eq 'lt' && $cmpver <  $symver) ||
+                                            ($op eq 'le' && $cmpver <= $symver) ||
+                                            ($op eq 'gt' && $cmpver >  $symver) ||
+                                            ($op eq 'ge' && $cmpver >= $symver) ||
+                                            ($op eq 'eq' && $cmpver == $symver) ||
+                                            ($op eq 'ne' && $cmpver != $symver));
                        }
-               ];
+               }
+
+               push @items, $item;
        }
-       return @target;
+
+       return @items;
 }
 
 sub gen_kconfig_overrides() {
@@ -91,6 +54,7 @@ sub gen_kconfig_overrides() {
        my $package;
        my $pkginfo = shift @ARGV;
        my $cfgfile = shift @ARGV;
+       my $patchver = shift @ARGV;
 
        # parameter 2: build system config
        open FILE, "<$cfgfile" or return;
@@ -105,7 +69,7 @@ sub gen_kconfig_overrides() {
                /^Package:\s*(.+?)\s*$/ and $package = $1;
                /^Kernel-Config:\s*(.+?)\s*$/ and do {
                        my @config = split /\s+/, $1;
-                       foreach my $config (@config) {
+                       foreach my $config (version_filter_list($patchver, @config)) {
                                my $val = 'm';
                                my $override;
                                if ($config =~ /^(.+?)=(.+)$/) {
@@ -114,6 +78,7 @@ sub gen_kconfig_overrides() {
                                        $val = $2;
                                }
                                if ($config{"CONFIG_PACKAGE_$package"} and ($config ne 'n')) {
+                                       next if $kconfig{$config} eq 'y';
                                        $kconfig{$config} = $val;
                                } elsif (!$override) {
                                        $kconfig{$config} or $kconfig{$config} = 'n';
@@ -151,21 +116,34 @@ sub target_config_features(@) {
        my $ret;
 
        while ($_ = shift @_) {
-               /broken/ and $ret .= "\tdepends BROKEN\n";
+               /arm_v(\w+)/ and $ret .= "\tselect arm_v$1\n";
+               /broken/ and $ret .= "\tdepends on BROKEN\n";
+               /audio/ and $ret .= "\tselect AUDIO_SUPPORT\n";
                /display/ and $ret .= "\tselect DISPLAY_SUPPORT\n";
+               /dt/ and $ret .= "\tselect USES_DEVICETREE\n";
                /gpio/ and $ret .= "\tselect GPIO_SUPPORT\n";
                /pci/ and $ret .= "\tselect PCI_SUPPORT\n";
                /pcie/ and $ret .= "\tselect PCIE_SUPPORT\n";
                /usb/ and $ret .= "\tselect USB_SUPPORT\n";
+               /usbgadget/ and $ret .= "\tselect USB_GADGET_SUPPORT\n";
                /pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";
+               /rtc/ and $ret .= "\tselect RTC_SUPPORT\n";
                /squashfs/ and $ret .= "\tselect USES_SQUASHFS\n";
-               /jffs2/ and $ret .= "\tselect USES_JFFS2\n";
-               /ext2/ and $ret .= "\tselect USES_EXT2\n";
-               /tgz/ and $ret .= "\tselect USES_TGZ\n";
+               /jffs2$/ and $ret .= "\tselect USES_JFFS2\n";
+               /jffs2_nand/ and $ret .= "\tselect USES_JFFS2_NAND\n";
+               /ext4/ and $ret .= "\tselect USES_EXT4\n";
+               /targz/ and $ret .= "\tselect USES_TARGZ\n";
                /cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n";
+               /ubifs/ and $ret .= "\tselect USES_UBIFS\n";
                /fpu/ and $ret .= "\tselect HAS_FPU\n";
+               /spe_fpu/ and $ret .= "\tselect HAS_SPE_FPU\n";
                /ramdisk/ and $ret .= "\tselect USES_INITRAMFS\n";
                /powerpc64/ and $ret .= "\tselect powerpc64\n";
+               /nommu/ and $ret .= "\tselect NOMMU\n";
+               /mips16/ and $ret .= "\tselect HAS_MIPS16\n";
+               /rfkill/ and $ret .= "\tselect RFKILL_SUPPORT\n";
+               /low_mem/ and $ret .= "\tselect LOW_MEMORY_FOOTPRINT\n";
+               /nand/ and $ret .= "\tselect NAND_SUPPORT\n";
        }
        return $ret;
 }
@@ -183,7 +161,11 @@ sub target_name($) {
 sub kver($) {
        my $v = shift;
        $v =~ tr/\./_/;
-       $v =~ /(\d+_\d+_\d+)(_\d+)?/ and $v = $1;
+       if (substr($v,0,2) eq "2_") {
+               $v =~ /(\d+_\d+_\d+)(_\d+)?/ and $v = $1;
+       } else {
+               $v =~ /(\d+_\d+)(_\d+)?/ and $v = $1;
+       }
        return $v;
 }
 
@@ -191,9 +173,7 @@ sub print_target($) {
        my $target = shift;
        my $features = target_config_features(@{$target->{features}});
        my $help = $target->{desc};
-       my $kernel = $target->{kernel};
        my $confstr;
-       $kernel =~ tr/./_/;
 
        chomp $features;
        $features .= "\n";
@@ -209,7 +189,6 @@ sub print_target($) {
        $confstr = <<EOF;
 config TARGET_$target->{conf}
        bool "$target->{name}"
-       select LINUX_$kernel
        select LINUX_$v
 EOF
        }
@@ -220,35 +199,39 @@ config TARGET_$target->{conf}
 EOF
        }
        if ($target->{subtarget}) {
-               $confstr .= "\tdepends TARGET_$target->{boardconf}\n";
+               $confstr .= "\tdepends on TARGET_$target->{boardconf}\n";
        }
        if (@{$target->{subtargets}} > 0) {
                $confstr .= "\tselect HAS_SUBTARGETS\n";
+               grep { /broken/ } @{$target->{features}} and $confstr .= "\tdepends on BROKEN\n";
        } else {
-               $confstr .= "\tselect $target->{arch}\n";
-               foreach my $dep (@{$target->{depends}}) {
-                       my $mode = "depends";
-                       my $flags;
-                       my $name;
-
-                       $dep =~ /^([@\+\-]+)(.+)$/;
-                       $flags = $1;
-                       $name = $2;
-
-                       next if $name =~ /:/;
-                       $flags =~ /-/ and $mode = "deselect";
-                       $flags =~ /\+/ and $mode = "select";
-                       $flags =~ /@/ and $confstr .= "\t$mode $name\n";
-               }
                $confstr .= $features;
+               if ($target->{arch} =~ /\w/) {
+                       $confstr .= "\tselect $target->{arch}\n";
+               }
        }
 
+       foreach my $dep (@{$target->{depends}}) {
+               my $mode = "depends on";
+               my $flags;
+               my $name;
+
+               $dep =~ /^([@\+\-]+)(.+)$/;
+               $flags = $1;
+               $name = $2;
+
+               next if $name =~ /:/;
+               $flags =~ /-/ and $mode = "deselect";
+               $flags =~ /\+/ and $mode = "select";
+               $flags =~ /@/ and $confstr .= "\t$mode $name\n";
+       }
        $confstr .= "$help\n\n";
        print $confstr;
 }
 
 sub gen_target_config() {
-       my @target = parse_target_metadata();
+       my $file = shift @ARGV;
+       my @target = parse_target_metadata($file);
        my %defaults;
 
        my @target_sort = sort {
@@ -259,7 +242,7 @@ sub gen_target_config() {
        print <<EOF;
 choice
        prompt "Target System"
-       default TARGET_brcm_2_4
+       default TARGET_ar71xx
        reset if !DEVEL
        
 EOF
@@ -274,6 +257,14 @@ endchoice
 
 choice
        prompt "Subtarget" if HAS_SUBTARGETS
+EOF
+       foreach my $target (@target) {
+               next unless $target->{def_subtarget};
+               print <<EOF;
+       default TARGET_$target->{conf}_$target->{def_subtarget} if TARGET_$target->{conf}
+EOF
+       }
+       print <<EOF;
 
 EOF
        foreach my $target (@target) {
@@ -296,7 +287,7 @@ EOF
                        print <<EOF;
 config TARGET_$target->{conf}_$profile->{id}
        bool "$profile->{name}"
-       depends TARGET_$target->{conf}
+       depends on TARGET_$target->{conf}
 $profile->{config}
 EOF
                        $profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";
@@ -330,6 +321,27 @@ 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
+       
+EOF
+       foreach my $target (@target) {
+               next if @{$target->{subtargets}} > 0;
+               print "\t\tdefault \"".($target->{arch_packages} || $target->{board})."\" if TARGET_".$target->{conf}."\n";
+       }
+       print <<EOF;
 
 config DEFAULT_TARGET_OPTIMIZATION
        string
@@ -339,6 +351,16 @@ EOF
                print "\tdefault \"".$target->{cflags}."\" if TARGET_".$target->{conf}."\n";
        }
        print "\tdefault \"-Os -pipe -funit-at-a-time\"\n";
+       print <<EOF;
+
+config CPU_TYPE
+       string
+EOF
+       foreach my $target (@target) {
+               next if @{$target->{subtargets}} > 0;
+               print "\tdefault \"".$target->{cputype}."\" if TARGET_".$target->{conf}."\n";
+       }
+       print "\tdefault \"\"\n";
 
        my %kver;
        foreach my $target (@target) {
@@ -409,16 +431,21 @@ sub mconf_depends {
        my $parent_condition = shift;
        $dep or $dep = {};
        $seen or $seen = {};
+       my @t_depends;
 
        $depends or return;
        my @depends = @$depends;
        foreach my $depend (@depends) {
-               my $m = "depends";
-               $depend =~ s/^([@\+]+)//;
-               my $flags = $1;
+               my $m = "depends on";
+               my $flags = "";
+               $depend =~ s/^([@\+]+)// and $flags = $1;
                my $vdep;
                my $condition = $parent_condition;
 
+               next if $condition eq $depend;
+               next if $seen->{"$parent_condition:$depend"};
+               next if $seen->{":$depend"};
+               $seen->{"$parent_condition:$depend"} = 1;
                if ($depend =~ /^(.+):(.+)$/) {
                        if ($1 ne "PACKAGE_$pkgname") {
                                if ($condition) {
@@ -429,33 +456,47 @@ sub mconf_depends {
                        }
                        $depend = $2;
                }
-               next if $seen->{$depend};
                next if $package{$depend} and $package{$depend}->{buildonly};
-               $seen->{$depend} = 1;
-               if ($vdep = $package{$depend}->{vdepends}) {
-                       $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
-               } else {
-                       $flags =~ /\+/ and do {
-                               # Menuconfig will not treat 'select FOO' as a real dependency
-                               # thus if FOO depends on other config options, these dependencies
-                               # will not be checked. To fix this, we simply emit all of FOO's
-                               # depends here as well.
-                               $package{$depend} and mconf_depends($pkgname, $package{$depend}->{depends}, 1, $dep, $seen, $condition);
-
-                               $m = "select";
-                               next if $only_dep;
-                       };
-                       $flags =~ /@/ or $depend = "PACKAGE_$depend";
-                       if ($condition) {
-                               if ($m =~ /select/) {
-                                       $depend = "$depend if $condition";
-                               } else {
-                                       $depend = "!($condition) || $depend";
+               if ($flags =~ /\+/) {
+                       if ($vdep = $package{$depend}->{vdepends}) {
+                               my @vdeps = @$vdep;
+                               $depend = shift @vdeps;
+                               if (@vdeps > 1) {
+                                       $condition = '!('.join("||", map { "PACKAGE_".$_ } @vdeps).')';
+                               } elsif (@vdeps > 0) {
+                                       $condition = '!PACKAGE_'.$vdeps[0];
                                }
                        }
+
+                       # Menuconfig will not treat 'select FOO' as a real dependency
+                       # thus if FOO depends on other config options, these dependencies
+                       # will not be checked. To fix this, we simply emit all of FOO's
+                       # depends here as well.
+                       $package{$depend} and push @t_depends, [ $package{$depend}->{depends}, $condition ];
+
+                       $m = "select";
+                       next if $only_dep;
+               } else {
+                       if ($vdep = $package{$depend}->{vdepends}) {
+                               $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
+                       }
+               }
+               $flags =~ /@/ or $depend = "PACKAGE_$depend";
+               if ($condition) {
+                       if ($m =~ /select/) {
+                               next if $depend eq $condition;
+                               $depend = "$depend if $condition";
+                       } else {
+                               $depend = "!($condition) || $depend" unless $dep->{$condition} eq 'select';
+                       }
                }
                $dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
        }
+
+       foreach my $tdep (@t_depends) {
+               mconf_depends($pkgname, $tdep->[0], 1, $dep, $seen, $tdep->[1]);
+       }
+
        foreach my $depend (keys %$dep) {
                my $m = $dep->{$depend};
                $res .= "\t\t$m $depend\n";
@@ -463,6 +504,18 @@ sub mconf_depends {
        return $res;
 }
 
+sub mconf_conflicts {
+       my $pkgname = shift;
+       my $depends = shift;
+       my $res = "";
+
+       foreach my $depend (@$depends) {
+               next unless $package{$depend};
+               $res .= "\t\tdepends on m || (PACKAGE_$depend != y)\n";
+       }
+       return $res;
+}
+
 sub print_package_config_category($) {
        my $cat = shift;
        my %menus;
@@ -507,15 +560,28 @@ sub print_package_config_category($) {
                        if ($c > 0) {
                                $title .= ("." x $c). " ". $pkg->{title};
                        }
+                       $title = "\"$title\"";
                        print "\t";
                        $pkg->{menu} and print "menu";
                        print "config PACKAGE_".$pkg->{name}."\n";
-                       print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." \"$title\"\n";
+                       $pkg->{hidden} and $title = "";
+                       print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." $title\n";
                        print "\t\tdefault y if DEFAULT_".$pkg->{name}."\n";
-                       foreach my $default (split /\s*,\s*/, $pkg->{default}) {
-                               print "\t\tdefault $default\n";
+                       unless ($pkg->{hidden}) {
+                               if ($pkg->{name} =~ /^kmod-/) {
+                                       $pkg->{default} ||= "m if ALL_KMODS";
+                               } else {
+                                       $pkg->{default} ||= "m if ALL";
+                               }
+                       }
+                       if ($pkg->{default}) {
+                               foreach my $default (split /\s*,\s*/, $pkg->{default}) {
+                                       print "\t\tdefault $default\n";
+                               }
                        }
                        print mconf_depends($pkg->{name}, $pkg->{depends}, 0);
+                       print mconf_depends($pkg->{name}, $pkg->{mdepends}, 0);
+                       print mconf_conflicts($pkg->{name}, $pkg->{conflicts});
                        print "\t\thelp\n";
                        print $pkg->{description};
                        print "\n";
@@ -532,26 +598,64 @@ sub print_package_config_category($) {
        undef $category{$cat};
 }
 
+sub print_package_features() {
+       keys %features > 0 or return;
+       print "menu \"Package features\"\n";
+       foreach my $n (keys %features) {
+               my @features = sort { $b->{priority} <=> $a->{priority} or $a->{title} cmp $b->{title} } @{$features{$n}};
+               print <<EOF;
+choice
+       prompt "$features[0]->{target_title}"
+       default FEATURE_$features[0]->{name}
+EOF
+
+               foreach my $feature (@features) {
+                       print <<EOF;
+       config FEATURE_$feature->{name}
+               bool "$feature->{title}"
+EOF
+                       $feature->{description} =~ /\w/ and do {
+                               print "\t\thelp\n".$feature->{description}."\n";
+                       };
+               }
+               print "endchoice\n"
+       }
+       print "endmenu\n\n";
+}
+
+sub print_package_overrides() {
+       keys %overrides > 0 or return;
+       print "\tconfig OVERRIDE_PKGS\n";
+       print "\t\tstring\n";
+       print "\t\tdefault \"".join(" ", keys %overrides)."\"\n\n";
+}
+
 sub gen_package_config() {
        parse_package_metadata($ARGV[0]) or exit 1;
-       print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n" if %preconfig;
+       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 UCI_PRECONFIG
-               depends PACKAGE_$preconfig
+               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";
+       }
+       print_package_features();
        print_package_config_category 'Base system';
-       foreach my $cat (keys %category) {
+       foreach my $cat (sort {uc($a) cmp uc($b)} keys %category) {
                print_package_config_category $cat;
        }
+       print_package_overrides();
 }
 
 sub get_conditional_dep($$) {
@@ -582,17 +686,16 @@ sub gen_package_mk() {
 
                next if defined $pkg->{vdepends};
 
-               if ($ENV{SDK}) {
-                       $conf{$pkg->{src}} or do {
-                               $config = 'm';
-                               $conf{$pkg->{src}} = 1;
-                       };
-               } else {
-                       $config = "\$(CONFIG_PACKAGE_$name)"
-               }
+               $config = "\$(CONFIG_PACKAGE_$name)";
                if ($config) {
                        $pkg->{buildonly} and $config = "";
                        print "package-$config += $pkg->{subdir}$pkg->{src}\n";
+                       if ($pkg->{variant}) {
+                               if (!defined($done{$pkg->{src}}) or $pkg->{variant_default}) {
+                                       print "\$(curdir)/$pkg->{subdir}$pkg->{src}/default-variant := $pkg->{variant}\n";
+                               }
+                               print "\$(curdir)/$pkg->{subdir}$pkg->{src}/variants += \$(if $config,$pkg->{variant})\n"
+                       }
                        $pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";
                }
 
@@ -628,22 +731,23 @@ sub gen_package_mk() {
                                        $dep = $1;
                                        $suffix = $2;
                                }
-                               my $pkg_dep = $package{$dep};
-                               next unless $pkg_dep;
 
                                my $idx = "";
-                               if (defined $pkg_dep->{src}) {
+                               my $pkg_dep = $package{$dep};
+                               if (defined($pkg_dep) && defined($pkg_dep->{src})) {
                                        $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
                                } elsif (defined($srcpackage{$dep})) {
                                        $idx = $subdir{$dep}.$dep;
+                               } else {
+                                       next;
                                }
                                my $depstr = "\$(curdir)/$idx$suffix/compile";
                                my $depline = get_conditional_dep($condition, $depstr);
                                if ($depline) {
-                                       $deplines{$dep} = $depline;
+                                       $deplines{$depline}++;
                                }
                        }
-                       my $depline = join(" ", values %deplines);
+                       my $depline = join(" ", sort keys %deplines);
                        if ($depline) {
                                $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/$type/compile += $depline\n";
                        }
@@ -682,12 +786,13 @@ sub gen_package_mk() {
                                } elsif (defined($srcpackage{$dep})) {
                                        $idx = $subdir{$dep}.$dep;
                                }
-                               $idx .= $suffix;
-                               undef $idx if $idx =~ /^(kernel)|(base-files)$/;
+                               undef $idx if $idx eq 'base-files';
                                if ($idx) {
+                                       $idx .= $suffix;
+
                                        my $depline;
                                        next if $pkg->{src} eq $pkg_dep->{src}.$suffix;
-                                       next if $dep{$pkg->{src}."->".$idx};
+                                       next if $dep{$condition.":".$pkg->{src}."->".$idx};
                                        next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends};
                                        my $depstr;
 
@@ -700,12 +805,12 @@ sub gen_package_mk() {
                                        }
                                        $depline = get_conditional_dep($condition, $depstr);
                                        if ($depline) {
-                                               $deplines{$idx.$dep} = $depline;
+                                               $deplines{$depline}++;
                                        }
                                }
                        }
                }
-               my $depline = join(" ", values %deplines);
+               my $depline = join(" ", sort keys %deplines);
                if ($depline) {
                        $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
                }
@@ -724,14 +829,17 @@ sub gen_package_mk() {
                next unless $cmds;
                print <<EOF
 
+ifndef DUMP_TARGET_DB
 \$(TARGET_DIR)/etc/uci-defaults/$preconfig: FORCE
        ( \\
 $cmds \\
        ) > \$@
        
-ifneq (\$(UCI_PRECONFIG)\$(CONFIG_UCI_PRECONFIG),)
+ifneq (\$(IMAGEOPT)\$(CONFIG_IMAGEOPT),)
   package/preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
 endif
+endif
+
 EOF
        }
 }
@@ -747,7 +855,46 @@ sub gen_package_source() {
        }
 }
 
+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";
+               }
+       }
+}
+
+sub gen_package_license($) {
+       my $level = shift;
+       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}) {
+                       if ($pkg->{license}) {
+                               print "$pkg->{name}: ";
+                               print "$pkg->{license}\n";
+                               if ($pkg->{licensefiles} && $level == 0) {
+                                       print "\tFiles: $pkg->{licensefiles}\n";
+                               }
+                       } else {
+                               if ($level == 1) {
+                                       print "$pkg->{name}: Missing license! ";
+                                       print "Please fix $pkg->{makefile}\n";
+                               }
+                       }
+               }
+       }
+}
+
+sub gen_version_filtered_list() {
+       foreach my $item (version_filter_list(@ARGV)) {
+               print "$item\n";
+       }
+}
+
 sub parse_command() {
+       GetOptions("ignore=s", \@ignore);
        my $cmd = shift @ARGV;
        for ($cmd) {
                /^target_config$/ and return gen_target_config();
@@ -755,15 +902,25 @@ sub parse_command() {
                /^package_config$/ and return gen_package_config();
                /^kconfig/ and return gen_kconfig_overrides();
                /^package_source$/ and return gen_package_source();
+               /^package_subdirs$/ and return gen_package_subdirs();
+               /^package_license$/ and return gen_package_license(0);
+               /^package_licensefull$/ and return gen_package_license(1);
+               /^version_filter$/ and return gen_version_filtered_list();
        }
        print <<EOF
 Available Commands:
-       $0 target_config [file]         Target metadata in Kconfig format
-       $0 package_mk [file]            Package metadata in makefile format
-       $0 package_config [file]        Package metadata in Kconfig format
-       $0 kconfig [file] [config]      Kernel config overrides
-       $0 package_source [file]        Package source file information
-
+       $0 target_config [file]                 Target metadata in Kconfig format
+       $0 package_mk [file]                    Package metadata in makefile format
+       $0 package_config [file]                Package metadata in Kconfig format
+       $0 kconfig [file] [config] [patchver]   Kernel config overrides
+       $0 package_source [file]                Package source file information
+       $0 package_subdirs [file]               Package subdir information in makefile format
+       $0 package_license [file]               Package license information
+       $0 package_licensefull [file]           Package license information (full list)
+       $0 version_filter [patchver] [list...]  Filter list of version tagged strings
+
+Options:
+       --ignore <name>                         Ignore the source package <name>
 EOF
 }