]> xenbits.xensource.com Git - people/royger/osstest.git/commitdiff
osstest: move install of FreeBSD build deps to build-prep
authorRoger Pau Monne <roger.pau@citrix.com>
Fri, 29 Jun 2018 06:58:57 +0000 (08:58 +0200)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Mon, 2 Jul 2018 16:12:11 +0000 (17:12 +0100)
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
ts-build-prep-freebsd
ts-freebsd-build

index 1d78a3e134b83bd2fb14be0f5649fa61aefa0aa0..3999ed79cc39c15edeedc89e9405f32ea47196b2 100755 (executable)
@@ -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"});
 
index 5d82d809a52a33ace6529a43595731e63ed517fa..bdf666ebbd4cfd0d5bff7bd48d1b692f03e7ad76 100755 (executable)
@@ -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();