metadata: make srcpackage extensible

[openwrt/openwrt.git] / scripts / metadata.pm

diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index b3f34f79e9fef9300ed5783b25923b64525a9a5c..fdb1fbb433646f95a2c87b8d6739ab1d1021b4f4 100644 (file)
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -2,7 +2,7 @@ package metadata;
 use base 'Exporter';
 use strict;
 use warnings;
-our @EXPORT = qw(%package %srcpackage %category %subdir %preconfig %features %overrides clear_packages parse_package_metadata parse_target_metadata get_multiline @ignore);
+our @EXPORT = qw(%package %srcpackage %category %subdir %preconfig %features %overrides clear_packages parse_package_metadata parse_target_metadata get_multiline @ignore %usernames %groupnames);
 
 our %package;
 our %preconfig;
@@ -13,6 +13,11 @@ our %features;
 our %overrides;
 our @ignore;
 
+our %usernames;
+our %groupnames;
+our %userids;
+our %groupids;
+
 sub get_multiline {
        my $fh = shift;
        my $prefix = shift;
@@ -31,6 +36,58 @@ sub confstr($) {
        return $conf;
 }
 
+sub parse_package_metadata_usergroup($$$$$) {
+       my $makefile = shift;
+       my $typename = shift;
+       my $names = shift;
+       my $ids = shift;
+       my $spec = shift;
+       my $name;
+       my $id;
+
+       # the regex for name is taken from is_valid_name() of package shadow
+       if ($spec =~ /^([a-z_][a-z0-9_-]*\$?)$/) {
+               $name = $spec;
+               $id = -1;
+       } elsif ($spec =~ /^([a-z_][a-z0-9_-]*\$?)=(\d+)$/) {
+               $name = $1;
+               $id = $2;
+       } else {
+               warn "$makefile: invalid $typename spec $spec\n";
+               return 0;
+       }
+
+       if ($id =~ /^[1-9]\d*$/) {
+               if ($id >= 65536) {
+                       warn "$makefile: $typename $name id $id >= 65536";
+                       return 0;
+               }
+               if (not exists $ids->{$id}) {
+                       $ids->{$id} = {
+                               name => $name,
+                               makefile => $makefile,
+                       };
+               } elsif ($ids->{$id}{name} ne $name) {
+                       warn "$makefile: $typename $name id $id is already taken by $ids->{$id}{makefile}\n";
+                       return 0;
+               }
+       } elsif ($id != -1) {
+               warn "$makefile: $typename $name has invalid id $id\n";
+               return 0;
+       }
+
+       if (not exists $names->{$name}) {
+               $names->{$name} = {
+                       id => $id,
+                       makefile => $makefile,
+               };
+       } elsif ($names->{$name}{id} != $id) {
+               warn "$makefile: id of $typename $name collides with that defined defined in $names->{$name}{makefile}\n";
+               return 0;
+       }
+       return 1;
+}
+
 sub parse_target_metadata($) {
        my $file = shift;
        my ($target, @target, $profile);
@@ -87,6 +144,7 @@ sub parse_target_metadata($) {
                                priority => 999,
                                packages => []
                        };
+                       $1 =~ /^DEVICE_/ and $target->{has_devices} = 1;
                        push @{$target->{profiles}}, $profile;
                };
                /^Target-Profile-Name:\s*(.+)\s*$/ and $profile->{name} = $1;
@@ -127,6 +185,8 @@ sub clear_packages() {
        %category = ();
        %features = ();
        %overrides = ();
+       %usernames = ();
+       %groupnames = ();
 }
 
 sub parse_package_metadata($) {
@@ -152,7 +212,9 @@ sub parse_package_metadata($) {
                        $src = $3;
                        $subdir =~ s/^package\///;
                        $subdir{$src} = $subdir;
-                       $srcpackage{$src} = [];
+                       $srcpackage{$src} = {
+                               packages => [],
+                       };
                        $override = "";
                        undef $pkg;
                };
@@ -161,10 +223,10 @@ sub parse_package_metadata($) {
                        $overrides{$src} = 1;
                };
                next unless $src;
-               next if $ignore{$src};
                /^Package:\s*(.+?)\s*$/ and do {
                        undef $feature;
                        $pkg = {};
+                       $pkg->{ignore} = $ignore{$src};
                        $pkg->{src} = $src;
                        $pkg->{makefile} = $makefile;
                        $pkg->{name} = $1;
@@ -177,7 +239,7 @@ sub parse_package_metadata($) {
                        $pkg->{tristate} = 1;
                        $pkg->{override} = $override;
                        $package{$1} = $pkg;
-                       push @{$srcpackage{$src}}, $pkg;
+                       push @{$srcpackage{$src}{packages}}, $pkg;
                };
                /^Feature:\s*(.+?)\s*$/ and do {
                        undef $pkg;
@@ -188,7 +250,7 @@ sub parse_package_metadata($) {
                $feature and do {
                        /^Target-Name:\s*(.+?)\s*$/ and do {
                                $features{$1} or $features{$1} = [];
-                               push @{$features{$1}}, $feature;
+                               push @{$features{$1}}, $feature unless $ignore{$src};
                        };
                        /^Target-Title:\s*(.+?)\s*$/ and $feature->{target_title} = $1;
                        /^Feature-Priority:\s*(\d+)\s*$/ and $feature->{priority} = $1;
@@ -255,12 +317,23 @@ sub parse_package_metadata($) {
                                $preconfig = {
                                        id => $1
                                };
-                               $preconfig{$pkgname}->{$1} = $preconfig;
+                               $preconfig{$pkgname}->{$1} = $preconfig unless $ignore{$src};
                        }
                };
                /^Preconfig-Type:\s*(.*?)\s*$/ and $preconfig->{type} = $1;
                /^Preconfig-Label:\s*(.*?)\s*$/ and $preconfig->{label} = $1;
                /^Preconfig-Default:\s*(.*?)\s*$/ and $preconfig->{default} = $1;
+               /^Require-User:\s*(.*?)\s*$/ and do {
+                       my @ugspecs = split /\s+/, $1;
+
+                       for my $ugspec (@ugspecs) {
+                               my @ugspec = split /:/, $ugspec, 2;
+                               parse_package_metadata_usergroup($makefile, "user", \%usernames, \%userids, $ugspec[0]) or return 0;
+                               if (@ugspec > 1) {
+                                       parse_package_metadata_usergroup($makefile, "group", \%groupnames, \%groupids, $ugspec[1]) or return 0;
+                               }
+                       }
+               };
        }
        close FILE;
        return 1;