fix potential inconsistencies in toolchain selection on linux 2.4

[openwrt.git] / scripts / metadata.pm

diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index defa7b9..8302728 100644 (file)
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -2,13 +2,14 @@ package metadata;
 use base 'Exporter';
 use strict;
 use warnings;
-our @EXPORT = qw(%package %srcpackage %category %subdir %preconfig clear_packages parse_package_metadata get_multiline);
+our @EXPORT = qw(%package %srcpackage %category %subdir %preconfig %features clear_packages parse_package_metadata get_multiline);
 
 our %package;
 our %preconfig;
 our %srcpackage;
 our %category;
 our %subdir;
+our %features;
 
 sub get_multiline {
        my $fh = shift;
@@ -16,7 +17,6 @@ sub get_multiline {
        my $str;
        while (<$fh>) {
                last if /^@@/;
-               s/^\s*//g;
                $str .= (($_ and $prefix) ? $prefix . $_ : $_);
        }
 
@@ -29,11 +29,13 @@ sub clear_packages() {
        %package = ();
        %srcpackage = ();
        %category = ();
+       %features = ();
 }
 
 sub parse_package_metadata($) {
        my $file = shift;
        my $pkg;
+       my $feature;
        my $makefile;
        my $preconfig;
        my $subdir;
@@ -56,18 +58,39 @@ sub parse_package_metadata($) {
                };
                next unless $src;
                /^Package:\s*(.+?)\s*$/ and do {
+                       undef $feature;
                        $pkg = {};
                        $pkg->{src} = $src;
                        $pkg->{makefile} = $makefile;
                        $pkg->{name} = $1;
+                       $pkg->{title} = "";
                        $pkg->{default} = "m if ALL";
                        $pkg->{depends} = [];
                        $pkg->{builddepends} = [];
+                       $pkg->{buildtypes} = [];
                        $pkg->{subdir} = $subdir;
                        $pkg->{tristate} = 1;
                        $package{$1} = $pkg;
                        push @{$srcpackage{$src}}, $pkg;
                };
+               /^Feature:\s*(.+?)\s*$/ and do {
+                       undef $pkg;
+                       $feature = {};
+                       $feature->{name} = $1;
+                       $feature->{priority} = 0;
+               };
+               $feature and do {
+                       /^Target-Name:\s*(.+?)\s*$/ and do {
+                               $features{$1} or $features{$1} = [];
+                               push @{$features{$1}}, $feature;
+                       };
+                       /^Target-Title:\s*(.+?)\s*$/ and $feature->{target_title} = $1;
+                       /^Feature-Priority:\s*(\d+)\s*$/ and $feature->{priority} = $1;
+                       /^Feature-Name:\s*(.+?)\s*$/ and $feature->{title} = $1;
+                       /^Feature-Description:/ and $feature->{description} = get_multiline(\*FILE, "\t\t\t");
+                       next;
+               };
+               next unless $pkg;
                /^Version: \s*(.+)\s*$/ and $pkg->{version} = $1;
                /^Title: \s*(.+)\s*$/ and $pkg->{title} = $1;
                /^Menu: \s*(.+)\s*$/ and $pkg->{menu} = $1;
@@ -91,6 +114,8 @@ sub parse_package_metadata($) {
                /^Depends: \s*(.+)\s*$/ and $pkg->{depends} = [ split /\s+/, $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 ];
                /^Category: \s*(.+)\s*$/ and do {
                        $pkg->{category} = $1;
                        defined $category{$1} or $category{$1} = {};