X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=scripts%2Fmetadata.pm;h=dd62b4c04abfe8957f2077bf99b9a56d6e1139b3;hb=e84ee90b81193c506d3004cd62e2eec1596ff203;hp=defa7b9346ffa823c11482a30bded9ef05ff586e;hpb=a328633ffe6558e77dd19460b83b2b731e9bebdc;p=openwrt-10.03%2F.git diff --git a/scripts/metadata.pm b/scripts/metadata.pm index defa7b934..dd62b4c04 100644 --- a/scripts/metadata.pm +++ b/scripts/metadata.pm @@ -16,7 +16,6 @@ sub get_multiline { my $str; while (<$fh>) { last if /^@@/; - s/^\s*//g; $str .= (($_ and $prefix) ? $prefix . $_ : $_); } @@ -60,9 +59,11 @@ sub parse_package_metadata($) { $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; @@ -91,6 +92,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} = {};