scripts/package-metadata.pl: parse and validate field Require-User

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

diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 44494efd28139de66aeac71bb008ac0f99f51b8c..d4100c1726d12c2675634edbf10a5186367c6a43 100755 (executable)
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -176,12 +176,25 @@ sub mconf_depends {
                next if $package{$depend} and $package{$depend}->{buildonly};
                if ($flags =~ /\+/) {
                        if ($vdep = $package{$depend}->{vdepends}) {
-                               my @vdeps = @$vdep;
-                               $depend = shift @vdeps;
+                               my @vdeps;
+                               $depend = undef;
+
+                               foreach my $v (@$vdep) {
+                                       if ($package{$v} && $package{$v}->{variant_default}) {
+                                               $depend = $v;
+                                       } else {
+                                               push @vdeps, $v;
+                                       }
+                               }
+
+                               if (!$depend) {
+                                       $depend = shift @vdeps;
+                               }
+
                                if (@vdeps > 1) {
-                                       $condition = '!('.join("||", map { "PACKAGE_".$_ } @vdeps).')';
+                                       $condition = ($condition ? "$condition && " : '') . '!('.join("||", map { "PACKAGE_".$_ } @vdeps).')';
                                } elsif (@vdeps > 0) {
-                                       $condition = '!PACKAGE_'.$vdeps[0];
+                                       $condition = ($condition ? "$condition && " : '') . '!PACKAGE_'.$vdeps[0];
                                }
                        }
 
@@ -193,17 +206,22 @@ sub mconf_depends {
 
                        $m = "select";
                        next if $only_dep;
+
+                       $flags =~ /@/ or $depend = "PACKAGE_$depend";
                } else {
                        if ($vdep = $package{$depend}->{vdepends}) {
                                $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
+                       } else {
+                               $flags =~ /@/ or $depend = "PACKAGE_$depend";
                        }
                }
-               $flags =~ /@/ or $depend = "PACKAGE_$depend";
+
                if ($condition) {
                        if ($m =~ /select/) {
                                next if $depend eq $condition;
                                $depend = "$depend if $condition";
                        } else {
+                               next if $dep->{"$depend if $condition"};
                                $depend = "!($condition) || $depend" unless $dep->{$condition} eq 'select';
                        }
                }
@@ -348,7 +366,7 @@ 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";
+       print "\t\tdefault \"".join(" ", sort keys %overrides)."\"\n\n";
 }
 
 sub gen_package_config() {
@@ -614,6 +632,16 @@ sub gen_version_filtered_list() {
        }
 }
 
+sub gen_usergroup_list() {
+       parse_package_metadata($ARGV[0]) or exit 1;
+       for my $name (keys %usernames) {
+               print "user $name $usernames{$name}{id} $usernames{$name}{makefile}\n";
+       }
+       for my $name (keys %groupnames) {
+               print "group $name $groupnames{$name}{id} $groupnames{$name}{makefile}\n";
+       }
+}
+
 sub parse_command() {
        GetOptions("ignore=s", \@ignore);
        my $cmd = shift @ARGV;
@@ -625,6 +653,7 @@ sub parse_command() {
                /^subdirs$/ and return gen_package_subdirs();
                /^license$/ and return gen_package_license(0);
                /^licensefull$/ and return gen_package_license(1);
+               /^usergroup$/ and return gen_usergroup_list();
                /^version_filter$/ and return gen_version_filtered_list();
        }
        die <<EOF
@@ -636,6 +665,7 @@ Available Commands:
        $0 subdirs [file]                       Package subdir information in makefile format
        $0 license [file]                       Package license information
        $0 licensefull [file]                   Package license information (full list)
+       $0 usergroup [file]                     Package usergroup allocation list
        $0 version_filter [patchver] [list...]  Filter list of version tagged strings
 
 Options: