X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6830e7b178b70a613b3864c09ddf6e9baf0aec31..2955026ec3ee93c3371af937732806c671ca9a45:/scripts/feeds

diff --git a/scripts/feeds b/scripts/feeds
index 4176c31f3..78e65ad1d 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -83,7 +83,7 @@ sub update_link($$) {
 	my $name = shift;
 	my $src = abs_path(shift);
 
-	system("ln -sf $src ./feeds/$name");
+	system("rm -f ./feeds/$name; ln -s $src ./feeds/$name");
 
 	return 0;
 }
@@ -104,9 +104,15 @@ sub update_git($$) {
 
 sub get_feed($) {
 	my $feed = shift;
+	my $file = "./feeds/$feed.index";
 
 	clear_packages();
-	parse_package_metadata("./feeds/$feed.index") or return;
+
+	-f $file or do {
+		print "Ignoring feed '$feed' - index missing\n";
+		return;
+	};
+	parse_package_metadata($file) or return;
 	return { %package };
 }
 
@@ -258,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;
@@ -280,6 +279,13 @@ sub install_package {
 		return 1;
 	};
 
+	# install all dependencies
+	foreach my $dep (@{$pkg->{depends}}, @{$pkg->{builddepends}}) {
+		next if $dep =~ /@/;
+		$dep =~ s/^\+//;
+		install_package($feed, $dep) == 0 or $ret = 1;
+	}
+
 	return $ret;
 }