From c39a070aa7d193d5f8a2f3748aff6c5040401c72 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Fri, 29 Jun 2018 08:58:57 +0200 Subject: [PATCH] osstest: move install of FreeBSD build deps to build-prep MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roger Pau Monné Acked-by: Ian Jackson --- ts-build-prep-freebsd | 6 ++++++ ts-freebsd-build | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ts-build-prep-freebsd b/ts-build-prep-freebsd index 1d78a3e..3999ed7 100755 --- a/ts-build-prep-freebsd +++ b/ts-build-prep-freebsd @@ -30,6 +30,12 @@ $whhost ||= 'host'; our $ho= selecthost($whhost); exit 0 if $ho->{SharedReady}; +sub install_deps () { + target_install_packages($ho, qw(git)); +} + +install_deps(); + our $path_prefix = $r{"freebsd_distpath"} || get_stashed("path_freebsddist", $r{"freebsdbuildjob"}); diff --git a/ts-freebsd-build b/ts-freebsd-build index 5d82d80..bdf666e 100755 --- a/ts-freebsd-build +++ b/ts-freebsd-build @@ -46,10 +46,6 @@ tsreadconfig(); selectbuildhost(\@ARGV); builddirsprops(); -sub install_deps () { - target_install_packages($ho, qw(git)); -} - sub checkout () { prepbuilddirs(); @@ -231,7 +227,6 @@ END store_runvar("path_freebsddist", "build/"); } -install_deps(); checkout(); build(); stash(); -- 2.39.5