From 8bf02d8edf7e8947a205e2dca77bee4c4e31739b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 6 Sep 2024 12:28:43 +0100
Subject: gentoo auto-resync : 06:09:2024 - 12:28:42

---
 sys-fs/zfs-kmod/Manifest              |   5 +-
 sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild | 207 ++++++++++++++++++++++++++++++++++
 sys-fs/zfs-kmod/zfs-kmod-9999.ebuild  |   2 +-
 3 files changed, 212 insertions(+), 2 deletions(-)
 create mode 100644 sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild

(limited to 'sys-fs/zfs-kmod')

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index b3ed75640062..f536f149f313 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -13,6 +13,8 @@ DIST zfs-2.2.4.tar.gz 33882933 BLAKE2B f0026a12b7c1252bf8941e39f23d3e16575003470
 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
+DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2 SHA512 c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745
+DIST zfs-2.2.6.tar.gz.asc 836 BLAKE2B db66f3e2e629ab8a344a8e0c2609bcbb98d69d110fc9e064760ee0c5c25cd67421a71764c4b65d7005e8ff66167bf24beb4be2560a47318eabffa888c1539f26 SHA512 d09f343b3acc3a81e96c069072cfb16d0b490ee77562f50e14524faf05560f9e1d1325ec4bc1760c86ed29186d5860d59646d4ea07385ee3b28d879f2374b9b4
 EBUILD zfs-kmod-2.1.14.ebuild 4188 BLAKE2B 44faf88962fa0f0cae02d9f171b66eb149dc602a4d9edce2993a33279ab9b3a2f330704e76b6295feffb2998f03830b81bf0157aa0430f1c5cac2fb971da5be1 SHA512 62c187ff630dc716187e3018914609f22a7031c5283d21a2f499f2481694270f32ebc62d8e4f97a5e04b723e8161fca6094ce8f142247d4351b1574372801c64
 EBUILD zfs-kmod-2.1.15.ebuild 4188 BLAKE2B 5c8a646f0a674f6caf6fb65bcd785af9eb26c47261e764242dcac865f5280c9b6c47ae1f971d8d428c4e712ed75cfd0085e9af302cf2dd2d0d1d1e6e44f1fa71 SHA512 bb60b68a6a9c12dc9064cc831742de64db9bb743134edc0b868f6394e85e39d067915d940580f95ec656d31e46e0771a8fd983fb157dae96e3c2bbbb33ec0901
 EBUILD zfs-kmod-2.2.2-r1.ebuild 5612 BLAKE2B def8f4448fdd20096a87f09ffaac4ad8bb7f9744770091bec5fad4cd711b2a8fda0f6b03437286a6b1b506f5b46ff4eb6cd16ca35537489d0bf58b03d57d73e2 SHA512 e08a7caf792a97a28f81587e2d5c9aba6b409b2c20e9b96417a93e48d3ec13969f71b9ccc7911aea5ca3f7b40ac4205dc0d13f0b0561492a1d2586e5f1cdcbca
@@ -20,5 +22,6 @@ EBUILD zfs-kmod-2.2.2.ebuild 5567 BLAKE2B 7c6a49a817d8429b7e7bb5bffb311df24bce87
 EBUILD zfs-kmod-2.2.3.ebuild 5523 BLAKE2B 562483c01237a9751705c1a60b4e4a696a3fac3c8da5daf28cd5c3563a654a23532ea833fae2ed5d22a112f21c6ade5c1568b86a4cdcbfeaad495404266de07a SHA512 ffeb010a6a45c4887f465df697e29d9f064ed517a8b468c6a46041953c0bf05d32fe75d46fcb76ee7fb3103023cd2020189389808aad6eff92176a903615fc74
 EBUILD zfs-kmod-2.2.4.ebuild 5523 BLAKE2B 971d928835ce11d70b4a6c00c189f9a00b3133bbdb929feb8f76d7f17a317b65492cc051253f2ceefbcec1896338e8cec41028c6cc93e82415ae28a124bb14f3 SHA512 4ea9a114999388025a02d7bad54e5fc695e09e44a4a0a691a0d0c968ccf10ba2360218b50001a46cfb3499c24828972651aa9431061ffc03e15154871ddf2661
 EBUILD zfs-kmod-2.2.5.ebuild 5525 BLAKE2B 80906b96f4eb457e77fdacfd2bbb6672921d65f506356fc9a72678420390fe71166bdea38d9360cf9ff971bb45b8b8b3f13659cf1ca22cd12ee7be845320e392 SHA512 4b8d6749f40558553df83013b67134cf5e5f878e054b996a2bfe6ed8511aacc496413ba49404eabfc9a9f352f4b608ec9a439165656e32e400734e4b5b8795b3
-EBUILD zfs-kmod-9999.ebuild 5526 BLAKE2B f16c47784002820b4aec958b3030babf26faabd65db5a59d21c06ca745f8d1fbf5b5e00527f26214e992f18870c3fa5d448c4fe50a0f5d9484844e958a78d899 SHA512 487cd0a8bdfe1a21744ee066862a29d8717facd31d5a6c840d10024fe7cfd12156b6279bc621def8973fbacad7034698380e93449fce1b26d3bde0869388056f
+EBUILD zfs-kmod-2.2.6.ebuild 5527 BLAKE2B adf536ab3827f6568fdd565c828e4ffc1baee7f2138642058c9d1265b3ab7c5b0dec68da365a85e0b95fbdd6ff8ecef55f522d65920e652ca17eec6eb4a72762 SHA512 76e8d5657b07c7258c1877bdd951346d97b9f23560bcadd449919a6929fec1dcf44e7df40a6f1376f5a5a92c0fecf78376c322fcad09ec59010758288905e15a
+EBUILD zfs-kmod-9999.ebuild 5527 BLAKE2B adf536ab3827f6568fdd565c828e4ffc1baee7f2138642058c9d1265b3ab7c5b0dec68da365a85e0b95fbdd6ff8ecef55f522d65920e652ca17eec6eb4a72762 SHA512 76e8d5657b07c7258c1877bdd951346d97b9f23560bcadd449919a6929fec1dcf44e7df40a6f1376f5a5a92c0fecf78376c322fcad09ec59010758288905e15a
 MISC metadata.xml 664 BLAKE2B 50e33d5791fd756ae4566052ecd6d8b1b395f8390b4cbc10c3b32bfc12f0a414f4080bf4102091f0920369f7999f2f94022fd526703ee8e73dc948c1f9d28432 SHA512 dca8e09500fe0e20f11b10df22a61ca36c99b6b3a08c465ea011d921b25f5891be3abaa5e6dbda1a52dbbfad69d1c8bf9fc69f71b3ef73cac428015641aa52d2
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild
new file mode 100644
index 000000000000..8f1c08d298b6
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.6.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.10
+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
+}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index bf0cdfe58be6..8f1c08d298b6 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -9,7 +9,7 @@ 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_MAX=6.10
 MODULES_KERNEL_MIN=3.10
 
 if [[ ${PV} == 9999 ]] ; then
-- 
cgit v1.2.3