commit:     1e166ae1a53eab002b1e4c5e81d60602a596dd88
Author:     Luke Schwager <luke <AT> blucobalt <DOT> dev>
AuthorDate: Wed Aug  7 07:26:28 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 20:41:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e166ae1

sys-fs/zfs-kmod: add 2.2.5

Signed-off-by: Luke Schwager <luke <AT> blucobalt.dev>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/zfs-kmod/Manifest              |   2 +
 sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild | 207 ++++++++++++++++++++++++++++++++++
 2 files changed, 209 insertions(+)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 6e4c6cbd42b2..99794d263e7a 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -8,3 +8,5 @@ DIST zfs-2.2.3.tar.gz 33854765 BLAKE2B 
f83439aa929609191a048dd326b2a15e0f57c72d2
 DIST zfs-2.2.3.tar.gz.asc 836 BLAKE2B 
86e1adc393d1f4643a6fd8c188b555e9dc0fdf7e25690f37ff0a04ff8826eb4fe3c125b54f0c5b9ab33f1daff43c4b44373ee9a4df506f6714f98d77782e6c3c
 SHA512 
fe23ddb9bde78416776411d66a56aa662fa051c8544b4be01ba238b8c1a85ccde1c55329f228fe8ab2681b54a4e4cb08d4e927c597c117242f0b536a40921dc9
 DIST zfs-2.2.4.tar.gz 33882933 BLAKE2B 
f0026a12b7c1252bf8941e39f23d3e165750034707dfddf034d8aac942a749cb7f0108478797ca978704a22743d9928240b29cf78fe89eda9f873f40102413f0
 SHA512 
1d17e30573d594fb5c9ea77cde104616dca362fed7530296816d1b55173594f66170fcfb23ab57c27074f85b79d3eb557b4ee9a1c420e507b2434a7902d8dcc1
 DIST zfs-2.2.4.tar.gz.asc 836 BLAKE2B 
7fde4232c25056eac2fae76abec4d6749c91d285d79ae6dce4ae4880fa90a26c9fb370dfa4daaf8a849f30fcc1b63eeb215444bfca724f6750bf7e4344f35fa7
 SHA512 
0cb3caf01b9e4d1f0c35d9f7933a4b11560b9bbf6c05494d8a1775b0a52ac1d642aebd77ef1c7b23a0a06f92e2b1ab3d8afacce41017eb07745d148af7f76a17
+DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B 
ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f
 SHA512 
8e288620ce78fb235fa0c9929fc97150987a64091a8a5209209f1e0975d4d6213b8b307e32b3c89d934e83dc8468a1998b797fcdff5bbbbd023f07674877b0c6
+DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B 
ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef
 SHA512 
0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
new file mode 100644
index 000000000000..bf0cdfe58be6
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_INITRAMFS_IUSE=+initramfs
+inherit autotools flag-o-matic linux-mod-r1 multiprocessing
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs";
+
+MODULES_KERNEL_MAX=6.9
+MODULES_KERNEL_MIN=3.10
+
+if [[ ${PV} == 9999 ]] ; then
+       EGIT_REPO_URI="https://github.com/openzfs/zfs.git";
+       inherit git-r3
+       unset MODULES_KERNEL_MAX
+else
+       VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+       inherit verify-sig
+
+       MY_PV=${PV/_rc/-rc}
+       
SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz";
+       SRC_URI+=" verify-sig? ( 
https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc
 )"
