From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 7 Sep 2010 21:10:43 +0000 (+0000)
Subject: [backfire] merge r22946
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=adec15d84220d751157042357963e773aa2429d7;p=10.03%2Fopenwrt.git

[backfire] merge r22946

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22969 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index d76a295ee..a0f056271 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -665,14 +665,15 @@ sub gen_package_mk() {
 					$dep = $1;
 					$suffix = $2;
 				}
-				my $pkg_dep = $package{$dep};
-				next unless $pkg_dep;
 
 				my $idx = "";
-				if (defined $pkg_dep->{src}) {
+				my $pkg_dep = $package{$dep};
+				if (defined($pkg_dep) && defined($pkg_dep->{src})) {
 					$idx = $pkg_dep->{subdir}.$pkg_dep->{src};
 				} elsif (defined($srcpackage{$dep})) {
 					$idx = $subdir{$dep}.$dep;
+				} else {
+					next;
 				}
 				my $depstr = "\$(curdir)/$idx$suffix/compile";
 				my $depline = get_conditional_dep($condition, $depstr);