quine-global-labs/mirror-ublue-os-akmods
1
0
Fork 0
mirror of https://github.com/ublue-os/akmods.git synced 2026-11-03 23:09:54 -09:00
Code Issues Projects Releases Packages Wiki Activity

fix: ensure ZFS_MINOR_VERSION pin is respected (#436)

Browse source 
The ARG ZFS_MINOR_VERSION was too early in Containerfile, before the
last FROM statement before building ZFS kmod, thus it was ignored by
the RUN which built the kmod.

This moves it into the correct location and adds an echo to debug
what the provided version actually was.

Since zpools created on 2.4.0 can still be imported in 2.3.5
(verified in local testing), this will not only ensure we don't have
this occur again, but revert to 2.3.x for now.
This commit is contained in:
Benjamin Sherman 2025-12-22 13:11:28 -06:00 committed by GitHub
parent 5f700ced26
commit b61a7a2ad6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Containerfile.in
View file

@ -14,10 +14,6 @@ ARG CI=1
ARG KMOD_REPO_ARG
#endif /* NVIDIA */
#ifdef ZFS
ARG ZFS_MINOR_VERSION="2.3"
#endif /* ZFS */
# /*
# common copy/add
# */
@ -65,6 +61,10 @@ ARG CI=1
ARG KMOD_REPO_ARG
#endif /* NVIDIA */
#ifdef ZFS
ARG ZFS_MINOR_VERSION="2.3"
#endif /* ZFS */
#if defined COMMON
# /*
# common akmods

1
build_files/zfs/build-kmod-zfs.sh
View file

@ -11,6 +11,7 @@ cd /tmp
# Use cURL to fetch the given URL, saving the response to `data.json`
curl "https://api.github.com/repos/openzfs/zfs/releases" -o data.json
ZFS_VERSION=$(jq -r --arg ZMV "zfs-${ZFS_MINOR_VERSION}" '[ .[] | select(.prerelease==false and .draft==false) | select(.tag_name | startswith($ZMV))][0].tag_name' data.json|cut -f2- -d-)
echo "ZFS_MINOR_VERSION==$ZFS_MINOR_VERSION"
echo "ZFS_VERSION==$ZFS_VERSION"