X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=scripts%2Fmetadata.pm;h=dd62b4c04abfe8957f2077bf99b9a56d6e1139b3;hp=ff39e346ea98988b9def135cfb56219f0a3b6d5a;hb=7bd8115c7e653e6b6ed40f87bdcf67056803480a;hpb=97b61354626866dd2483c2a283ab9b2bc087ac74

diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index ff39e346ea..dd62b4c04a 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 . $_ : $_);
 	}
 
@@ -54,14 +53,17 @@ sub parse_package_metadata($) {
 			$srcpackage{$src} = [];
 			undef $pkg;
 		};
+		next unless $src;
 		/^Package:\s*(.+?)\s*$/ and do {
 			$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;
@@ -72,16 +74,26 @@ sub parse_package_metadata($) {
 		/^Menu: \s*(.+)\s*$/ and $pkg->{menu} = $1;
 		/^Submenu: \s*(.+)\s*$/ and $pkg->{submenu} = $1;
 		/^Submenu-Depends: \s*(.+)\s*$/ and $pkg->{submenudep} = $1;
+		/^Source: \s*(.+)\s*$/ and $pkg->{source} = $1;
 		/^Default: \s*(.+)\s*$/ and $pkg->{default} = $1;
 		/^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 ];
+		/^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} = {};
@@ -96,7 +108,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 +127,7 @@ sub parse_package_metadata($) {
 		/^Preconfig-Default:\s*(.*?)\s*$/ and $preconfig->{default} = $1;
 	}
 	close FILE;
-	return %category;
+	return 1;
 }
 
 1;