Skip to content

Commit 582883a

Browse files
committed
sys-fs/zfs: add and enable 2.2.7 which is compatible with kernel 6.12
1 parent c9f9794 commit 582883a

File tree

4 files changed

+529
-0
lines changed

4 files changed

+529
-0
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
DIST zfs-2.1.15.tar.gz 35209038 BLAKE2B 61f9e14c54d43d1c51269917bb3ffde0530166126ea0467103ff1171dffc537315fd21c270d12f73d677e121b8094af39dd0a1fe3f80986bb42dc16d627dff52 SHA512 24096f2a6ecb3cc51f3d2f11cc69ad134d6fc33667007277c50cf798be2b19b6ddfa9be6923ca53d8b09f0bebae14c44d74811ec776e5aaf4ea0e810844c1f3d
22
DIST zfs-2.1.15.tar.gz.asc 836 BLAKE2B 897c05a8870cd0418493b42fe854ef5b28f9a31513ac262a25631089defa59190808b51bd31e43412b01171bcac0dff0608d417dfdacfeee0b0f067e0627d48f SHA512 a6c5a9d214070a220716075455eb1cb85a53fb20b5fe4319f112cde0653a25f87b66d0f0bcf0ca641e3ac38239759cb9df6ed7f4700056a2732cc8c1ccd9ce05
3+
DIST zfs-2.1.16.tar.gz 35187215 BLAKE2B 8bb90903f3747589fff94a810584de54d7f598b0aa9d0b364cc679779d401a9a76f6914cbfbdd007e2066f02230ed4cac4f3735830ea70eb3bcc449af8229c5d SHA512 68e62015e44eeb997166418bf769afa3e96c037a9282dcfd08a8f01d935fa48076483158f628d70b0aed258427510996d4c4ee7d2644ff561163c76f776635d2
4+
DIST zfs-2.1.16.tar.gz.asc 836 BLAKE2B b46614399ca63d9c88216c55bb2177cc0c28f4da2cb6be3ee361efca994309abff46fdf6ad6b0bad448c44e9e84ee40e2183d1b482e04844317f14744bab5c1f SHA512 d2d94a4e3ffe182e86fa3319cb9661688125f378ffa1e5768ee89033f796a1f52f877c382588fb1f434686e30bc4e65e3f08ceac0dd3dd7f8f751ba6182c3317
35
DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f SHA512 8e288620ce78fb235fa0c9929fc97150987a64091a8a5209209f1e0975d4d6213b8b307e32b3c89d934e83dc8468a1998b797fcdff5bbbbd023f07674877b0c6
46
DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef SHA512 0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060
57
DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2 SHA512 c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745
68
DIST zfs-2.2.6.tar.gz.asc 836 BLAKE2B db66f3e2e629ab8a344a8e0c2609bcbb98d69d110fc9e064760ee0c5c25cd67421a71764c4b65d7005e8ff66167bf24beb4be2560a47318eabffa888c1539f26 SHA512 d09f343b3acc3a81e96c069072cfb16d0b490ee77562f50e14524faf05560f9e1d1325ec4bc1760c86ed29186d5860d59646d4ea07385ee3b28d879f2374b9b4
9+
DIST zfs-2.2.7.tar.gz 33852602 BLAKE2B 31a066d5d543e3328d1afd065a8da4f9b4c52433d585cdbb41936900fd1453431585c6bc4b6e6d9a497a03e79969bae883e17cf4677099686feb3e32577d2777 SHA512 6493faa8e31d9c042c4e8f748d32cb9243212fdf4e0341c19568b47bcf302e60beb89940b80374610b71e1dca1ca5813f3efaddbf1a2453ceabb38381165b271
10+
DIST zfs-2.2.7.tar.gz.asc 836 BLAKE2B e8fc5e04f5b37a22c741bda46b4573e0cebe85da051c73cf3c5fc267de3c313399b235fc346ca06f4c22d37d2500044a26adb3ea241a65fbcf8760d0ef880039 SHA512 8d22a64c920c2a983429688a340f4ae281decdd30e465591e6b40af9f3016b8f168f4e8ea460600c832a2f46b383ff307986649a645585fb25c34fdfda75ad6e
711
DIST zfs-2.3.0-rc1.tar.gz 33887119 BLAKE2B dd4e159bef6de216cc51c1dd22620e6edb5b7503d95402022d0b9439471fe432181b1e5df2142e63cdac812a74b62657a96573b3bf48ad78bd6fd885a5f8913e SHA512 fe7de046dd48dbb67545726482a501788a1d5601e6e9a17deeb29047946689d9c8deb95f72b2b47c26a205a3c94fa1f0123437479a06b1376b9dac3dd6faf463
812
DIST zfs-2.3.0-rc1.tar.gz.asc 195 BLAKE2B f70e6223e94a3f79d6d685b2b06254fba845d79768c82b7a3fedb865b6e6c97499c497def0f4c3e4a2869fed88b0965650ae88d5eb72c0ffaed43c4479d3bf96 SHA512 26b395feaf03e2be20b75ef64e573aa98a0706c46a1eb57503925731bf0cb9bf7fef8a2cdcf163233bccd7da9f5aedc0cae73f0183f39e0f13dcf315b4a5d809
13+
DIST zfs-2.3.0-rc3.tar.gz 33897910 BLAKE2B 518e2c56130a71d4c35f27328184e882815e2ca5b0524e660e174176bee4fdc554e4d1c8264d71f84b6c9641c08088f96a5c35adb5ef6f21b814ccadf093a256 SHA512 1ac53d3a006580f4a32fa33dddd6600d8abac401ed9fc86a2950a8241e0a9dc4a8954a32c44b28b10f22ba7c5cbd8871d9f21c13ccc291c366e9745e83431723
14+
DIST zfs-2.3.0-rc3.tar.gz.asc 195 BLAKE2B 34685869cb8d4f911b3ce0a5098411ce4cb346310564b7ad5fbe9cfc50a3bbe7665c8daa36384b2d5f3ee1dad4b98d6d5bad5a6b8e2f45da35354428853f748d SHA512 1f32119b24c703dd5dbdcce63ddc97cd24f2052522cf1f2f9a4228691d0db7c136262d98b38f2d795a4edfce1d25b423c5bc4f65dbc008bd12f64acc24f3406e
Lines changed: 207 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,207 @@
1+
# Copyright 1999-2024 Gentoo Authors
2+
# Distributed under the terms of the GNU General Public License v2
3+
4+
EAPI=8
5+
6+
MODULES_INITRAMFS_IUSE=+initramfs
7+
inherit autotools flag-o-matic linux-mod-r1 multiprocessing
8+
9+
DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
10+
HOMEPAGE="https://github.com/openzfs/zfs"
11+
12+
MODULES_KERNEL_MAX=6.12
13+
MODULES_KERNEL_MIN=4.18
14+
15+
if [[ ${PV} == 9999 ]] ; then
16+
EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
17+
inherit git-r3
18+
unset MODULES_KERNEL_MAX
19+
else
20+
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
21+
inherit verify-sig
22+
23+
MY_PV=${PV/_rc/-rc}
24+
SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
25+
SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
26+
S="${WORKDIR}/zfs-${MY_PV}"
27+
28+
ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}"
29+
# Increments minor eg 5.14 -> 5.15, and still supports override.
30+
ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
31+
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
32+
33+
if [[ ${PV} != *_rc* ]] ; then
34+
KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~sparc"
35+
fi
36+
fi
37+
38+
LICENSE="CDDL MIT debug? ( GPL-2+ )"
39+
SLOT="0/${PVR}"
40+
IUSE="custom-cflags debug +rootfs"
41+
RESTRICT="test"
42+
43+
BDEPEND="
44+
app-alternatives/awk
45+
dev-lang/perl
46+
"
47+
48+
if [[ ${PV} != 9999 ]] ; then
49+
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
50+
51+
IUSE+=" +dist-kernel-cap"
52+
RDEPEND="
53+
dist-kernel-cap? ( dist-kernel? (
54+
<virtual/dist-kernel-${ZFS_KERNEL_DEP}
55+
) )
56+
"
57+
fi
58+
59+
# Used to suggest matching USE, but without suggesting to disable
60+
PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
61+
62+
PATCHES=(
63+
"${FILESDIR}"/${PN}-2.1.11-gentoo.patch
64+
)
65+
66+
pkg_pretend() {
67+
use rootfs || return 0
68+
}
69+
70+
pkg_setup() {
71+
local CONFIG_CHECK="
72+
EFI_PARTITION
73+
ZLIB_DEFLATE
74+
ZLIB_INFLATE
75+
!DEBUG_LOCK_ALLOC
76+
!PAX_KERNEXEC_PLUGIN_METHOD_OR
77+
"
78+
use debug && CONFIG_CHECK+="
79+
DEBUG_INFO
80+
FRAME_POINTER
81+
!DEBUG_INFO_REDUCED
82+
"
83+
use rootfs && CONFIG_CHECK+="
84+
BLK_DEV_INITRD
85+
DEVTMPFS
86+
"
87+
88+
kernel_is -lt 5 && CONFIG_CHECK+=" IOSCHED_NOOP"
89+
90+
if [[ ${PV} != 9999 ]] ; then
91+
local kv_major_max kv_minor_max zcompat
92+
zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
93+
kv_major_max="${zcompat%%.*}"
94+
zcompat="${zcompat#*.}"
95+
kv_minor_max="${zcompat%%.*}"
96+
kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
97+
"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
98+
fi
99+
100+
linux-mod-r1_pkg_setup
101+
}
102+
103+
src_prepare() {
104+
default
105+
106+
# Run unconditionally (bug #792627)
107+
eautoreconf
108+
109+
if [[ ${PV} != 9999 ]] ; then
110+
# Set module revision number
111+
sed -Ei "s/(Release:.*)1/\1${PR}-gentoo/" META || die
112+
fi
113+
}
114+
115+
src_configure() {
116+
use custom-cflags || strip-flags
117+
filter-ldflags -Wl,*
118+
119+
local myconf=(
120+
--bindir="${EPREFIX}"/bin
121+
--sbindir="${EPREFIX}"/sbin
122+
--with-config=kernel
123+
--with-linux="${KV_DIR}"
124+
--with-linux-obj="${KV_OUT_DIR}"
125+
$(use_enable debug)
126+
127+
# See gentoo.patch
128+
GENTOO_MAKEARGS_EVAL="${MODULES_MAKEARGS[*]@Q}"
129+
TEST_JOBS="$(makeopts_jobs)"
130+
)
131+
132+
econf "${myconf[@]}"
133+
}
134+
135+
src_compile() {
136+
emake "${MODULES_MAKEARGS[@]}"
137+
}
138+
139+
src_install() {
140+
emake "${MODULES_MAKEARGS[@]}" DESTDIR="${ED}" install
141+
modules_post_process
142+
143+
dodoc AUTHORS COPYRIGHT META README.md
144+
}
145+
146+
_old_layout_cleanup() {
147+
# new files are just extra/{spl,zfs}.ko with no subdirs.
148+
local olddir=(
149+
avl/zavl
150+
icp/icp
151+
lua/zlua
152+
nvpair/znvpair
153+
spl/spl
154+
unicode/zunicode
155+
zcommon/zcommon
156+
zfs/zfs
157+
zstd/zzstd
158+
)
159+
160+
# kernel/module/Kconfig contains possible compressed extentions.
161+
local kext kextfiles
162+
for kext in .ko{,.{gz,xz,zst}}; do
163+
kextfiles+=( "${olddir[@]/%/${kext}}" )
164+
done
165+
166+
local oldfile oldpath
167+
for oldfile in "${kextfiles[@]}"; do
168+
oldpath="${EROOT}/lib/modules/${KV_FULL}/extra/${oldfile}"
169+
if [[ -f "${oldpath}" ]]; then
170+
ewarn "Found obsolete zfs module ${oldfile} for current kernel ${KV_FULL}, removing."
171+
rm -rv "${oldpath}" || die
172+
# we do not remove non-empty directories just for safety in case there's something else.
173+
# also it may fail if there are both compressed and uncompressed modules installed.
174+
rmdir -v --ignore-fail-on-non-empty "${oldpath%/*.*}" || die
175+
fi
176+
done
177+
}
178+
179+
pkg_postinst() {
180+
# Check for old module layout before doing anything else.
181+
# only attempt layout cleanup if new .ko location is used.
182+
local newko=( "${EROOT}/lib/modules/${KV_FULL}/extra"/{zfs,spl}.ko* )
183+
# We check first array member, if glob above did not exand, it will be "zfs.ko*" and -f will return false.
184+
# if glob expanded -f will do correct file precense check.
185+
[[ -f ${newko[0]} ]] && _old_layout_cleanup
186+
187+
linux-mod-r1_pkg_postinst
188+
189+
if use x86 || use arm ; then
190+
ewarn "32-bit kernels will likely require increasing vmalloc to"
191+
ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
192+
fi
193+
194+
if has_version sys-boot/grub ; then
195+
ewarn "This version of OpenZFS includes support for new feature flags"
196+
ewarn "that are incompatible with previous versions. GRUB2 support for"
197+
ewarn "/boot with the new feature flags is not yet available."
198+
ewarn "Do *NOT* upgrade root pools to use the new feature flags."
199+
ewarn "Any new pools will be created with the new feature flags by default"
200+
ewarn "and will not be compatible with older versions of OpenZFS. To"
201+
ewarn "create a new pool that is backward compatible wih GRUB2, use "
202+
ewarn
203+
ewarn "zpool create -o compatibility=grub2 ..."
204+
ewarn
205+
ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features."
206+
fi
207+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
DIST zfs-2.1.15.tar.gz 35209038 BLAKE2B 61f9e14c54d43d1c51269917bb3ffde0530166126ea0467103ff1171dffc537315fd21c270d12f73d677e121b8094af39dd0a1fe3f80986bb42dc16d627dff52 SHA512 24096f2a6ecb3cc51f3d2f11cc69ad134d6fc33667007277c50cf798be2b19b6ddfa9be6923ca53d8b09f0bebae14c44d74811ec776e5aaf4ea0e810844c1f3d
22
DIST zfs-2.1.15.tar.gz.asc 836 BLAKE2B 897c05a8870cd0418493b42fe854ef5b28f9a31513ac262a25631089defa59190808b51bd31e43412b01171bcac0dff0608d417dfdacfeee0b0f067e0627d48f SHA512 a6c5a9d214070a220716075455eb1cb85a53fb20b5fe4319f112cde0653a25f87b66d0f0bcf0ca641e3ac38239759cb9df6ed7f4700056a2732cc8c1ccd9ce05
3+
DIST zfs-2.1.16.tar.gz 35187215 BLAKE2B 8bb90903f3747589fff94a810584de54d7f598b0aa9d0b364cc679779d401a9a76f6914cbfbdd007e2066f02230ed4cac4f3735830ea70eb3bcc449af8229c5d SHA512 68e62015e44eeb997166418bf769afa3e96c037a9282dcfd08a8f01d935fa48076483158f628d70b0aed258427510996d4c4ee7d2644ff561163c76f776635d2
4+
DIST zfs-2.1.16.tar.gz.asc 836 BLAKE2B b46614399ca63d9c88216c55bb2177cc0c28f4da2cb6be3ee361efca994309abff46fdf6ad6b0bad448c44e9e84ee40e2183d1b482e04844317f14744bab5c1f SHA512 d2d94a4e3ffe182e86fa3319cb9661688125f378ffa1e5768ee89033f796a1f52f877c382588fb1f434686e30bc4e65e3f08ceac0dd3dd7f8f751ba6182c3317
35
DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f SHA512 8e288620ce78fb235fa0c9929fc97150987a64091a8a5209209f1e0975d4d6213b8b307e32b3c89d934e83dc8468a1998b797fcdff5bbbbd023f07674877b0c6
46
DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef SHA512 0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060
57
DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2 SHA512 c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745
68
DIST zfs-2.2.6.tar.gz.asc 836 BLAKE2B db66f3e2e629ab8a344a8e0c2609bcbb98d69d110fc9e064760ee0c5c25cd67421a71764c4b65d7005e8ff66167bf24beb4be2560a47318eabffa888c1539f26 SHA512 d09f343b3acc3a81e96c069072cfb16d0b490ee77562f50e14524faf05560f9e1d1325ec4bc1760c86ed29186d5860d59646d4ea07385ee3b28d879f2374b9b4
9+
DIST zfs-2.2.7.tar.gz 33852602 BLAKE2B 31a066d5d543e3328d1afd065a8da4f9b4c52433d585cdbb41936900fd1453431585c6bc4b6e6d9a497a03e79969bae883e17cf4677099686feb3e32577d2777 SHA512 6493faa8e31d9c042c4e8f748d32cb9243212fdf4e0341c19568b47bcf302e60beb89940b80374610b71e1dca1ca5813f3efaddbf1a2453ceabb38381165b271
10+
DIST zfs-2.2.7.tar.gz.asc 836 BLAKE2B e8fc5e04f5b37a22c741bda46b4573e0cebe85da051c73cf3c5fc267de3c313399b235fc346ca06f4c22d37d2500044a26adb3ea241a65fbcf8760d0ef880039 SHA512 8d22a64c920c2a983429688a340f4ae281decdd30e465591e6b40af9f3016b8f168f4e8ea460600c832a2f46b383ff307986649a645585fb25c34fdfda75ad6e
711
DIST zfs-2.3.0-rc1.tar.gz 33887119 BLAKE2B dd4e159bef6de216cc51c1dd22620e6edb5b7503d95402022d0b9439471fe432181b1e5df2142e63cdac812a74b62657a96573b3bf48ad78bd6fd885a5f8913e SHA512 fe7de046dd48dbb67545726482a501788a1d5601e6e9a17deeb29047946689d9c8deb95f72b2b47c26a205a3c94fa1f0123437479a06b1376b9dac3dd6faf463
812
DIST zfs-2.3.0-rc1.tar.gz.asc 195 BLAKE2B f70e6223e94a3f79d6d685b2b06254fba845d79768c82b7a3fedb865b6e6c97499c497def0f4c3e4a2869fed88b0965650ae88d5eb72c0ffaed43c4479d3bf96 SHA512 26b395feaf03e2be20b75ef64e573aa98a0706c46a1eb57503925731bf0cb9bf7fef8a2cdcf163233bccd7da9f5aedc0cae73f0183f39e0f13dcf315b4a5d809
13+
DIST zfs-2.3.0-rc3.tar.gz 33897910 BLAKE2B 518e2c56130a71d4c35f27328184e882815e2ca5b0524e660e174176bee4fdc554e4d1c8264d71f84b6c9641c08088f96a5c35adb5ef6f21b814ccadf093a256 SHA512 1ac53d3a006580f4a32fa33dddd6600d8abac401ed9fc86a2950a8241e0a9dc4a8954a32c44b28b10f22ba7c5cbd8871d9f21c13ccc291c366e9745e83431723
14+
DIST zfs-2.3.0-rc3.tar.gz.asc 195 BLAKE2B 34685869cb8d4f911b3ce0a5098411ce4cb346310564b7ad5fbe9cfc50a3bbe7665c8daa36384b2d5f3ee1dad4b98d6d5bad5a6b8e2f45da35354428853f748d SHA512 1f32119b24c703dd5dbdcce63ddc97cd24f2052522cf1f2f9a4228691d0db7c136262d98b38f2d795a4edfce1d25b423c5bc4f65dbc008bd12f64acc24f3406e

0 commit comments

Comments
 (0)