odhcp6c: be less verbose by default, increase musl compatibility

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

diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index 8302728be6cd26a849d2e09acfe6a2892e355977..fc8657322e145c15fecebda4bfc309074286a88d 100644 (file)
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -64,8 +64,8 @@ sub parse_package_metadata($) {
                        $pkg->{makefile} = $makefile;
                        $pkg->{name} = $1;
                        $pkg->{title} = "";
-                       $pkg->{default} = "m if ALL";
                        $pkg->{depends} = [];
+                       $pkg->{mdepends} = [];
                        $pkg->{builddepends} = [];
                        $pkg->{buildtypes} = [];
                        $pkg->{subdir} = $subdir;
@@ -97,6 +97,8 @@ sub parse_package_metadata($) {
                /^Submenu: \s*(.+)\s*$/ and $pkg->{submenu} = $1;
                /^Submenu-Depends: \s*(.+)\s*$/ and $pkg->{submenudep} = $1;
                /^Source: \s*(.+)\s*$/ and $pkg->{source} = $1;
+               /^License: \s*(.+)\s*$/ and $pkg->{license} = $1;
+               /^LicenseFiles: \s*(.+)\s*$/ and $pkg->{licensefiles} = $1;
                /^Default: \s*(.+)\s*$/ and $pkg->{default} = $1;
                /^Provides: \s*(.+)\s*$/ and do {
                        my @vpkg = split /\s+/, $1;
@@ -111,11 +113,17 @@ sub parse_package_metadata($) {
                                push @{$package{$vpkg}->{vdepends}}, $pkg->{name};
                        }
                };
+               /^Menu-Depends: \s*(.+)\s*$/ and $pkg->{mdepends} = [ split /\s+/, $1 ];
                /^Depends: \s*(.+)\s*$/ and $pkg->{depends} = [ split /\s+/, $1 ];
+               /^Conflicts: \s*(.+)\s*$/ and $pkg->{conflicts} = [ split /\s+/, $1 ];
+               /^Hidden: \s*(.+)\s*$/ and $pkg->{hidden} = 1;
+               /^Build-Variant: \s*([\w\-]+)\s*/ and $pkg->{variant} = $1;
+               /^Default-Variant: .*/ and $pkg->{variant_default} = 1;
                /^Build-Only: \s*(.+)\s*$/ and $pkg->{buildonly} = 1;
                /^Build-Depends: \s*(.+)\s*$/ and $pkg->{builddepends} = [ split /\s+/, $1 ];
                /^Build-Depends\/(\w+): \s*(.+)\s*$/ and $pkg->{"builddepends/$1"} = [ split /\s+/, $2 ];
                /^Build-Types:\s*(.+)\s*$/ and $pkg->{buildtypes} = [ split /\s+/, $1 ];
+               /^Feed:\s*(.+?)\s*$/ and $pkg->{feed} = $1;
                /^Category: \s*(.+)\s*$/ and do {
                        $pkg->{category} = $1;
                        defined $category{$1} or $category{$1} = {};