ci: use official package-installing scripts for freebsd

Note that devscripts/freebsd-fetch-package.sh was written for the CI,
and never worked from Cross.toml.  Switch everything to the
slightly-improved-and-still-undocumented version of the scripts
shipped in the container itself.

Signed-off-by: Yann Dirson <yann.dirson@vates.fr>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57a8a489274a9b4c92131a491997c64abb532ea0..19cabf9381c656ae8c90162dab7055da14795122 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,8 +54,8 @@ variables:
     - ln -s ../include $CROSS_SYSROOT/usr/include
     - ln -s ../lib $CROSS_SYSROOT/usr/lib
     # build dependencies
-    - PKG=$(./devscripts/freebsd-fetch-package.sh xen-tools)
-    - tar -C $CROSS_SYSROOT/ --xform s,^/usr/local/,/usr/, -xf $PKG
+    - export FREEBSD_MIRROR=$(/freebsd-fetch-best-mirror.sh)
+    - (cd / && /freebsd-install-package.sh xen-tools)
 
 .cross-windows-build-template:
   extends:

diff --git a/Cross.toml b/Cross.toml
index 779f5ee3de273d63583744a1515b5608bff10829..dc4461d6b3c5c8aceb8c53ce6ecee4210c010a9c 100644 (file)
--- a/Cross.toml
+++ b/Cross.toml
@@ -5,8 +5,9 @@ pre-build = ["""
 mkdir -p /usr/local/x86_64-unknown-freebsd13/usr &&
 ln -s ../include /usr/local/x86_64-unknown-freebsd13/usr/include &&
 ln -s ../lib /usr/local/x86_64-unknown-freebsd13/usr/lib &&
-PKG=$(./devscripts/freebsd-fetch-package.sh xen-tools) &&
-tar -C /usr/local/x86_64-unknown-freebsd13/ --xform s,^/usr/local/,/usr/, -xf $PKG
+export FREEBSD_MIRROR=$(/freebsd-fetch-best-mirror.sh) &&
+/freebsd-setup-packagesite.sh &&
+/freebsd-install-package.sh xen-tools
 """]
 
 [target.aarch64-unknown-linux-gnu]