X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/074c4146b6cdac24db56c52b314753f9f7e52217..c291b847846f5921d669b17478cbf59f0c83ee19:/scripts/feeds?ds=inline

diff --git a/scripts/feeds b/scripts/feeds
index afb8fff29..b5abfc8ce 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -245,7 +245,7 @@ sub install_package {
 	$feed or do {
 		$installed{$name} and return 0;
 		# TODO: check if it's already installed within ./package directory
-		warn "WARNING: No feed for package '$name' found, maybe it's already part of the standard packages?\n";
+		$srcpackage{$name} or -d "./package/$name" or warn "WARNING: No feed for package '$name' found, maybe it's already part of the standard packages?\n";
 		return 0;
 	};
 
@@ -264,13 +264,6 @@ sub install_package {
 	# newly installed packages set the source package
 	$installed{$src} and return 0;
 
-	# install all dependencies
-	foreach my $dep (@{$pkg->{depends}}) {
-		next if $dep =~ /@/;
-		$dep =~ s/^\+//;
-		install_package($feed, $dep) == 0 or $ret = 1;
-	}
-
 	# check previously installed packages
 	$installed{$name} and return 0;
 	$installed{$src} = 1;
@@ -286,6 +279,15 @@ sub install_package {
 		return 1;
 	};
 
+	# install all dependencies
+	foreach my $vpkg (@{$srcpackage{$src}}) {
+		foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) {
+			next if $dep =~ /@/;
+			$dep =~ s/^\+//;
+			install_package($feed, $dep) == 0 or $ret = 1;
+		}
+	}
+
 	return $ret;
 }