aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/feeds
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2018-01-06 14:49:08 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2018-01-13 19:54:43 +0100
commitb2ab9c9d3360160c99ae4f396edb870b6884a995 (patch)
treefb145884f69570abe9caff6ba71cd02e19bf7254 /scripts/feeds
parent39be6e7f19c917981365d75527fdd183c6b81ca8 (diff)
downloadupstream-b2ab9c9d3360160c99ae4f396edb870b6884a995.tar.gz
upstream-b2ab9c9d3360160c99ae4f396edb870b6884a995.tar.bz2
upstream-b2ab9c9d3360160c99ae4f396edb870b6884a995.zip
metadata: move 'builddepends' from binary to source packages
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'scripts/feeds')
-rwxr-xr-xscripts/feeds20
1 files changed, 11 insertions, 9 deletions
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;