+       S="${WORKDIR}/zfs-${MY_PV}"
+
+       ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}"
+       # Increments minor eg 5.14 -> 5.15, and still supports override.
+       ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+       ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
+
+       if [[ ${PV} != *_rc* ]] ; then
+               KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+       fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+RESTRICT="test"
+
+BDEPEND="
+       app-alternatives/awk
+       dev-lang/perl
+"
+
+if [[ ${PV} != 9999 ]] ; then
+       BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+
+       IUSE+=" +dist-kernel-cap"
+       RDEPEND="
+               dist-kernel-cap? ( dist-kernel? (
+                       <virtual/dist-kernel-${ZFS_KERNEL_DEP}
+               ) )
+       "
+fi
+
+# Used to suggest matching USE, but without suggesting to disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-2.1.11-gentoo.patch
+)
+
+pkg_pretend() {
+       use rootfs || return 0
+}
+
+pkg_setup() {
+       local CONFIG_CHECK="
+               EFI_PARTITION
+               ZLIB_DEFLATE
+               ZLIB_INFLATE
+               !DEBUG_LOCK_ALLOC
+               !PAX_KERNEXEC_PLUGIN_METHOD_OR
+       "
+       use debug && CONFIG_CHECK+="
+               DEBUG_INFO
+               FRAME_POINTER
+               !DEBUG_INFO_REDUCED
+       "
+       use rootfs && CONFIG_CHECK+="
+               BLK_DEV_INITRD
+               DEVTMPFS
+       "
+
+       kernel_is -lt 5 && CONFIG_CHECK+=" IOSCHED_NOOP"
+
+       if [[ ${PV} != 9999 ]] ; then
+               local kv_major_max kv_minor_max zcompat
+               zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+               kv_major_max="${zcompat%%.*}"
+               zcompat="${zcompat#*.}"
+               kv_minor_max="${zcompat%%.*}"
+               kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
+                       "Linux ${kv_major_max}.${kv_minor_max} is the latest 
supported version"
+       fi
+
+       linux-mod-r1_pkg_setup
+}
+
+src_prepare() {
+       default
+
+       # Run unconditionally (bug #792627)
+       eautoreconf
+
+       if [[ ${PV} != 9999 ]] ; then
+               # Set module revision number
+               sed -Ei "s/(Release:.*)1/\1${PR}-gentoo/" META || die
+       fi
+}
+
+src_configure() {
+       use custom-cflags || strip-flags
+       filter-ldflags -Wl,*
+
+       local myconf=(
+               --bindir="${EPREFIX}"/bin
+               --sbindir="${EPREFIX}"/sbin
+               --with-config=kernel
+               --with-linux="${KV_DIR}"
+               --with-linux-obj="${KV_OUT_DIR}"
+               $(use_enable debug)
+
+               # See gentoo.patch
+               GENTOO_MAKEARGS_EVAL="${MODULES_MAKEARGS[*]@Q}"
+               TEST_JOBS="$(makeopts_jobs)"
+       )
+
+       econf "${myconf[@]}"
+}
+
+src_compile() {
+       emake "${MODULES_MAKEARGS[@]}"
+}
+
+src_install() {
+       emake "${MODULES_MAKEARGS[@]}" DESTDIR="${ED}" install
+       modules_post_process
+
+       dodoc AUTHORS COPYRIGHT META README.md
+}
+
+_old_layout_cleanup() {
+       # new files are just extra/{spl,zfs}.ko with no subdirs.
+       local olddir=(
+               avl/zavl
+               icp/icp
+               lua/zlua
+               nvpair/znvpair
+               spl/spl
+               unicode/zunicode
+               zcommon/zcommon
+               zfs/zfs
+               zstd/zzstd
+       )
+
+       # kernel/module/Kconfig contains possible compressed extentions.
+       local kext kextfiles
+               for kext in .ko{,.{gz,xz,zst}}; do
+               kextfiles+=( "${olddir[@]/%/${kext}}" )
+       done
+
+       local oldfile oldpath
+       for oldfile in "${kextfiles[@]}"; do
+               oldpath="${EROOT}/lib/modules/${KV_FULL}/extra/${oldfile}"
+               if [[ -f "${oldpath}" ]]; then
+                       ewarn "Found obsolete zfs module ${oldfile} for current 
kernel ${KV_FULL}, removing."
+                       rm -rv "${oldpath}" || die
+                       # we do not remove non-empty directories just for 
safety in case there's something else.
+                       # also it may fail if there are both compressed and 
uncompressed modules installed.
+                       rmdir -v --ignore-fail-on-non-empty "${oldpath%/*.*}" 
|| die
+               fi
+       done
+}
+
+pkg_postinst() {
+       # Check for old module layout before doing anything else.
+       # only attempt layout cleanup if new .ko location is used.
+       local newko=( "${EROOT}/lib/modules/${KV_FULL}/extra"/{zfs,spl}.ko* )
+       # We check first array member, if glob above did not exand, it will be 
"zfs.ko*" and -f will return false.
+       # if glob expanded -f will do correct file precense check.
+       [[ -f ${newko[0]} ]] && _old_layout_cleanup
+
+       linux-mod-r1_pkg_postinst
+
+       if use x86 || use arm ; then
+               ewarn "32-bit kernels will likely require increasing vmalloc to"
+               ewarn "at least 256M and decreasing zfs_arc_max to some value 
less than that."
+       fi
+
+       if has_version sys-boot/grub ; then
+               ewarn "This version of OpenZFS includes support for new feature 
flags"
+               ewarn "that are incompatible with previous versions. GRUB2 
support for"
+               ewarn "/boot with the new feature flags is not yet available."
+               ewarn "Do *NOT* upgrade root pools to use the new feature 
flags."
+               ewarn "Any new pools will be created with the new feature flags 
by default"
+               ewarn "and will not be compatible with older versions of 
OpenZFS. To"
+               ewarn "create a new pool that is backward compatible wih GRUB2, 
use "
+               ewarn
+               ewarn "zpool create -o compatibility=grub2 ..."
+               ewarn
+               ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list 
of features."
+       fi
+}

Reply via email to