X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fmetadata.pm;h=9486c66cb315960ccaa9f46f6910ba4930106b64;hb=7a87e1cc8fc9c0e6414a9bdc261a37f3fc49a65d;hp=ff39e346ea98988b9def135cfb56219f0a3b6d5a;hpb=dda0649ef37ceb08df09c0dbc15f27cbdc8285d5;p=openwrt.git diff --git a/scripts/metadata.pm b/scripts/metadata.pm index ff39e346ea..9486c66cb3 100644 --- a/scripts/metadata.pm +++ b/scripts/metadata.pm @@ -54,6 +54,7 @@ sub parse_package_metadata($) { $srcpackage{$src} = []; undef $pkg; }; + next unless $src; /^Package:\s*(.+?)\s*$/ and do { $pkg = {}; $pkg->{src} = $src; @@ -76,11 +77,18 @@ sub parse_package_metadata($) { /^Provides: \s*(.+)\s*$/ and do { my @vpkg = split /\s+/, $1; foreach my $vpkg (@vpkg) { - $package{$vpkg} or $package{$vpkg} = { vdepends => [] }; + $package{$vpkg} or $package{$vpkg} = { + name => $vpkg, + vdepends => [], + src => $src, + subdir => $subdir, + makefile => $makefile + }; push @{$package{$vpkg}->{vdepends}}, $pkg->{name}; } }; /^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 ]; /^Category: \s*(.+)\s*$/ and do { $pkg->{category} = $1; @@ -96,7 +104,7 @@ sub parse_package_metadata($) { $type =~ /ipkg/ and $pkg->{tristate} = 1; } }; - /^Config: \s*(.*)\s*$/ and $pkg->{config} = "$1\n".get_multiline(*FILE); + /^Config: \s*(.*)\s*$/ and $pkg->{config} = "$1\n".get_multiline(*FILE, "\t"); /^Prereq-Check:/ and $pkg->{prereq} = 1; /^Preconfig:\s*(.+)\s*$/ and do { my $pkgname = $pkg->{name}; @@ -115,7 +123,7 @@ sub parse_package_metadata($) { /^Preconfig-Default:\s*(.*?)\s*$/ and $preconfig->{default} = $1; } close FILE; - return %category; + return 1; } 1;