packaging: virtiofsd: Allow building a specific commit

Right now we've been only building releases from virtiofsd, but we'll
need to pin a specific commit till v1.14.0 is out, thus let's add the
needed machinery to do so.

Signed-off-by: Fabiano Fidêncio <fabiano@fidencio.org>
This commit is contained in:
Fabiano Fidêncio 2025-01-08 13:43:00 +01:00
parent f4a39e8c40
commit 0af3536328
2 changed files with 9 additions and 3 deletions

View File

@ -22,14 +22,19 @@ virtiofsd_zip="${virtiofsd_zip:-}"
[ -n "$virtiofsd_repo" ] || die "failed to get virtiofsd repo"
[ -n "$virtiofsd_version" ] || die "failed to get virtiofsd version"
[ -n "${virtiofsd_zip}" ] || die "failed to get virtiofsd binary URL"
[ -d "virtiofsd" ] && rm -r virtiofsd
pull_virtiofsd_released_binary() {
if [ -z "${virtiofsd_zip}" ]; then
info "failed to get virtiofsd binary URL"
return 1
fi
if [ "${ARCH}" != "x86_64" ]; then
info "Only x86_64 binaries are distributed as part of the virtiofsd releases" && return 1
fi
info "Download virtiofsd version: ${virtiofsd_version}"
mkdir -p virtiofsd
@ -48,9 +53,11 @@ build_virtiofsd_from_source() {
echo "build viriofsd from source"
. /etc/profile.d/rust.sh
git clone --depth 1 --branch ${virtiofsd_version} ${virtiofsd_repo} virtiofsd
git clone --depth 1 --branch main ${virtiofsd_repo} virtiofsd
pushd virtiofsd
git reset --hard ${virtiofsd_version}
export RUSTFLAGS='-C target-feature=+crt-static'${EXTRA_RUST_FLAGS}
export LIBSECCOMP_LINK_TYPE=static
export LIBSECCOMP_LIB_PATH=/usr/lib/${ARCH_LIBC}

View File

@ -31,7 +31,6 @@ package_output_dir="${package_output_dir:-}"
[ -n "${virtiofsd_repo}" ] || die "Failed to get virtiofsd repo"
[ -n "${virtiofsd_version}" ] || die "Failed to get virtiofsd version or commit"
[ -n "${virtiofsd_toolchain}" ] || die "Failed to get the rust toolchain to build virtiofsd"
[ -n "${virtiofsd_zip}" ] || die "Failed to get virtiofsd binary URL"
case ${ARCH} in
"aarch64")