From b2ab9c9d3360160c99ae4f396edb870b6884a995 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 6 Jan 2018 14:49:08 +0100
Subject: metadata: move 'builddepends' from binary to source packages

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---
 scripts/feeds | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'scripts/feeds')

diff --git a/scripts/feeds b/scripts/feeds
index 0228c7ac07..0a7e9317f8 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -525,15 +525,17 @@ sub install_package {
 	};
 
 	# install all dependencies referenced from the source package
-	foreach my $vpkg (@{$feed_src->{$src}{packages}}) {
-		foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}, @{$vpkg->{"builddepends/host"}}) {
-			next if $dep =~ /@/;
-			$dep =~ s/^\+//;
-			$dep =~ s/^.+://;
-			$dep =~ s/\/.+$//;
-			next unless $dep;
-			install_package($feed, $dep, 0) == 0 or $ret = 1;
-		}
+	foreach my $dep (
+		@{$feed_src->{$src}{builddepends}},
+		@{$feed_src->{$src}{"builddepends/host"}},
+		map { @{$_->{depends}} } @{$feed_src->{$src}{packages}}
+	) {
+		next if $dep =~ /@/;
+		$dep =~ s/^\+//;
+		$dep =~ s/^.+://;
+		$dep =~ s/\/.+$//;
+		next unless $dep;
+		install_package($feed, $dep, 0) == 0 or $ret = 1;
 	}
 
 	return $ret;
-- 
cgit v1.2.3