From: Yann Dirson Date: Tue, 9 Jan 2024 11:16:20 +0000 (+0100) Subject: ci: use official package-installing scripts for freebsd X-Git-Tag: 0.4.0~12^2~1 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=88d4faf7764dc581700c5192b76cf85a450add95;p=xen-guest-agent.git 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 --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57a8a48..19cabf9 100644 --- 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 779f5ee..dc4461d 100644 --- 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]