subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sys\-fs\/zfs\-kmod\/"

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2024-05-17 Thread Andrew Ammerlaan

commit: 0ef34366cbc67e4796f07dbc8b7433d20af8fc22
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed May  8 06:05:49 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri May 17 12:06:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef34366

sys-fs/zfs-kmod: add USE=initramfs, and enable by default

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild   | 16 +++-
 sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild   | 14 ++
 sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild | 14 ++
 sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild| 14 ++
 sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild| 14 ++
 sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild| 14 ++
 sys-fs/zfs-kmod/zfs-kmod-.ebuild | 14 ++
 7 files changed, 15 insertions(+), 85 deletions(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild
index c698d195b168..5b5d9f647ee9 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools dist-kernel-utils flag-o-matic linux-mod-r1 multiprocessing
+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;
@@ -64,13 +65,6 @@ PATCHES=(
 
 pkg_pretend() {
use rootfs || return 0
-
-   if has_version virtual/dist-kernel && ! use dist-kernel; then
-   ewarn "You have virtual/dist-kernel installed, but"
-   ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
-   ewarn "It's recommended to globally enable dist-kernel USE flag"
-   ewarn "to auto-trigger initrd rebuilds with kernel updates"
-   fi
 }
 
 pkg_setup() {
@@ -152,10 +146,6 @@ src_install() {
 pkg_postinst() {
linux-mod-r1_pkg_postinst
 
-   if [[ -z ${ROOT} ]] && use dist-kernel ; then
-   dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-   fi
-
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."

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild
index dd1431d2a81b..e449fc9b7e0a 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit autotools dist-kernel-utils flag-o-matic linux-mod-r1 multiprocessing
+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;
@@ -64,13 +65,6 @@ PATCHES=(
 
 pkg_pretend() {
use rootfs || return 0
-
-   if has_version virtual/dist-kernel && ! use dist-kernel; then
-   ewarn "You have virtual/dist-kernel installed, but"
-   ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
-   ewarn "It's recommended to globally enable dist-kernel USE flag"
-   ewarn "to auto-trigger initrd rebuilds with kernel updates"
-   fi
 }
 
 pkg_setup() {
@@ -152,10 +146,6 @@ src_install() {
 pkg_postinst() {
linux-mod-r1_pkg_postinst
 
-   if [[ -z ${ROOT} ]] && use dist-kernel ; then
-   dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-   fi
-
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."

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild
index 7b28bf3a94ab..6f4cf5107e3f 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit autotools dist-kernel-utils flag-o-matic linux-mod-r1 multiprocessing
+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;
@@ -66,13 +67,6 @@ PATCHES=(
 
 pkg_pretend() {
use rootfs || return 0
-
-   if has_version virtual/dist-kernel && ! use dist-kernel; then
-   ewarn "You have virtual/dist-kernel installed, but"
-   ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
-   ewarn "It's recommended to globally enable dist-kernel USE flag"
-   ewarn "to auto-trigger initrd rebuilds with kernel updates"
-   fi
 }
 
 pkg_setup() {
@@ -194,10 +188,6

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2024-05-10 Thread Sam James

commit: faf4ddbf6747768297472076ac83a00667143667
Author: Sam James  gentoo  org>
AuthorDate: Sat May 11 02:02:29 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 11 02:02:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faf4ddbf

sys-fs/zfs-kmod: Stabilize 2.2.3 ppc64, #931699

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild
index 16e8e505538b..9053d8c85332 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2024-05-10 Thread Sam James

commit: 4b3c0c5dbbd97043ca7c22f716ebc44e01ae8871
Author: Sam James  gentoo  org>
AuthorDate: Sat May 11 02:02:22 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 11 02:02:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3c0c5d

sys-fs/zfs-kmod: Stabilize 2.2.3 amd64, #931699

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild
index e2c8f5dfec1b..862e41c9aae6 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2024-05-10 Thread Sam James

commit: 49a6bd0e1381d7a2ea389e60886c0aba7782e4f9
Author: Sam James  gentoo  org>
AuthorDate: Sat May 11 02:02:14 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 11 02:02:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a6bd0e

sys-fs/zfs-kmod: Stabilize 2.1.15 arm64, #931698

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild
index 233c724c9de5..2853779be6c9 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2024-05-10 Thread Sam James

commit: 78b3a44b67d2a8f08b6bfdf0267f9cacc81a5828
Author: Sam James  gentoo  org>
AuthorDate: Sat May 11 02:02:26 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 11 02:02:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b3a44b

sys-fs/zfs-kmod: Stabilize 2.2.3 arm64, #931699

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild
index 862e41c9aae6..16e8e505538b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2024-05-10 Thread Sam James

commit: ba81fc42fd3a77abbf7ca3bbbe00f78bae3f814a
Author: Sam James  gentoo  org>
AuthorDate: Sat May 11 02:02:18 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 11 02:02:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba81fc42

sys-fs/zfs-kmod: Stabilize 2.1.15 ppc64, #931698

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild
index 2853779be6c9..dd1431d2a81b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2024-05-10 Thread Sam James

commit: 7a9524f7f26b8f55ab6f7f8a602cda87d8aefd23
Author: Sam James  gentoo  org>
AuthorDate: Sat May 11 02:02:11 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 11 02:02:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a9524f7

sys-fs/zfs-kmod: Stabilize 2.1.15 amd64, #931698

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild
index 91038f073b54..233c724c9de5 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2024-05-02 Thread Sam James

commit: 33c9e9ebd07e6d158e6064a267db3876f3a1f130
Author: Sam James  gentoo  org>
AuthorDate: Fri May  3 04:52:30 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  3 04:53:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33c9e9eb

sys-fs/zfs-kmod: add 2.2.4

This release contains a fix for https://github.com/openzfs/zfs/issues/15933.

Closes: https://bugs.gentoo.org/928518
Bug: https://bugs.gentoo.org/815469
Bug: https://bugs.gentoo.org/917224
Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest  |   2 +
 sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild | 217 ++
 2 files changed, 219 insertions(+)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index b1d0e6ec325b..6e4c6cbd42b2 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -6,3 +6,5 @@ DIST zfs-2.2.2.tar.gz 33816541 BLAKE2B 
f0619ae42d898d18077096217d0a9ddd7c7378424
 DIST zfs-2.2.2.tar.gz.asc 836 BLAKE2B 
bdc86492b2bf45d329e34e89ea7796f5cbf518d32ab114c909321b1d0d8040b9ce4e25b3b85fcbc5ea62ee10a2d716b5b27e37c2c005b307c0b593815c49d625
 SHA512 
110be1aa90f4749106717165a3cb5116379e2d170146a2b3d2601f04212450da9327e028d6e1e5de7f8a46c6bb7a15e2bcdd09e3e760590fbc695f9562f1440b
 DIST zfs-2.2.3.tar.gz 33854765 BLAKE2B 
f83439aa929609191a048dd326b2a15e0f57c72d2901cbfb205b81a29aa42dab49b42eb61647ca3eaed17518b8c907e81343364bfecf83ed441271648f8efd4b
 SHA512 
e6c3df531a33f4bd198429e61b7630f1e965a03fd60d1b847bdf0d55c6d2af3abc38b5e8a63aa9ef9f969cc7eca36cb24a7641f6fb8c41ef2fa024d76cd28f3d
 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

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
new file mode 100644
index ..fe2cc8b18efb
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils 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.8
+MODULES_KERNEL_MIN=3.10
+
+if [[ ${PV} ==  ]] ; 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} !=  ]] ; then
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+
+   IUSE+=" +dist-kernel-cap"
+   RDEPEND="
+   dist-kernel-cap? ( dist-kernel? (
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2024-05-02 Thread Sam James

commit: 27d7bbb25f1246b5ca554c4d8f476b2f036fa69c
Author: Sam James  gentoo  org>
AuthorDate: Fri May  3 04:46:27 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  3 04:53:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27d7bbb2

sys-fs/zfs-kmod:  supports 6.8

Closes: https://bugs.gentoo.org/930986
Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index e2c8f5dfec1b..fe2cc8b18efb 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -8,7 +8,7 @@ inherit autotools dist-kernel-utils 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.7
+MODULES_KERNEL_MAX=6.8
 MODULES_KERNEL_MIN=3.10
 
 if [[ ${PV} ==  ]] ; then

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2024-02-29 Thread Sam James

commit: 0fc4ace796721796bc8befecb7e72a7fec8e0b44
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 29 08:18:14 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 29 08:18:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fc4ace7

sys-fs/zfs-kmod: add 2.1.15

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest   |   2 +
 sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild | 177 +
 2 files changed, 179 insertions(+)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 15f09f09fd54..b1d0e6ec325b 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,5 +1,7 @@
 DIST zfs-2.1.14.tar.gz 35167471 BLAKE2B 
a7b22eaf05e4fbf416ebe4d7b884c515942fc9375c1dd322cefa00c19c550b9318a4192d6a909d49d58523c8f1a6eaf00189dd58e6543fae17cf8cc35042f469
 SHA512 
4a65c8b7d5576fa2dcc14e7ccaa93191c1d3791479cf89bd02c2bd04434ff5e93709b328796d4f9ba93da19f12772e359df373f40919350a3e1e4c52758b47c8
 DIST zfs-2.1.14.tar.gz.asc 836 BLAKE2B 
f01bc58bf6c3d367c494ed4ea9f3fb1141f3aafdbf4f913b9e0d60d31557076d5ae0e25ca93b013f5fd85e21ba5ae9f61e1a03af54bb0c743869c0ce3d5519df
 SHA512 
be0f386cce952b4047dc2448e356078668e8d4392802dd3bb1a426741f15f4d9fb689cd1cb09972bdbc9fe2e4e782ec4b4754fe811c5657bc1f5308bd38e3926
+DIST zfs-2.1.15.tar.gz 35209038 BLAKE2B 
61f9e14c54d43d1c51269917bb3ffde0530166126ea0467103ff1171dffc537315fd21c270d12f73d677e121b8094af39dd0a1fe3f80986bb42dc16d627dff52
 SHA512 
24096f2a6ecb3cc51f3d2f11cc69ad134d6fc33667007277c50cf798be2b19b6ddfa9be6923ca53d8b09f0bebae14c44d74811ec776e5aaf4ea0e810844c1f3d
+DIST zfs-2.1.15.tar.gz.asc 836 BLAKE2B 
897c05a8870cd0418493b42fe854ef5b28f9a31513ac262a25631089defa59190808b51bd31e43412b01171bcac0dff0608d417dfdacfeee0b0f067e0627d48f
 SHA512 
a6c5a9d214070a220716075455eb1cb85a53fb20b5fe4319f112cde0653a25f87b66d0f0bcf0ca641e3ac38239759cb9df6ed7f4700056a2732cc8c1ccd9ce05
 DIST zfs-2.2.2.tar.gz 33816541 BLAKE2B 
f0619ae42d898d18077096217d0a9ddd7c7378424707aa51d3645661b2889a1459bc4a5e9fe42b6860b2d26e4600da35765b0e741725dafacc2ead2370cad866
 SHA512 
bba252cbf7986f2cce154dd18a34aa478cf98f70106337188dc894de2446d60a58fa643706927757d1787506b44d4ff404897a2d0e16aacb0a7bf27765703332
 DIST zfs-2.2.2.tar.gz.asc 836 BLAKE2B 
bdc86492b2bf45d329e34e89ea7796f5cbf518d32ab114c909321b1d0d8040b9ce4e25b3b85fcbc5ea62ee10a2d716b5b27e37c2c005b307c0b593815c49d625
 SHA512 
110be1aa90f4749106717165a3cb5116379e2d170146a2b3d2601f04212450da9327e028d6e1e5de7f8a46c6bb7a15e2bcdd09e3e760590fbc695f9562f1440b
 DIST zfs-2.2.3.tar.gz 33854765 BLAKE2B 
f83439aa929609191a048dd326b2a15e0f57c72d2901cbfb205b81a29aa42dab49b42eb61647ca3eaed17518b8c907e81343364bfecf83ed441271648f8efd4b
 SHA512 
e6c3df531a33f4bd198429e61b7630f1e965a03fd60d1b847bdf0d55c6d2af3abc38b5e8a63aa9ef9f969cc7eca36cb24a7641f6fb8c41ef2fa024d76cd28f3d

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild
new file mode 100644
index ..91038f073b54
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils 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.7
+MODULES_KERNEL_MIN=3.10
+
+if [[ ${PV} ==  ]] ; 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-${PV%_rc?}"
+
+   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 ~ppc64 ~riscv ~sparc"
+   fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+RESTRICT="test"
+
+BDEPEND="
+   dev-lang/perl
+   app-alternatives/awk
+"
+
+if [[ ${PV} !=  ]] ; then
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+
+   IUSE+=" +dist-kernel-cap"
+   RDEPEND="
+   dist-kernel-cap? ( dist-kernel? (
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2024-02-22 Thread Sam James

commit: 9a367cc6d29a7b1b70cdf6072ca6fd1d6a21b6f8
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 23 05:04:15 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 23 06:29:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a367cc6

sys-fs/zfs-kmod: add 2.2.3

Bug: https://bugs.gentoo.org/925290
Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest| 2 ++
 sys-fs/zfs-kmod/{zfs-kmod-.ebuild => zfs-kmod-2.2.3.ebuild} | 4 ++--
 sys-fs/zfs-kmod/zfs-kmod-.ebuild| 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 4591d964e4e4..15f09f09fd54 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -2,3 +2,5 @@ DIST zfs-2.1.14.tar.gz 35167471 BLAKE2B 
a7b22eaf05e4fbf416ebe4d7b884c515942fc937
 DIST zfs-2.1.14.tar.gz.asc 836 BLAKE2B 
f01bc58bf6c3d367c494ed4ea9f3fb1141f3aafdbf4f913b9e0d60d31557076d5ae0e25ca93b013f5fd85e21ba5ae9f61e1a03af54bb0c743869c0ce3d5519df
 SHA512 
be0f386cce952b4047dc2448e356078668e8d4392802dd3bb1a426741f15f4d9fb689cd1cb09972bdbc9fe2e4e782ec4b4754fe811c5657bc1f5308bd38e3926
 DIST zfs-2.2.2.tar.gz 33816541 BLAKE2B 
f0619ae42d898d18077096217d0a9ddd7c7378424707aa51d3645661b2889a1459bc4a5e9fe42b6860b2d26e4600da35765b0e741725dafacc2ead2370cad866
 SHA512 
bba252cbf7986f2cce154dd18a34aa478cf98f70106337188dc894de2446d60a58fa643706927757d1787506b44d4ff404897a2d0e16aacb0a7bf27765703332
 DIST zfs-2.2.2.tar.gz.asc 836 BLAKE2B 
bdc86492b2bf45d329e34e89ea7796f5cbf518d32ab114c909321b1d0d8040b9ce4e25b3b85fcbc5ea62ee10a2d716b5b27e37c2c005b307c0b593815c49d625
 SHA512 
110be1aa90f4749106717165a3cb5116379e2d170146a2b3d2601f04212450da9327e028d6e1e5de7f8a46c6bb7a15e2bcdd09e3e760590fbc695f9562f1440b
+DIST zfs-2.2.3.tar.gz 33854765 BLAKE2B 
f83439aa929609191a048dd326b2a15e0f57c72d2901cbfb205b81a29aa42dab49b42eb61647ca3eaed17518b8c907e81343364bfecf83ed441271648f8efd4b
 SHA512 
e6c3df531a33f4bd198429e61b7630f1e965a03fd60d1b847bdf0d55c6d2af3abc38b5e8a63aa9ef9f969cc7eca36cb24a7641f6fb8c41ef2fa024d76cd28f3d
+DIST zfs-2.2.3.tar.gz.asc 836 BLAKE2B 
86e1adc393d1f4643a6fd8c188b555e9dc0fdf7e25690f37ff0a04ff8826eb4fe3c125b54f0c5b9ab33f1daff43c4b44373ee9a4df506f6714f98d77782e6c3c
 SHA512 
fe23ddb9bde78416776411d66a56aa662fa051c8544b4be01ba238b8c1a85ccde1c55329f228fe8ab2681b54a4e4cb08d4e927c597c117242f0b536a40921dc9

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild
similarity index 98%
copy from sys-fs/zfs-kmod/zfs-kmod-.ebuild
copy to sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild
index 940666b38c47..e2c8f5dfec1b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit autotools dist-kernel-utils 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.6
+MODULES_KERNEL_MAX=6.7
 MODULES_KERNEL_MIN=3.10
 
 if [[ ${PV} ==  ]] ; then

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index 940666b38c47..e2c8f5dfec1b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit autotools dist-kernel-utils 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.6
+MODULES_KERNEL_MAX=6.7
 MODULES_KERNEL_MIN=3.10
 
 if [[ ${PV} ==  ]] ; then

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/, sys-fs/zfs-kmod/files/

2024-02-05 Thread Sam James

commit: 41c60e94beea46d932ae78fb7dd388ca6c9a3924
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 01:50:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 01:50:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41c60e94

sys-fs/zfs-kmod: backport autotrim CPU fix

Closes: https://bugs.gentoo.org/923745
Signed-off-by: Sam James  gentoo.org>

 .../zfs-kmod/files/zfs-kmod-2.2.2-autotrim.patch   |  31 +++
 sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild   | 219 +
 2 files changed, 250 insertions(+)

diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-2.2.2-autotrim.patch 
b/sys-fs/zfs-kmod/files/zfs-kmod-2.2.2-autotrim.patch
new file mode 100644
index ..6d72389fdb25
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-2.2.2-autotrim.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/923745
+https://github.com/openzfs/zfs/issues/15453
+https://github.com/openzfs/zfs/pull/15781
+https://github.com/openzfs/zfs/pull/15789
+
+From a0aa7a2ee3b56d7b6d69c2081034ec8293a6d605 Mon Sep 17 00:00:00 2001
+From: Kevin Jin <33590050+jxdk...@users.noreply.github.com>
+Date: Wed, 17 Jan 2024 12:03:58 -0500
+Subject: [PATCH] Autotrim High Load Average Fix
+
+Switch from cv_wait() to cv_wait_idle() in vdev_autotrim_wait_kick(),
+which should mitigate the high load average while waiting.
+
+Reviewed-by: Brian Atkinson 
+Reviewed-by: Brian Behlendorf 
+Reviewed-by: Alexander Motin 
+Signed-off-by: jxdking 
+Closes #15781
+--- a/module/zfs/vdev_trim.c
 b/module/zfs/vdev_trim.c
+@@ -194,7 +194,8 @@ vdev_autotrim_wait_kick(vdev_t *vd, int num_of_kick)
+   for (int i = 0; i < num_of_kick; i++) {
+   if (vd->vdev_autotrim_exit_wanted)
+   break;
+-  cv_wait(>vdev_autotrim_kick_cv, >vdev_autotrim_lock);
++  cv_wait_idle(>vdev_autotrim_kick_cv,
++  >vdev_autotrim_lock);
+   }
+   boolean_t exit_wanted = vd->vdev_autotrim_exit_wanted;
+   mutex_exit(>vdev_autotrim_lock);
+

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild
new file mode 100644
index ..7b28bf3a94ab
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils 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.6
+MODULES_KERNEL_MIN=3.10
+
+if [[ ${PV} ==  ]] ; 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} !=  ]] ; then
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+
+   IUSE+=" +dist-kernel-cap"
+   RDEPEND="
+   dist-kernel-cap? ( dist-kernel? (
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2024-01-29 Thread Sam James

commit: 236a58a2f301b5f77100e8bf044a40c91b789440
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 29 17:16:08 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 29 17:16:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=236a58a2

sys-fs/zfs-kmod: fix debugging hack

Closes: https://bugs.gentoo.org/923276
Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
index 863395ebfef3..944c90fac889 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
@@ -104,7 +104,7 @@ pkg_setup() {
"Linux ${kv_major_max}.${kv_minor_max} is the latest 
supported version"
fi
 
-   #linux-mod-r1_pkg_setup
+   linux-mod-r1_pkg_setup
 }
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/, sys-fs/zfs-kmod/files/

2024-01-29 Thread Sam James

commit: 1d106b3c4cc3d9d10e558558d4fbffbdf9c694ad
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 29 16:07:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 29 16:07:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d106b3c

sys-fs/zfs-kmod: fix arm64 neon compat w/ >=linux-6.2

Closes: https://bugs.gentoo.org/904657
Signed-off-by: Sam James  gentoo.org>

 .../zfs-kmod/files/zfs-kmod-2.2.2-arm64-neon.patch | 100 +
 sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild  |   3 +-
 2 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-2.2.2-arm64-neon.patch 
b/sys-fs/zfs-kmod/files/zfs-kmod-2.2.2-arm64-neon.patch
new file mode 100644
index ..54121adcdca3
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-2.2.2-arm64-neon.patch
@@ -0,0 +1,100 @@
+https://bugs.gentoo.org/904657
+https://github.com/openzfs/zfs/issues/14555
+https://github.com/openzfs/zfs/commit/976bf9b6a61919638d42ed79cd207132785d128a
+
+From 976bf9b6a61919638d42ed79cd207132785d128a Mon Sep 17 00:00:00 2001
+From: Shengqi Chen 
+Date: Tue, 9 Jan 2024 08:05:24 +0800
+Subject: [PATCH] Linux 6.2 compat: add check for kernel_neon_* availability
+
+This patch adds check for `kernel_neon_*` symbols on arm and arm64
+platforms to address the following issues:
+
+1. Linux 6.2+ on arm64 has exported them with `EXPORT_SYMBOL_GPL`, so
+   license compatibility must be checked before use.
+2. On both arm and arm64, the definitions of these symbols are guarded
+   by `CONFIG_KERNEL_MODE_NEON`, but their declarations are still
+   present. Checking in configuration phase only leads to MODPOST
+   errors (undefined references).
+
+Reviewed-by: Brian Behlendorf 
+Signed-off-by: Shengqi Chen 
+Closes #15711
+Closes #14555
+Closes: #15401
+--- a/config/kernel-fpu.m4
 b/config/kernel-fpu.m4
+@@ -79,6 +79,12 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FPU], [
+   __kernel_fpu_end();
+   ], [], [ZFS_META_LICENSE])
+ 
++  ZFS_LINUX_TEST_SRC([kernel_neon], [
++  #include 
++  ], [
++  kernel_neon_begin();
++  kernel_neon_end();
++  ], [], [ZFS_META_LICENSE])
+ ])
+ 
+ AC_DEFUN([ZFS_AC_KERNEL_FPU], [
+@@ -105,9 +111,20 @@ AC_DEFUN([ZFS_AC_KERNEL_FPU], [
+   AC_DEFINE(KERNEL_EXPORTS_X86_FPU, 1,
+   [kernel exports FPU functions])
+   ],[
+-  AC_MSG_RESULT(internal)
+-  AC_DEFINE(HAVE_KERNEL_FPU_INTERNAL, 1,
+-  [kernel fpu internal])
++  dnl #
++  dnl # ARM neon symbols (only on arm and arm64)
++  dnl # could be GPL-only on arm64 after Linux 6.2
++  dnl #
++  ZFS_LINUX_TEST_RESULT([kernel_neon_license],[
++  AC_MSG_RESULT(kernel_neon_*)
++  AC_DEFINE(HAVE_KERNEL_NEON, 1,
++  [kernel has kernel_neon_* functions])
++  ],[
++  # catch-all
++  AC_MSG_RESULT(internal)
++  AC_DEFINE(HAVE_KERNEL_FPU_INTERNAL, 1,
++  [kernel fpu internal])
++  ])
+   ])
+   ])
+ ])
+--- a/include/os/linux/kernel/linux/simd_aarch64.h
 b/include/os/linux/kernel/linux/simd_aarch64.h
+@@ -71,9 +71,15 @@
+ #define   ID_AA64PFR0_EL1 sys_reg(3, 0, 0, 1, 0)
+ #define   ID_AA64ISAR0_EL1sys_reg(3, 0, 0, 6, 0)
+ 
++#if (defined(HAVE_KERNEL_NEON) && defined(CONFIG_KERNEL_MODE_NEON))
+ #define   kfpu_allowed()  1
+ #define   kfpu_begin()kernel_neon_begin()
+ #define   kfpu_end()  kernel_neon_end()
++#else
++#define   kfpu_allowed()  0
++#define   kfpu_begin()do {} while (0)
++#define   kfpu_end()  do {} while (0)
++#endif
+ #define   kfpu_init() (0)
+ #define   kfpu_fini() do {} while (0)
+ 
+--- a/include/os/linux/kernel/linux/simd_arm.h
 b/include/os/linux/kernel/linux/simd_arm.h
+@@ -53,9 +53,15 @@
+ #include 
+ #include 
+ 
++#if (defined(HAVE_KERNEL_NEON) && defined(CONFIG_KERNEL_MODE_NEON))
+ #define   kfpu_allowed()  1
+ #define   kfpu_begin()kernel_neon_begin()
+ #define   kfpu_end()  kernel_neon_end()
++#else
++#define   kfpu_allowed()  0
++#define   kfpu_begin()do {} while (0)
++#define   kfpu_end()  do {} while (0)
++#endif
+ #define   kfpu_init() (0)
+ #define   kfpu_fini() do {} while (0)
+ 
+

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
index 18f9e126cc32..863395ebfef3 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
+++

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2024-01-22 Thread Arthur Zamarin

commit: 5770633fe0b5ab5d71d26de8b41bdeaa21ff1b36
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Jan 22 17:28:18 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Jan 22 17:28:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5770633f

sys-fs/zfs-kmod: Stabilize 2.2.2 amd64, #921701

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
index 940666b38c47..70dd01bbbd58 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2024-01-22 Thread Arthur Zamarin

commit: a8c5d5f6e5dd5a6f90c1e29f1d9d0d234fcd1966
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Jan 22 17:28:21 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Jan 22 17:28:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8c5d5f6

sys-fs/zfs-kmod: Stabilize 2.2.2 arm64, #921701

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
index 70dd01bbbd58..626d47db62a7 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2024-01-22 Thread Arthur Zamarin

commit: 3554ad1ab690d0399171eb438cfffee1eec7cd01
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Jan 22 17:28:25 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Jan 22 17:28:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3554ad1a

sys-fs/zfs-kmod: Stabilize 2.2.2 ppc64, #921701

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
index 626d47db62a7..18f9e126cc32 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/, sys-fs/zfs-kmod/files/

2023-12-27 Thread Sam James

commit: 0853ef3f0c5323c193a2825a756a5886fc762365
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 03:39:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 03:39:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0853ef3f

sys-fs/zfs-kmod: drop 2.2.1, 2.2.1-r1

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest   |   2 -
 ...s_dmu_offset_next_sync-tunable-by-default.patch |  43 
 sys-fs/zfs-kmod/zfs-kmod-2.2.1-r1.ebuild   | 218 -
 sys-fs/zfs-kmod/zfs-kmod-2.2.1.ebuild  | 217 
 4 files changed, 480 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 8c893b1a1e3f..4591d964e4e4 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,6 +1,4 @@
 DIST zfs-2.1.14.tar.gz 35167471 BLAKE2B 
a7b22eaf05e4fbf416ebe4d7b884c515942fc9375c1dd322cefa00c19c550b9318a4192d6a909d49d58523c8f1a6eaf00189dd58e6543fae17cf8cc35042f469
 SHA512 
4a65c8b7d5576fa2dcc14e7ccaa93191c1d3791479cf89bd02c2bd04434ff5e93709b328796d4f9ba93da19f12772e359df373f40919350a3e1e4c52758b47c8
 DIST zfs-2.1.14.tar.gz.asc 836 BLAKE2B 
f01bc58bf6c3d367c494ed4ea9f3fb1141f3aafdbf4f913b9e0d60d31557076d5ae0e25ca93b013f5fd85e21ba5ae9f61e1a03af54bb0c743869c0ce3d5519df
 SHA512 
be0f386cce952b4047dc2448e356078668e8d4392802dd3bb1a426741f15f4d9fb689cd1cb09972bdbc9fe2e4e782ec4b4754fe811c5657bc1f5308bd38e3926
-DIST zfs-2.2.1.tar.gz 33814243 BLAKE2B 
c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6
 SHA512 
05e17046ac4f0ba923151be3e554e075db4783c8936c5dcee2d3b6d459fb386ba33f9eb38d15c185db58a1d26926147a66c3b3fe14e9de40987f0e95efa2bb31
-DIST zfs-2.2.1.tar.gz.asc 836 BLAKE2B 
9d586d703d557df020f1d02e764f488f354f5c7105e7fa0f3dbf040881b63bdffa3310c9048ed102be05e9c851242b572cd0c6a22361e7e5a1cce50b1644a98d
 SHA512 
78a13f42a71e39d346d43f3e1b271483b4b426ccdcda7f3709db8d89b0bcd54c79b7d17cfe3b49d2e6b8c7c41e30e69faade02e49e4bdddb3e472f2ceeb29cf2
 DIST zfs-2.2.2.tar.gz 33816541 BLAKE2B 
f0619ae42d898d18077096217d0a9ddd7c7378424707aa51d3645661b2889a1459bc4a5e9fe42b6860b2d26e4600da35765b0e741725dafacc2ead2370cad866
 SHA512 
bba252cbf7986f2cce154dd18a34aa478cf98f70106337188dc894de2446d60a58fa643706927757d1787506b44d4ff404897a2d0e16aacb0a7bf27765703332
 DIST zfs-2.2.2.tar.gz.asc 836 BLAKE2B 
bdc86492b2bf45d329e34e89ea7796f5cbf518d32ab114c909321b1d0d8040b9ce4e25b3b85fcbc5ea62ee10a2d716b5b27e37c2c005b307c0b593815c49d625
 SHA512 
110be1aa90f4749106717165a3cb5116379e2d170146a2b3d2601f04212450da9327e028d6e1e5de7f8a46c6bb7a15e2bcdd09e3e760590fbc695f9562f1440b

diff --git 
a/sys-fs/zfs-kmod/files/zfs-kmod-2.2.1-Disable-zfs_dmu_offset_next_sync-tunable-by-default.patch
 
b/sys-fs/zfs-kmod/files/zfs-kmod-2.2.1-Disable-zfs_dmu_offset_next_sync-tunable-by-default.patch
deleted file mode 100644
index f49ab09adf7a..
--- 
a/sys-fs/zfs-kmod/files/zfs-kmod-2.2.1-Disable-zfs_dmu_offset_next_sync-tunable-by-default.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2b266bd36980caefe353411bd56b2487c44aeb6e Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Fri, 24 Nov 2023 21:38:06 +
-Subject: [PATCH] Disable zfs_dmu_offset_next_sync tunable by default
-
-As a mitigation until more is understood and fixes are tested & reviewed, 
change
-the default of zfs_dmu_offset_next_sync from 1 to 0, as it was before
-05b3eb6d232009db247882a39d518e7282630753.
-
-There are no reported cases of The Bug being hit with 
zfs_dmu_offset_next_sync=1:
-that does not mean this is a cure or a real fix, but it _appears_ to be at 
least
-effective in reducing the chances of it happening. By itself, it's a safe 
change
-anyway, so it feels worth us doing while we wait.
-
-Bug: https://github.com/openzfs/zfs/issues/11900
-Bug: https://github.com/openzfs/zfs/issues/15526
-Bug: https://bugs.gentoo.org/917224
-Signed-off-by: Sam James 
 a/man/man4/zfs.4
-+++ b/man/man4/zfs.4
-@@ -1677,7 +1677,7 @@ Allow no-operation writes.
- The occurrence of nopwrites will further depend on other pool properties
- .Pq i.a. the checksumming and compression algorithms .
- .
--.It Sy zfs_dmu_offset_next_sync Ns = Ns Sy 1 Ns | Ns 0 Pq int
-+.It Sy zfs_dmu_offset_next_sync Ns = Ns Sy 0 Ns | Ns 1 Pq int
- Enable forcing TXG sync to find holes.
- When enabled forces ZFS to sync data when
- .Sy SEEK_HOLE No or Sy SEEK_DATA
 a/module/zfs/dmu.c
-+++ b/module/zfs/dmu.c
-@@ -82,7 +82,7 @@ static uint_t zfs_per_txg_dirty_frees_percent = 30;
-  * Disabling this option will result in holes never being reported in dirty
-  * files which is always safe.
-  */
--static int zfs_dmu_offset_next_sync = 1;
-+static int zfs_dmu_offset_next_sync = 0;
- 
- /*
-  * Limit the amount we can prefetch with one call to this amount.  This
--- 
-2.43.0
-

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.1-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.1-r1.ebuild
deleted file mode

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/, sys-fs/zfs-kmod/

2023-12-27 Thread Sam James

commit: 20e398bbdcce0255ad5738232e66a992deda81d1
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 03:39:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 03:39:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20e398bb

sys-fs/zfs-kmod: drop 2.1.12, 2.1.13, 2.1.13-r1

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest   |   4 -
 ...s_dmu_offset_next_sync-tunable-by-default.patch |  40 -
 sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild | 177 
 sys-fs/zfs-kmod/zfs-kmod-2.1.13-r1.ebuild  | 178 -
 sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild | 177 
 5 files changed, 576 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 1701e00a2c16..8c893b1a1e3f 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,7 +1,3 @@
-DIST zfs-2.1.12.tar.gz 35155013 BLAKE2B 
652780e6bf7b63f45909110726d53795fada034f6044c8393fa3980e30217ada6931e3c2bb57210719e3c78c16f973f69287b7e2b475601f4ce12d701d9d96ae
 SHA512 
f48493a21883e441cda705fb085353bed033f1620a1d0f93069c345c76cf2c0759a2e6f7a80c47c9398e9878abfe1d90d931fe5ceaf2588770a71491a434631e
-DIST zfs-2.1.12.tar.gz.asc 836 BLAKE2B 
9215e732981a82254115cd17ec3c9810d4e9e5d5f7bb848778848f911478fc2e4bdbfc563e9835a2e876c26d9e0e8755724a0995baf9ad24e9265123e10cfddf
 SHA512 
69c8b618947fd966eba0bba1c7326ddd463861f051a6cf1d06e23bd6d840fe7503f02adec2c3cbb203fa7b1cced51500f3689c224b653d13d227edd51b5a44f6
-DIST zfs-2.1.13.tar.gz 35170063 BLAKE2B 
88f4b27a872071590294cf2a93d19633bacfaf1214fc4f06ab7ae7778376978754e0e2566d7bfe659d84426f525ecd05679b98310ddfc2d5938804c36fd03904
 SHA512 
d06fce8faa22b0cab2c69befa3842476703433fa90530d1fdf168716afd2039e97b124aa8ef581bed3bc19604fa2faa0bc1e29f6d028e3ef0085f0e34e05230a
-DIST zfs-2.1.13.tar.gz.asc 836 BLAKE2B 
35d3299cfe1d37848f1a0e75a00e08a49a37356ccfc2f47fa1c5c64a1e16adc8030c35047fb45347ec4328d90703ed1623de1c799bef9b6297553aa7b357e8da
 SHA512 
f35c89fd6b1019098b103427b525e32a691c796debde743f9d99953623d8c2bc6deb1ed88865e519d5fa60b259b1d74cce3c829dd1e2eb59aa29abc20046a0db
 DIST zfs-2.1.14.tar.gz 35167471 BLAKE2B 
a7b22eaf05e4fbf416ebe4d7b884c515942fc9375c1dd322cefa00c19c550b9318a4192d6a909d49d58523c8f1a6eaf00189dd58e6543fae17cf8cc35042f469
 SHA512 
4a65c8b7d5576fa2dcc14e7ccaa93191c1d3791479cf89bd02c2bd04434ff5e93709b328796d4f9ba93da19f12772e359df373f40919350a3e1e4c52758b47c8
 DIST zfs-2.1.14.tar.gz.asc 836 BLAKE2B 
f01bc58bf6c3d367c494ed4ea9f3fb1141f3aafdbf4f913b9e0d60d31557076d5ae0e25ca93b013f5fd85e21ba5ae9f61e1a03af54bb0c743869c0ce3d5519df
 SHA512 
be0f386cce952b4047dc2448e356078668e8d4392802dd3bb1a426741f15f4d9fb689cd1cb09972bdbc9fe2e4e782ec4b4754fe811c5657bc1f5308bd38e3926
 DIST zfs-2.2.1.tar.gz 33814243 BLAKE2B 
c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6
 SHA512 
05e17046ac4f0ba923151be3e554e075db4783c8936c5dcee2d3b6d459fb386ba33f9eb38d15c185db58a1d26926147a66c3b3fe14e9de40987f0e95efa2bb31

diff --git 
a/sys-fs/zfs-kmod/files/zfs-kmod-2.1.13-Disable-zfs_dmu_offset_next_sync-tunable-by-default.patch
 
b/sys-fs/zfs-kmod/files/zfs-kmod-2.1.13-Disable-zfs_dmu_offset_next_sync-tunable-by-default.patch
deleted file mode 100644
index c03398450e48..
--- 
a/sys-fs/zfs-kmod/files/zfs-kmod-2.1.13-Disable-zfs_dmu_offset_next_sync-tunable-by-default.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2b266bd36980caefe353411bd56b2487c44aeb6e Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Fri, 24 Nov 2023 21:38:06 +
-Subject: [PATCH] Disable zfs_dmu_offset_next_sync tunable by default
-
-As a mitigation until more is understood and fixes are tested & reviewed, 
change
-the default of zfs_dmu_offset_next_sync from 1 to 0, as it was before
-05b3eb6d232009db247882a39d518e7282630753.
-
-There are no reported cases of The Bug being hit with 
zfs_dmu_offset_next_sync=1:
-that does not mean this is a cure or a real fix, but it _appears_ to be at 
least
-effective in reducing the chances of it happening. By itself, it's a safe 
change
-anyway, so it feels worth us doing while we wait.
-
-Bug: https://github.com/openzfs/zfs/issues/11900
-Bug: https://github.com/openzfs/zfs/issues/15526
-Bug: https://bugs.gentoo.org/917224
-Signed-off-by: Sam James 
 a/man/man4/zfs.4
-+++ b/man/man4/zfs.4
-@@ -1646,7 +1646,7 @@ Allow no-operation writes.
- The occurrence of nopwrites will further depend on other pool properties
- .Pq i.a. the checksumming and compression algorithms .
- .
--.It Sy zfs_dmu_offset_next_sync Ns = Ns Sy 1 Ns | Ns 0 Pq int
-+.It Sy zfs_dmu_offset_next_sync Ns = Ns Sy 0 Ns | Ns 1 Pq int
- Enable forcing TXG sync to find holes.
- When enabled forces ZFS to sync data when
- .Sy SEEK_HOLE No or Sy SEEK_DATA
 a/module/zfs/dmu.c
-+++ b/module/zfs/dmu.c
-@@ -80,7 +80,7 @@ unsigned long zfs_per_txg_dirty_frees_percent = 30;
-  * Disabling

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-12-27 Thread Sam James

commit: d7e3a55dd8c8cd6ba634c3a517d26e8fbbff7f6f
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 03:39:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 03:39:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7e3a55d

sys-fs/zfs-kmod: drop obsolete patch from live

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index e656519567d4..940666b38c47 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -60,7 +60,6 @@ PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.1.11-gentoo.patch
-   
"${FILESDIR}"/${PN}-2.2.1-Disable-zfs_dmu_offset_next_sync-tunable-by-default.patch
 )
 
 pkg_pretend() {

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-12-26 Thread WANG Xuerui

commit: 823d47aa27a9d2ee35ed58d9c7aff3f2d4f5fcbf
Author: WANG Xuerui  gentoo  org>
AuthorDate: Wed Dec 27 06:42:11 2023 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Wed Dec 27 06:42:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=823d47aa

sys-fs/zfs-kmod: forward ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index 6537bbc1a148..e656519567d4 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-12-26 Thread WANG Xuerui

commit: 13091b2cdbaedef52d60af4e2ad14e09afcdc301
Author: WANG Xuerui  gentoo  org>
AuthorDate: Wed Dec 27 06:41:05 2023 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Wed Dec 27 06:41:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13091b2c

sys-fs/zfs-kmod: keyword 2.2.2 for ~loong

Confirmed working with gentoo-kernel-6.6.8 on loong.

Signed-off-by: WANG Xuerui  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
index 0b3c28a2134c..940666b38c47 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-12-11 Thread Sam James

commit: 4ba3b2428e6188159a5ee7b5de2fb7b99f9fceb8
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 12 03:56:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 12 03:56:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba3b242

sys-fs/zfs-kmod: Stabilize 2.1.14 arm64, #919746

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild
index 37f38361ea62..c698d195b168 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 ~arm64 ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-12-11 Thread Sam James

commit: 9c84b44aac264137758b78fe34f741a7c009582d
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 12 03:56:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 12 03:56:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c84b44a

sys-fs/zfs-kmod: Stabilize 2.1.14 ppc64, #919746

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild
index dc5d915be09f..37f38361ea62 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 ~arm64 ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-12-11 Thread Sam James

commit: ed00e25b4b6df73e00abcb9895dc1b845fba2950
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 12 03:56:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 12 03:56:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed00e25b

sys-fs/zfs-kmod: Stabilize 2.1.14 amd64, #919746

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild
index 8a7c8152eb9b..dc5d915be09f 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-11-30 Thread Sam James

commit: 4caaee5dcb723d594ceae8fe4dc2f889ca13d0b0
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  1 03:25:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  1 03:25:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4caaee5d

sys-fs/zfs-kmod: add 2.2.2

Bug: https://bugs.gentoo.org/917224
Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest  |   2 +
 sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild | 217 ++
 2 files changed, 219 insertions(+)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 60487ce02dbe..1701e00a2c16 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -6,3 +6,5 @@ DIST zfs-2.1.14.tar.gz 35167471 BLAKE2B 
a7b22eaf05e4fbf416ebe4d7b884c515942fc937
 DIST zfs-2.1.14.tar.gz.asc 836 BLAKE2B 
f01bc58bf6c3d367c494ed4ea9f3fb1141f3aafdbf4f913b9e0d60d31557076d5ae0e25ca93b013f5fd85e21ba5ae9f61e1a03af54bb0c743869c0ce3d5519df
 SHA512 
be0f386cce952b4047dc2448e356078668e8d4392802dd3bb1a426741f15f4d9fb689cd1cb09972bdbc9fe2e4e782ec4b4754fe811c5657bc1f5308bd38e3926
 DIST zfs-2.2.1.tar.gz 33814243 BLAKE2B 
c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6
 SHA512 
05e17046ac4f0ba923151be3e554e075db4783c8936c5dcee2d3b6d459fb386ba33f9eb38d15c185db58a1d26926147a66c3b3fe14e9de40987f0e95efa2bb31
 DIST zfs-2.2.1.tar.gz.asc 836 BLAKE2B 
9d586d703d557df020f1d02e764f488f354f5c7105e7fa0f3dbf040881b63bdffa3310c9048ed102be05e9c851242b572cd0c6a22361e7e5a1cce50b1644a98d
 SHA512 
78a13f42a71e39d346d43f3e1b271483b4b426ccdcda7f3709db8d89b0bcd54c79b7d17cfe3b49d2e6b8c7c41e30e69faade02e49e4bdddb3e472f2ceeb29cf2
+DIST zfs-2.2.2.tar.gz 33816541 BLAKE2B 
f0619ae42d898d18077096217d0a9ddd7c7378424707aa51d3645661b2889a1459bc4a5e9fe42b6860b2d26e4600da35765b0e741725dafacc2ead2370cad866
 SHA512 
bba252cbf7986f2cce154dd18a34aa478cf98f70106337188dc894de2446d60a58fa643706927757d1787506b44d4ff404897a2d0e16aacb0a7bf27765703332
+DIST zfs-2.2.2.tar.gz.asc 836 BLAKE2B 
bdc86492b2bf45d329e34e89ea7796f5cbf518d32ab114c909321b1d0d8040b9ce4e25b3b85fcbc5ea62ee10a2d716b5b27e37c2c005b307c0b593815c49d625
 SHA512 
110be1aa90f4749106717165a3cb5116379e2d170146a2b3d2601f04212450da9327e028d6e1e5de7f8a46c6bb7a15e2bcdd09e3e760590fbc695f9562f1440b

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
new file mode 100644
index ..0b3c28a2134c
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils 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.6
+MODULES_KERNEL_MIN=3.10
+
+if [[ ${PV} ==  ]] ; 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 ~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} !=  ]] ; then
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+
+   IUSE+=" +dist-kernel-cap"
+   RDEPEND="
+   dist-kernel-cap? ( dist-kernel? (
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-11-30 Thread Sam James

commit: e29451c2bdb20d489bff977e1892fdf4f0582c6b
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  1 03:21:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  1 03:21:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e29451c2

sys-fs/zfs-kmod: add 2.1.14

Bug: https://bugs.gentoo.org/917224
Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest   |   2 +
 sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild | 177 +
 2 files changed, 179 insertions(+)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 4b19d24cad35..60487ce02dbe 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -2,5 +2,7 @@ DIST zfs-2.1.12.tar.gz 35155013 BLAKE2B 
652780e6bf7b63f45909110726d53795fada034f
 DIST zfs-2.1.12.tar.gz.asc 836 BLAKE2B 
9215e732981a82254115cd17ec3c9810d4e9e5d5f7bb848778848f911478fc2e4bdbfc563e9835a2e876c26d9e0e8755724a0995baf9ad24e9265123e10cfddf
 SHA512 
69c8b618947fd966eba0bba1c7326ddd463861f051a6cf1d06e23bd6d840fe7503f02adec2c3cbb203fa7b1cced51500f3689c224b653d13d227edd51b5a44f6
 DIST zfs-2.1.13.tar.gz 35170063 BLAKE2B 
88f4b27a872071590294cf2a93d19633bacfaf1214fc4f06ab7ae7778376978754e0e2566d7bfe659d84426f525ecd05679b98310ddfc2d5938804c36fd03904
 SHA512 
d06fce8faa22b0cab2c69befa3842476703433fa90530d1fdf168716afd2039e97b124aa8ef581bed3bc19604fa2faa0bc1e29f6d028e3ef0085f0e34e05230a
 DIST zfs-2.1.13.tar.gz.asc 836 BLAKE2B 
35d3299cfe1d37848f1a0e75a00e08a49a37356ccfc2f47fa1c5c64a1e16adc8030c35047fb45347ec4328d90703ed1623de1c799bef9b6297553aa7b357e8da
 SHA512 
f35c89fd6b1019098b103427b525e32a691c796debde743f9d99953623d8c2bc6deb1ed88865e519d5fa60b259b1d74cce3c829dd1e2eb59aa29abc20046a0db
+DIST zfs-2.1.14.tar.gz 35167471 BLAKE2B 
a7b22eaf05e4fbf416ebe4d7b884c515942fc9375c1dd322cefa00c19c550b9318a4192d6a909d49d58523c8f1a6eaf00189dd58e6543fae17cf8cc35042f469
 SHA512 
4a65c8b7d5576fa2dcc14e7ccaa93191c1d3791479cf89bd02c2bd04434ff5e93709b328796d4f9ba93da19f12772e359df373f40919350a3e1e4c52758b47c8
+DIST zfs-2.1.14.tar.gz.asc 836 BLAKE2B 
f01bc58bf6c3d367c494ed4ea9f3fb1141f3aafdbf4f913b9e0d60d31557076d5ae0e25ca93b013f5fd85e21ba5ae9f61e1a03af54bb0c743869c0ce3d5519df
 SHA512 
be0f386cce952b4047dc2448e356078668e8d4392802dd3bb1a426741f15f4d9fb689cd1cb09972bdbc9fe2e4e782ec4b4754fe811c5657bc1f5308bd38e3926
 DIST zfs-2.2.1.tar.gz 33814243 BLAKE2B 
c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6
 SHA512 
05e17046ac4f0ba923151be3e554e075db4783c8936c5dcee2d3b6d459fb386ba33f9eb38d15c185db58a1d26926147a66c3b3fe14e9de40987f0e95efa2bb31
 DIST zfs-2.2.1.tar.gz.asc 836 BLAKE2B 
9d586d703d557df020f1d02e764f488f354f5c7105e7fa0f3dbf040881b63bdffa3310c9048ed102be05e9c851242b572cd0c6a22361e7e5a1cce50b1644a98d
 SHA512 
78a13f42a71e39d346d43f3e1b271483b4b426ccdcda7f3709db8d89b0bcd54c79b7d17cfe3b49d2e6b8c7c41e30e69faade02e49e4bdddb3e472f2ceeb29cf2

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild
new file mode 100644
index ..8a7c8152eb9b
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils 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.5
+MODULES_KERNEL_MIN=3.10
+
+if [[ ${PV} ==  ]] ; 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-${PV%_rc?}"
+
+   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 ~ppc64 ~riscv ~sparc"
+   fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+RESTRICT="test"
+
+BDEPEND="
+   dev-lang/perl
+   app-alternatives/awk
+"
+
+if [[ ${PV} !=  ]] ; then
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+
+   IUSE+=" +dist-kernel-cap"
+   RDEPEND="
+   dist-kernel-cap? ( dist-kernel? (
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-11-26 Thread Sam James

commit: 32c0c528a7e153e429f40ba51dc142eac0db0c50
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 27 00:22:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 27 00:23:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32c0c528

sys-fs/zfs-kmod: drop 2.2.0

Shadowed by 2.2.1. Note that this version has been masked for several days
anyway and the mask will remain to inform people who still have that version
installed.

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest  |   2 -
 sys-fs/zfs-kmod/zfs-kmod-2.2.0.ebuild | 217 --
 2 files changed, 219 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 08acc4fbbfa4..4b19d24cad35 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -2,7 +2,5 @@ DIST zfs-2.1.12.tar.gz 35155013 BLAKE2B 
652780e6bf7b63f45909110726d53795fada034f
 DIST zfs-2.1.12.tar.gz.asc 836 BLAKE2B 
9215e732981a82254115cd17ec3c9810d4e9e5d5f7bb848778848f911478fc2e4bdbfc563e9835a2e876c26d9e0e8755724a0995baf9ad24e9265123e10cfddf
 SHA512 
69c8b618947fd966eba0bba1c7326ddd463861f051a6cf1d06e23bd6d840fe7503f02adec2c3cbb203fa7b1cced51500f3689c224b653d13d227edd51b5a44f6
 DIST zfs-2.1.13.tar.gz 35170063 BLAKE2B 
88f4b27a872071590294cf2a93d19633bacfaf1214fc4f06ab7ae7778376978754e0e2566d7bfe659d84426f525ecd05679b98310ddfc2d5938804c36fd03904
 SHA512 
d06fce8faa22b0cab2c69befa3842476703433fa90530d1fdf168716afd2039e97b124aa8ef581bed3bc19604fa2faa0bc1e29f6d028e3ef0085f0e34e05230a
 DIST zfs-2.1.13.tar.gz.asc 836 BLAKE2B 
35d3299cfe1d37848f1a0e75a00e08a49a37356ccfc2f47fa1c5c64a1e16adc8030c35047fb45347ec4328d90703ed1623de1c799bef9b6297553aa7b357e8da
 SHA512 
f35c89fd6b1019098b103427b525e32a691c796debde743f9d99953623d8c2bc6deb1ed88865e519d5fa60b259b1d74cce3c829dd1e2eb59aa29abc20046a0db
-DIST zfs-2.2.0.tar.gz 33826037 BLAKE2B 
80d94cd5ef0bbeaa570853c10f480e3cd64cb852b53aced2e7d382d097130fcf8f94060126a04321f913bca5d9158813a74e97f1dd0f110359d911a33e4a0d77
 SHA512 
6a45419d2cd30a4f65c50410568972ba9a27f87e745d7a46c0757d7deb4377150f9bd752d54b4bda26badfc40922c34dc5d5bf50f76c84398811784243606829
-DIST zfs-2.2.0.tar.gz.asc 195 BLAKE2B 
c3e665380060b605c5f8ce120f8cc00457053b8adaf44307500a47ff5cd00be04306920820c7a8c1832eb770d5189fd747a52cf13d8bdd8fccbcb171b9b4afad
 SHA512 
b52a11d3e27adf606c24fab46307153c9f81cd8ac504aa8995f7add3e25cd3c00fcb8e2faae3c1a70e29f5901117f961ded7fc26ae5701098a6bcf9710d216f7
 DIST zfs-2.2.1.tar.gz 33814243 BLAKE2B 
c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6
 SHA512 
05e17046ac4f0ba923151be3e554e075db4783c8936c5dcee2d3b6d459fb386ba33f9eb38d15c185db58a1d26926147a66c3b3fe14e9de40987f0e95efa2bb31
 DIST zfs-2.2.1.tar.gz.asc 836 BLAKE2B 
9d586d703d557df020f1d02e764f488f354f5c7105e7fa0f3dbf040881b63bdffa3310c9048ed102be05e9c851242b572cd0c6a22361e7e5a1cce50b1644a98d
 SHA512 
78a13f42a71e39d346d43f3e1b271483b4b426ccdcda7f3709db8d89b0bcd54c79b7d17cfe3b49d2e6b8c7c41e30e69faade02e49e4bdddb3e472f2ceeb29cf2

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.0.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.0.ebuild
deleted file mode 100644
index e3f1e276b22c..
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.0.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools dist-kernel-utils 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.5
-MODULES_KERNEL_MIN=3.10
-
-if [[ ${PV} ==  ]] ; 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 ~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} !=  ]] ; then
-   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
-
-   IUSE+=" +dist-kernel-cap"
-   RDEPEND="
-   dist-kernel-cap? ( dist-kernel? (

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-11-24 Thread Sam James

commit: 4301b22c2a2b3909bea574678b160ed4161c9009
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 24 22:13:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 24 22:13:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4301b22c

sys-fs/zfs-kmod: stabilize 2.1.13-r1 for amd64, arm64, ppc64

Bug: https://bugs.gentoo.org/917224
Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.13-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.13-r1.ebuild
index 61dedf6ddd17..f01cc9e5ac6d 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.13-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.13-r1.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/, sys-fs/zfs-kmod/files/

2023-11-24 Thread Sam James

commit: ea74809fc56791c2f45fc46815a7d5a8fd462961
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 24 21:48:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 24 21:51:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea74809f

sys-fs/zfs-kmod: disable zfs_dmu_offset_next_sync tunable by default

As a mitigation until more is understood and fixes are tested & reviewed, change
the default of zfs_dmu_offset_next_sync from 1 to 0, as it was before
05b3eb6d232009db247882a39d518e7282630753 upstream.

There are no reported cases of The Bug being hit with 
zfs_dmu_offset_next_sync=1:
that does not mean this is a cure or a real fix, but it _appears_ to be at least
effective in reducing the chances of it happening. By itself, it's a safe change
anyway, so it feels worth us doing while we wait.

Note that The Bug has been reproduced on 2.1.x as well, hence we do it for both
2.1.13 and 2.2.1.

Bug: https://github.com/openzfs/zfs/issues/11900
Bug: https://github.com/openzfs/zfs/issues/15526
Bug: https://bugs.gentoo.org/917224
Signed-off-by: Sam James  gentoo.org>

 ...s_dmu_offset_next_sync-tunable-by-default.patch | 40 ++
 ...s_dmu_offset_next_sync-tunable-by-default.patch | 43 
 ...-kmod-.ebuild => zfs-kmod-2.1.13-r1.ebuild} | 47 ++
 ...s-kmod-.ebuild => zfs-kmod-2.2.1-r1.ebuild} |  1 +
 sys-fs/zfs-kmod/zfs-kmod-.ebuild   |  1 +
 5 files changed, 89 insertions(+), 43 deletions(-)

diff --git 
a/sys-fs/zfs-kmod/files/zfs-kmod-2.1.13-Disable-zfs_dmu_offset_next_sync-tunable-by-default.patch
 
b/sys-fs/zfs-kmod/files/zfs-kmod-2.1.13-Disable-zfs_dmu_offset_next_sync-tunable-by-default.patch
new file mode 100644
index ..c03398450e48
--- /dev/null
+++ 
b/sys-fs/zfs-kmod/files/zfs-kmod-2.1.13-Disable-zfs_dmu_offset_next_sync-tunable-by-default.patch
@@ -0,0 +1,40 @@
+From 2b266bd36980caefe353411bd56b2487c44aeb6e Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Fri, 24 Nov 2023 21:38:06 +
+Subject: [PATCH] Disable zfs_dmu_offset_next_sync tunable by default
+
+As a mitigation until more is understood and fixes are tested & reviewed, 
change
+the default of zfs_dmu_offset_next_sync from 1 to 0, as it was before
+05b3eb6d232009db247882a39d518e7282630753.
+
+There are no reported cases of The Bug being hit with 
zfs_dmu_offset_next_sync=1:
+that does not mean this is a cure or a real fix, but it _appears_ to be at 
least
+effective in reducing the chances of it happening. By itself, it's a safe 
change
+anyway, so it feels worth us doing while we wait.
+
+Bug: https://github.com/openzfs/zfs/issues/11900
+Bug: https://github.com/openzfs/zfs/issues/15526
+Bug: https://bugs.gentoo.org/917224
+Signed-off-by: Sam James 
+--- a/man/man4/zfs.4
 b/man/man4/zfs.4
+@@ -1646,7 +1646,7 @@ Allow no-operation writes.
+ The occurrence of nopwrites will further depend on other pool properties
+ .Pq i.a. the checksumming and compression algorithms .
+ .
+-.It Sy zfs_dmu_offset_next_sync Ns = Ns Sy 1 Ns | Ns 0 Pq int
++.It Sy zfs_dmu_offset_next_sync Ns = Ns Sy 0 Ns | Ns 1 Pq int
+ Enable forcing TXG sync to find holes.
+ When enabled forces ZFS to sync data when
+ .Sy SEEK_HOLE No or Sy SEEK_DATA
+--- a/module/zfs/dmu.c
 b/module/zfs/dmu.c
+@@ -80,7 +80,7 @@ unsigned long zfs_per_txg_dirty_frees_percent = 30;
+  * Disabling this option will result in holes never being reported in dirty
+  * files which is always safe.
+  */
+-int zfs_dmu_offset_next_sync = 1;
++int zfs_dmu_offset_next_sync = 0;
+ 
+ /*
+  * Limit the amount we can prefetch with one call to this amount.  This

diff --git 
a/sys-fs/zfs-kmod/files/zfs-kmod-2.2.1-Disable-zfs_dmu_offset_next_sync-tunable-by-default.patch
 
b/sys-fs/zfs-kmod/files/zfs-kmod-2.2.1-Disable-zfs_dmu_offset_next_sync-tunable-by-default.patch
new file mode 100644
index ..f49ab09adf7a
--- /dev/null
+++ 
b/sys-fs/zfs-kmod/files/zfs-kmod-2.2.1-Disable-zfs_dmu_offset_next_sync-tunable-by-default.patch
@@ -0,0 +1,43 @@
+From 2b266bd36980caefe353411bd56b2487c44aeb6e Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Fri, 24 Nov 2023 21:38:06 +
+Subject: [PATCH] Disable zfs_dmu_offset_next_sync tunable by default
+
+As a mitigation until more is understood and fixes are tested & reviewed, 
change
+the default of zfs_dmu_offset_next_sync from 1 to 0, as it was before
+05b3eb6d232009db247882a39d518e7282630753.
+
+There are no reported cases of The Bug being hit with 
zfs_dmu_offset_next_sync=1:
+that does not mean this is a cure or a real fix, but it _appears_ to be at 
least
+effective in reducing the chances of it happening. By itself, it's a safe 
change
+anyway, so it feels worth us doing while we wait.
+
+Bug: https://github.com/openzfs/zfs/issues/11900
+Bug: https://github.com/openzfs/zfs/issues/15526
+Bug: https://bugs.gentoo.org/917224
+Signed-off-by: Sam James 
+--- a/man/man4/zfs.4
 b/man/man4/zfs.4
+@@ -1677,7 +1677,7 @@

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-11-22 Thread Sam James

commit: e798aa5a89a092be0a82ed2302ada3d1b7951c21
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov 22 10:41:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 22 10:43:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e798aa5a

sys-fs/zfs-kmod: add 2.2.1

Note that it may not fix the issues reported entirely as the race still exists.

Bug: https://bugs.gentoo.org/917224
Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest| 2 ++
 sys-fs/zfs-kmod/{zfs-kmod-.ebuild => zfs-kmod-2.2.1.ebuild} | 2 +-
 sys-fs/zfs-kmod/zfs-kmod-.ebuild| 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 957012433003..08acc4fbbfa4 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -4,3 +4,5 @@ DIST zfs-2.1.13.tar.gz 35170063 BLAKE2B 
88f4b27a872071590294cf2a93d19633bacfaf12
 DIST zfs-2.1.13.tar.gz.asc 836 BLAKE2B 
35d3299cfe1d37848f1a0e75a00e08a49a37356ccfc2f47fa1c5c64a1e16adc8030c35047fb45347ec4328d90703ed1623de1c799bef9b6297553aa7b357e8da
 SHA512 
f35c89fd6b1019098b103427b525e32a691c796debde743f9d99953623d8c2bc6deb1ed88865e519d5fa60b259b1d74cce3c829dd1e2eb59aa29abc20046a0db
 DIST zfs-2.2.0.tar.gz 33826037 BLAKE2B 
80d94cd5ef0bbeaa570853c10f480e3cd64cb852b53aced2e7d382d097130fcf8f94060126a04321f913bca5d9158813a74e97f1dd0f110359d911a33e4a0d77
 SHA512 
6a45419d2cd30a4f65c50410568972ba9a27f87e745d7a46c0757d7deb4377150f9bd752d54b4bda26badfc40922c34dc5d5bf50f76c84398811784243606829
 DIST zfs-2.2.0.tar.gz.asc 195 BLAKE2B 
c3e665380060b605c5f8ce120f8cc00457053b8adaf44307500a47ff5cd00be04306920820c7a8c1832eb770d5189fd747a52cf13d8bdd8fccbcb171b9b4afad
 SHA512 
b52a11d3e27adf606c24fab46307153c9f81cd8ac504aa8995f7add3e25cd3c00fcb8e2faae3c1a70e29f5901117f961ded7fc26ae5701098a6bcf9710d216f7
+DIST zfs-2.2.1.tar.gz 33814243 BLAKE2B 
c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6
 SHA512 
05e17046ac4f0ba923151be3e554e075db4783c8936c5dcee2d3b6d459fb386ba33f9eb38d15c185db58a1d26926147a66c3b3fe14e9de40987f0e95efa2bb31
+DIST zfs-2.2.1.tar.gz.asc 836 BLAKE2B 
9d586d703d557df020f1d02e764f488f354f5c7105e7fa0f3dbf040881b63bdffa3310c9048ed102be05e9c851242b572cd0c6a22361e7e5a1cce50b1644a98d
 SHA512 
78a13f42a71e39d346d43f3e1b271483b4b426ccdcda7f3709db8d89b0bcd54c79b7d17cfe3b49d2e6b8c7c41e30e69faade02e49e4bdddb3e472f2ceeb29cf2

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.1.ebuild
similarity index 99%
copy from sys-fs/zfs-kmod/zfs-kmod-.ebuild
copy to sys-fs/zfs-kmod/zfs-kmod-2.2.1.ebuild
index e3f1e276b22c..0b3c28a2134c 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.1.ebuild
@@ -8,7 +8,7 @@ inherit autotools dist-kernel-utils 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.5
+MODULES_KERNEL_MAX=6.6
 MODULES_KERNEL_MIN=3.10
 
 if [[ ${PV} ==  ]] ; then

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index e3f1e276b22c..0b3c28a2134c 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -8,7 +8,7 @@ inherit autotools dist-kernel-utils 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.5
+MODULES_KERNEL_MAX=6.6
 MODULES_KERNEL_MIN=3.10
 
 if [[ ${PV} ==  ]] ; then

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-10-24 Thread Sam James

commit: 77bdabd346ad47fa5d9a6eebe8838d2f1b25344a
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 25 02:30:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 25 02:30:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77bdabd3

sys-fs/zfs-kmod: Stabilize 2.1.13 amd64, #915701

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild
index 06a635fca3e6..42a96e824562 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-10-24 Thread Sam James

commit: 7beed5d653c4bf2595a751bffb1bb25801761fdd
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 25 02:31:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 25 02:31:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7beed5d6

sys-fs/zfs-kmod: Stabilize 2.1.13 ppc64, #915701

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild
index d2dec0b48906..6228090df788 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-10-24 Thread Sam James

commit: a77c6711afed0b6a2e5480cad04f74c3d24a434b
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 25 02:30:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 25 02:30:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a77c6711

sys-fs/zfs-kmod: Stabilize 2.1.13 arm64, #915701

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild
index 42a96e824562..d2dec0b48906 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-10-13 Thread Sam James

commit: a14eb94baf01dc192af37b244470538f4592100f
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 14 01:51:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 14 01:51:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14eb94b

sys-fs/zfs-kmod: drop 2.1.9, 2.1.11, 2.1.11-r1

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest  |   4 -
 sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild | 177 -
 sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild| 212 --
 sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild | 212 --
 4 files changed, 605 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 954ebd1511f4..957012433003 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,10 +1,6 @@
-DIST zfs-2.1.11.tar.gz 35100716 BLAKE2B 
991ac2347bcd452812e247358e2c44a04a88e700d25878b5b95f86939e6114e1205e7afabfd2a1ea9220947876511374d7224aa587d3d66184838d705f71a89a
 SHA512 
335a543644d2dbba919213a28cc5922bf6a118fc19069db84562ce056449a2d6ca4ba827e54f304ab7d9be22260aa9b255134f1b12e2bc98890f757f35e48bd7
-DIST zfs-2.1.11.tar.gz.asc 836 BLAKE2B 
0b904d8e1de2dd08a377efc94e32862192d6b9ccb8628af058a71b3ea51f5e483e0cf527906cd222fe9b41b28ca0b30b0efa07d97c480e5546f6e2bed8cbcb01
 SHA512 
7329e62012ba64288345d8959611de82502ef1da4020e215462fbb2ed209413ec8638d211a31dd6e70be71c998f1da1d8a0d19e5df1f2778782ebb988c94aa41
 DIST zfs-2.1.12.tar.gz 35155013 BLAKE2B 
652780e6bf7b63f45909110726d53795fada034f6044c8393fa3980e30217ada6931e3c2bb57210719e3c78c16f973f69287b7e2b475601f4ce12d701d9d96ae
 SHA512 
f48493a21883e441cda705fb085353bed033f1620a1d0f93069c345c76cf2c0759a2e6f7a80c47c9398e9878abfe1d90d931fe5ceaf2588770a71491a434631e
 DIST zfs-2.1.12.tar.gz.asc 836 BLAKE2B 
9215e732981a82254115cd17ec3c9810d4e9e5d5f7bb848778848f911478fc2e4bdbfc563e9835a2e876c26d9e0e8755724a0995baf9ad24e9265123e10cfddf
 SHA512 
69c8b618947fd966eba0bba1c7326ddd463861f051a6cf1d06e23bd6d840fe7503f02adec2c3cbb203fa7b1cced51500f3689c224b653d13d227edd51b5a44f6
 DIST zfs-2.1.13.tar.gz 35170063 BLAKE2B 
88f4b27a872071590294cf2a93d19633bacfaf1214fc4f06ab7ae7778376978754e0e2566d7bfe659d84426f525ecd05679b98310ddfc2d5938804c36fd03904
 SHA512 
d06fce8faa22b0cab2c69befa3842476703433fa90530d1fdf168716afd2039e97b124aa8ef581bed3bc19604fa2faa0bc1e29f6d028e3ef0085f0e34e05230a
 DIST zfs-2.1.13.tar.gz.asc 836 BLAKE2B 
35d3299cfe1d37848f1a0e75a00e08a49a37356ccfc2f47fa1c5c64a1e16adc8030c35047fb45347ec4328d90703ed1623de1c799bef9b6297553aa7b357e8da
 SHA512 
f35c89fd6b1019098b103427b525e32a691c796debde743f9d99953623d8c2bc6deb1ed88865e519d5fa60b259b1d74cce3c829dd1e2eb59aa29abc20046a0db
-DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B 
d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812
 SHA512 
a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
-DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 
1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486
 SHA512 
35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0
 DIST zfs-2.2.0.tar.gz 33826037 BLAKE2B 
80d94cd5ef0bbeaa570853c10f480e3cd64cb852b53aced2e7d382d097130fcf8f94060126a04321f913bca5d9158813a74e97f1dd0f110359d911a33e4a0d77
 SHA512 
6a45419d2cd30a4f65c50410568972ba9a27f87e745d7a46c0757d7deb4377150f9bd752d54b4bda26badfc40922c34dc5d5bf50f76c84398811784243606829
 DIST zfs-2.2.0.tar.gz.asc 195 BLAKE2B 
c3e665380060b605c5f8ce120f8cc00457053b8adaf44307500a47ff5cd00be04306920820c7a8c1832eb770d5189fd747a52cf13d8bdd8fccbcb171b9b4afad
 SHA512 
b52a11d3e27adf606c24fab46307153c9f81cd8ac504aa8995f7add3e25cd3c00fcb8e2faae3c1a70e29f5901117f961ded7fc26ae5701098a6bcf9710d216f7

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild
deleted file mode 100644
index 7bf3ebaec2e0..
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools dist-kernel-utils 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.2
-MODULES_KERNEL_MIN=3.10
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
-   inherit git-r3
-   unset MODULES_KERNEL_MAX
-else
-   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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? (

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-10-13 Thread Sam James

commit: be355d3b469c672f191172db11eee05ebd154edd
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 14 01:50:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 14 01:50:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be355d3b

sys-fs/zfs-kmod: add 2.2.0

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest  |   2 +
 sys-fs/zfs-kmod/zfs-kmod-2.2.0.ebuild | 217 ++
 2 files changed, 219 insertions(+)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index c032b3e43f79..737c2dcab6a1 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -12,3 +12,5 @@ DIST zfs-2.2.0-rc4.tar.gz 33660298 BLAKE2B 
c8179cf7a8caaa07e6898d9169fa3f825d070
 DIST zfs-2.2.0-rc4.tar.gz.asc 195 BLAKE2B 
496f5163235f743e64da3862245a8dfabd95d06071183514ab11f7dd7792b32823b73864888d7a2fbf2dee16ca374772b07139287a1e66416dbd82e062b25ba9
 SHA512 
6a0ce528e0b15b4c1b8f02db9aaa9ce61bdf9a7c1c88336b91042802535618fd95aa4f59211bef0d1d79f833d8ae2030c4be8ee5a2244b13ec3f684aa1cdee4e
 DIST zfs-2.2.0-rc5.tar.gz 33674415 BLAKE2B 
89187462b9f544779e331fe06a84763918bfedcccb3ecfe28cfef00f6ee30690e5a1983bc670a73f0b9db809f4aa23b59255b66907b5ca2c9e236b471b9a8a63
 SHA512 
68610a68526c79486b7cd8ca28abd0d8dd42814c37a82ea2be05b0044998ef36c5aaa3fc7598c1a8426b73116351a9b00c8ffdab3e5ae3aecc4954fb9378c422
 DIST zfs-2.2.0-rc5.tar.gz.asc 195 BLAKE2B 
59c204bb0eb2140a82cb4066e5bb2b66c1331aabf65c807869fbab89a177b0e09aa8b23bdbc46bb18785db554405a085841605885b3931119d1e3eb0335e257a
 SHA512 
83101a1e350db4276296f9ed52a556ea36f4238c272ab565926ec69dca495c645a7b41164baee39768123c5982459d10b54819ba9d9ac6c37fe851952db29887
+DIST zfs-2.2.0.tar.gz 33826037 BLAKE2B 
80d94cd5ef0bbeaa570853c10f480e3cd64cb852b53aced2e7d382d097130fcf8f94060126a04321f913bca5d9158813a74e97f1dd0f110359d911a33e4a0d77
 SHA512 
6a45419d2cd30a4f65c50410568972ba9a27f87e745d7a46c0757d7deb4377150f9bd752d54b4bda26badfc40922c34dc5d5bf50f76c84398811784243606829
+DIST zfs-2.2.0.tar.gz.asc 195 BLAKE2B 
c3e665380060b605c5f8ce120f8cc00457053b8adaf44307500a47ff5cd00be04306920820c7a8c1832eb770d5189fd747a52cf13d8bdd8fccbcb171b9b4afad
 SHA512 
b52a11d3e27adf606c24fab46307153c9f81cd8ac504aa8995f7add3e25cd3c00fcb8e2faae3c1a70e29f5901117f961ded7fc26ae5701098a6bcf9710d216f7

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.0.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.0.ebuild
new file mode 100644
index ..bf5b73c2dd69
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.0.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils 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.5
+MODULES_KERNEL_MIN=3.10
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
+   inherit git-r3
+   unset MODULES_KERNEL_MAX
+else
+   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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 ~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} !=  ]] ; then
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+
+   IUSE+=" +dist-kernel-cap"
+   RDEPEND="
+   dist-kernel-cap? ( dist-kernel? (
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-10-13 Thread Sam James

commit: 8873220f24114a626d6f9903097df73bbb45eec6
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 14 01:50:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 14 01:50:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8873220f

sys-fs/zfs-kmod: drop 2.2.0_rc3, 2.2.0_rc4, 2.2.0_rc5

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest  |   6 -
 sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc3.ebuild | 217 --
 sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc4.ebuild | 217 --
 sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc5.ebuild | 217 --
 4 files changed, 657 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 737c2dcab6a1..954ebd1511f4 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -6,11 +6,5 @@ DIST zfs-2.1.13.tar.gz 35170063 BLAKE2B 
88f4b27a872071590294cf2a93d19633bacfaf12
 DIST zfs-2.1.13.tar.gz.asc 836 BLAKE2B 
35d3299cfe1d37848f1a0e75a00e08a49a37356ccfc2f47fa1c5c64a1e16adc8030c35047fb45347ec4328d90703ed1623de1c799bef9b6297553aa7b357e8da
 SHA512 
f35c89fd6b1019098b103427b525e32a691c796debde743f9d99953623d8c2bc6deb1ed88865e519d5fa60b259b1d74cce3c829dd1e2eb59aa29abc20046a0db
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B 
d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812
 SHA512 
a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 
1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486
 SHA512 
35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0
-DIST zfs-2.2.0-rc3.tar.gz 3388 BLAKE2B 
37c47bcbf34d9238f42bbc80e2b0712a9e64a48196a390e30cfc02a510e0a8c28da5aa52eb3963a2363d2d23881628cadad13e2121cf54a0582cfc7d55685313
 SHA512 
d82991e6ff63910b38aa0d9b79fce19d1deb79a214adca4bec3fd468077674ef1de264b6f5b0acf9dc0418ce1ed4c9e98d1ad4596274a1769061ae20e017fb92
-DIST zfs-2.2.0-rc3.tar.gz.asc 195 BLAKE2B 
cbbced9255a3b6a5ec0190806b73e62533600975dad073b82532fb1e488bf81b8d056c7a4f59b9e212a9825ec4900d6f2e2c0141b3d4d58577fe36d9bc3c15b9
 SHA512 
45424815e39b33107805da737ecfcb95c761ab774143e72449dacfe98a851ddf52c7cb08a587548159305b4c4fe51a0fb9cfbf30fdadf093518eb4c8ce49e12c
-DIST zfs-2.2.0-rc4.tar.gz 33660298 BLAKE2B 
c8179cf7a8caaa07e6898d9169fa3f825d070d1e7f26552797ebaeb4a6c122072903f93113b4bf817acc47911d6c32b4f4801f09382b7a6376369086f329
 SHA512 
ae389b24616d1800cff2df1e06b22d0fc507ccd573cda47cd84c7aa3271a5e3b78668a135224e8d0747eb63104544fc284d814073e4061908553faf3d2b0f075
-DIST zfs-2.2.0-rc4.tar.gz.asc 195 BLAKE2B 
496f5163235f743e64da3862245a8dfabd95d06071183514ab11f7dd7792b32823b73864888d7a2fbf2dee16ca374772b07139287a1e66416dbd82e062b25ba9
 SHA512 
6a0ce528e0b15b4c1b8f02db9aaa9ce61bdf9a7c1c88336b91042802535618fd95aa4f59211bef0d1d79f833d8ae2030c4be8ee5a2244b13ec3f684aa1cdee4e
-DIST zfs-2.2.0-rc5.tar.gz 33674415 BLAKE2B 
89187462b9f544779e331fe06a84763918bfedcccb3ecfe28cfef00f6ee30690e5a1983bc670a73f0b9db809f4aa23b59255b66907b5ca2c9e236b471b9a8a63
 SHA512 
68610a68526c79486b7cd8ca28abd0d8dd42814c37a82ea2be05b0044998ef36c5aaa3fc7598c1a8426b73116351a9b00c8ffdab3e5ae3aecc4954fb9378c422
-DIST zfs-2.2.0-rc5.tar.gz.asc 195 BLAKE2B 
59c204bb0eb2140a82cb4066e5bb2b66c1331aabf65c807869fbab89a177b0e09aa8b23bdbc46bb18785db554405a085841605885b3931119d1e3eb0335e257a
 SHA512 
83101a1e350db4276296f9ed52a556ea36f4238c272ab565926ec69dca495c645a7b41164baee39768123c5982459d10b54819ba9d9ac6c37fe851952db29887
 DIST zfs-2.2.0.tar.gz 33826037 BLAKE2B 
80d94cd5ef0bbeaa570853c10f480e3cd64cb852b53aced2e7d382d097130fcf8f94060126a04321f913bca5d9158813a74e97f1dd0f110359d911a33e4a0d77
 SHA512 
6a45419d2cd30a4f65c50410568972ba9a27f87e745d7a46c0757d7deb4377150f9bd752d54b4bda26badfc40922c34dc5d5bf50f76c84398811784243606829
 DIST zfs-2.2.0.tar.gz.asc 195 BLAKE2B 
c3e665380060b605c5f8ce120f8cc00457053b8adaf44307500a47ff5cd00be04306920820c7a8c1832eb770d5189fd747a52cf13d8bdd8fccbcb171b9b4afad
 SHA512 
b52a11d3e27adf606c24fab46307153c9f81cd8ac504aa8995f7add3e25cd3c00fcb8e2faae3c1a70e29f5901117f961ded7fc26ae5701098a6bcf9710d216f7

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc3.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc3.ebuild
deleted file mode 100644
index 10ad3189457d..
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc3.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools dist-kernel-utils 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.4
-MODULES_KERNEL_MIN=3.10
-
-if [[ ${PV} ==  ]] ; then

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-10-07 Thread Sam James

commit: 6d04e7790393dc3220f5dd3da0eaf8e3a8f71069
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct  8 00:47:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct  8 00:47:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d04e779

sys-fs/zfs-kmod: add 2.2.0_rc5

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest  |   2 +
 sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc5.ebuild | 217 ++
 2 files changed, 219 insertions(+)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 8d72400873aa..c032b3e43f79 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -10,3 +10,5 @@ DIST zfs-2.2.0-rc3.tar.gz 3388 BLAKE2B 
37c47bcbf34d9238f42bbc80e2b0712a9e64a
 DIST zfs-2.2.0-rc3.tar.gz.asc 195 BLAKE2B 
cbbced9255a3b6a5ec0190806b73e62533600975dad073b82532fb1e488bf81b8d056c7a4f59b9e212a9825ec4900d6f2e2c0141b3d4d58577fe36d9bc3c15b9
 SHA512 
45424815e39b33107805da737ecfcb95c761ab774143e72449dacfe98a851ddf52c7cb08a587548159305b4c4fe51a0fb9cfbf30fdadf093518eb4c8ce49e12c
 DIST zfs-2.2.0-rc4.tar.gz 33660298 BLAKE2B 
c8179cf7a8caaa07e6898d9169fa3f825d070d1e7f26552797ebaeb4a6c122072903f93113b4bf817acc47911d6c32b4f4801f09382b7a6376369086f329
 SHA512 
ae389b24616d1800cff2df1e06b22d0fc507ccd573cda47cd84c7aa3271a5e3b78668a135224e8d0747eb63104544fc284d814073e4061908553faf3d2b0f075
 DIST zfs-2.2.0-rc4.tar.gz.asc 195 BLAKE2B 
496f5163235f743e64da3862245a8dfabd95d06071183514ab11f7dd7792b32823b73864888d7a2fbf2dee16ca374772b07139287a1e66416dbd82e062b25ba9
 SHA512 
6a0ce528e0b15b4c1b8f02db9aaa9ce61bdf9a7c1c88336b91042802535618fd95aa4f59211bef0d1d79f833d8ae2030c4be8ee5a2244b13ec3f684aa1cdee4e
+DIST zfs-2.2.0-rc5.tar.gz 33674415 BLAKE2B 
89187462b9f544779e331fe06a84763918bfedcccb3ecfe28cfef00f6ee30690e5a1983bc670a73f0b9db809f4aa23b59255b66907b5ca2c9e236b471b9a8a63
 SHA512 
68610a68526c79486b7cd8ca28abd0d8dd42814c37a82ea2be05b0044998ef36c5aaa3fc7598c1a8426b73116351a9b00c8ffdab3e5ae3aecc4954fb9378c422
+DIST zfs-2.2.0-rc5.tar.gz.asc 195 BLAKE2B 
59c204bb0eb2140a82cb4066e5bb2b66c1331aabf65c807869fbab89a177b0e09aa8b23bdbc46bb18785db554405a085841605885b3931119d1e3eb0335e257a
 SHA512 
83101a1e350db4276296f9ed52a556ea36f4238c272ab565926ec69dca495c645a7b41164baee39768123c5982459d10b54819ba9d9ac6c37fe851952db29887

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc5.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc5.ebuild
new file mode 100644
index ..bf5b73c2dd69
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc5.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils 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.5
+MODULES_KERNEL_MIN=3.10
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
+   inherit git-r3
+   unset MODULES_KERNEL_MAX
+else
+   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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 ~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} !=  ]] ; then
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+
+   IUSE+=" +dist-kernel-cap"
+   RDEPEND="
+   dist-kernel-cap? ( dist-kernel? (
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-09-27 Thread Sam James

commit: 35c688c264fb8ccee076d99e6fd72a8a557ba5fb
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 28 01:17:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 28 01:17:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c688c2

sys-fs/zfs-kmod: add 2.1.13

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest   |   2 +
 sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild | 177 +
 2 files changed, 179 insertions(+)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index fdb6fcb5ab21..8d72400873aa 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -2,6 +2,8 @@ DIST zfs-2.1.11.tar.gz 35100716 BLAKE2B 
991ac2347bcd452812e247358e2c44a04a88e700
 DIST zfs-2.1.11.tar.gz.asc 836 BLAKE2B 
0b904d8e1de2dd08a377efc94e32862192d6b9ccb8628af058a71b3ea51f5e483e0cf527906cd222fe9b41b28ca0b30b0efa07d97c480e5546f6e2bed8cbcb01
 SHA512 
7329e62012ba64288345d8959611de82502ef1da4020e215462fbb2ed209413ec8638d211a31dd6e70be71c998f1da1d8a0d19e5df1f2778782ebb988c94aa41
 DIST zfs-2.1.12.tar.gz 35155013 BLAKE2B 
652780e6bf7b63f45909110726d53795fada034f6044c8393fa3980e30217ada6931e3c2bb57210719e3c78c16f973f69287b7e2b475601f4ce12d701d9d96ae
 SHA512 
f48493a21883e441cda705fb085353bed033f1620a1d0f93069c345c76cf2c0759a2e6f7a80c47c9398e9878abfe1d90d931fe5ceaf2588770a71491a434631e
 DIST zfs-2.1.12.tar.gz.asc 836 BLAKE2B 
9215e732981a82254115cd17ec3c9810d4e9e5d5f7bb848778848f911478fc2e4bdbfc563e9835a2e876c26d9e0e8755724a0995baf9ad24e9265123e10cfddf
 SHA512 
69c8b618947fd966eba0bba1c7326ddd463861f051a6cf1d06e23bd6d840fe7503f02adec2c3cbb203fa7b1cced51500f3689c224b653d13d227edd51b5a44f6
+DIST zfs-2.1.13.tar.gz 35170063 BLAKE2B 
88f4b27a872071590294cf2a93d19633bacfaf1214fc4f06ab7ae7778376978754e0e2566d7bfe659d84426f525ecd05679b98310ddfc2d5938804c36fd03904
 SHA512 
d06fce8faa22b0cab2c69befa3842476703433fa90530d1fdf168716afd2039e97b124aa8ef581bed3bc19604fa2faa0bc1e29f6d028e3ef0085f0e34e05230a
+DIST zfs-2.1.13.tar.gz.asc 836 BLAKE2B 
35d3299cfe1d37848f1a0e75a00e08a49a37356ccfc2f47fa1c5c64a1e16adc8030c35047fb45347ec4328d90703ed1623de1c799bef9b6297553aa7b357e8da
 SHA512 
f35c89fd6b1019098b103427b525e32a691c796debde743f9d99953623d8c2bc6deb1ed88865e519d5fa60b259b1d74cce3c829dd1e2eb59aa29abc20046a0db
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B 
d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812
 SHA512 
a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 
1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486
 SHA512 
35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0
 DIST zfs-2.2.0-rc3.tar.gz 3388 BLAKE2B 
37c47bcbf34d9238f42bbc80e2b0712a9e64a48196a390e30cfc02a510e0a8c28da5aa52eb3963a2363d2d23881628cadad13e2121cf54a0582cfc7d55685313
 SHA512 
d82991e6ff63910b38aa0d9b79fce19d1deb79a214adca4bec3fd468077674ef1de264b6f5b0acf9dc0418ce1ed4c9e98d1ad4596274a1769061ae20e017fb92

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild
new file mode 100644
index ..06a635fca3e6
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.13.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils 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.5
+MODULES_KERNEL_MIN=3.10
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
+   inherit git-r3
+   unset MODULES_KERNEL_MAX
+else
+   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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-${PV%_rc?}"
+
+   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 ~ppc64 ~riscv ~sparc"
+   fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+RESTRICT="test"
+
+BDEPEND="
+   dev-lang/perl
+   app-alternatives/awk
+"
+
+if [[ ${PV} !=  ]] ; then
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-09-12 Thread Sam James

commit: e19708a1a52a2f4df4be7c8da260ced804c0861b
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 13 01:59:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 13 02:12:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e19708a1

sys-fs/zfs-kmod: master supports 6.5

Not that it really matters as this branch isn't taken for , but I noticed
the commit, so...

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index 10ad3189457d..bf5b73c2dd69 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -8,7 +8,7 @@ inherit autotools dist-kernel-utils 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.4
+MODULES_KERNEL_MAX=6.5
 MODULES_KERNEL_MIN=3.10
 
 if [[ ${PV} ==  ]] ; then

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-09-08 Thread Sam James

commit: d53b2d1faccb7e9234b860abfc6025a70727462f
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  9 01:50:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  9 01:50:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d53b2d1f

sys-fs/zfs-kmod: add 2.2.0_rc4

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest  |   2 +
 sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc4.ebuild | 217 ++
 2 files changed, 219 insertions(+)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 34e7ed5dc0b4..fdb6fcb5ab21 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -6,3 +6,5 @@ DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B 
d7553cc162687531b254089e29e2e15e2eb6b362c
 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 
1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486
 SHA512 
35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0
 DIST zfs-2.2.0-rc3.tar.gz 3388 BLAKE2B 
37c47bcbf34d9238f42bbc80e2b0712a9e64a48196a390e30cfc02a510e0a8c28da5aa52eb3963a2363d2d23881628cadad13e2121cf54a0582cfc7d55685313
 SHA512 
d82991e6ff63910b38aa0d9b79fce19d1deb79a214adca4bec3fd468077674ef1de264b6f5b0acf9dc0418ce1ed4c9e98d1ad4596274a1769061ae20e017fb92
 DIST zfs-2.2.0-rc3.tar.gz.asc 195 BLAKE2B 
cbbced9255a3b6a5ec0190806b73e62533600975dad073b82532fb1e488bf81b8d056c7a4f59b9e212a9825ec4900d6f2e2c0141b3d4d58577fe36d9bc3c15b9
 SHA512 
45424815e39b33107805da737ecfcb95c761ab774143e72449dacfe98a851ddf52c7cb08a587548159305b4c4fe51a0fb9cfbf30fdadf093518eb4c8ce49e12c
+DIST zfs-2.2.0-rc4.tar.gz 33660298 BLAKE2B 
c8179cf7a8caaa07e6898d9169fa3f825d070d1e7f26552797ebaeb4a6c122072903f93113b4bf817acc47911d6c32b4f4801f09382b7a6376369086f329
 SHA512 
ae389b24616d1800cff2df1e06b22d0fc507ccd573cda47cd84c7aa3271a5e3b78668a135224e8d0747eb63104544fc284d814073e4061908553faf3d2b0f075
+DIST zfs-2.2.0-rc4.tar.gz.asc 195 BLAKE2B 
496f5163235f743e64da3862245a8dfabd95d06071183514ab11f7dd7792b32823b73864888d7a2fbf2dee16ca374772b07139287a1e66416dbd82e062b25ba9
 SHA512 
6a0ce528e0b15b4c1b8f02db9aaa9ce61bdf9a7c1c88336b91042802535618fd95aa4f59211bef0d1d79f833d8ae2030c4be8ee5a2244b13ec3f684aa1cdee4e

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc4.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc4.ebuild
new file mode 100644
index ..10ad3189457d
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc4.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils 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.4
+MODULES_KERNEL_MIN=3.10
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
+   inherit git-r3
+   unset MODULES_KERNEL_MAX
+else
+   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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 ~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} !=  ]] ; then
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+
+   IUSE+=" +dist-kernel-cap"
+   RDEPEND="
+   dist-kernel-cap? ( dist-kernel? (
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-08-08 Thread Sam James

commit: 7b23cc725543fa48b8d2bd304f5512773604fb22
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  9 05:54:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  9 05:54:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b23cc72

sys-fs/zfs-kmod: Stabilize 2.1.12 arm64, #911673

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild
index 49880499f775..f881b0b94837 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 ~arm64 ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-08-08 Thread Sam James

commit: 1b74d6cb47fabb558690db63863232d3b4ab3217
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  9 05:54:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  9 05:54:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b74d6cb

sys-fs/zfs-kmod: Stabilize 2.1.12 amd64, #911673

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild
index a6a5c71476dd..49880499f775 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm64 ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 ~arm64 ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-08-03 Thread Sam James

commit: cd6d7e7851fcc67d29684c2fd43a474c5f28b018
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug  4 00:54:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug  4 00:54:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd6d7e78

sys-fs/zfs-kmod: Stabilize 2.1.12 ppc64, #911673

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild
index 1b4db3530a72..a6a5c71476dd 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild
@@ -30,7 +30,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="~amd64 ~arm64 ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-08-03 Thread Sam James

commit: d808849497308047924afea9d6aa178cc861330b
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug  3 16:19:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug  3 16:19:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8088494

sys-fs/zfs-kmod: Stabilize 2.1.11 arm64, #907393

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild
index 2e8ab39bb2d3..9711c9199bcb 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild
@@ -26,7 +26,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]]; then
-   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-08-03 Thread Sam James

commit: e7df6ad8015b6c7e3f76d0e48084abcc2f18a3d3
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug  3 16:20:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug  3 16:20:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7df6ad8

sys-fs/zfs-kmod: Stabilize 2.1.11 ppc64, #907393

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild
index 9711c9199bcb..d61a36709dfa 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild
@@ -26,7 +26,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]]; then
-   KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-07-27 Thread Sam James

commit: 0ab7cf6e15bc16b22c508035b8149f7f1f942748
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 28 01:26:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 28 01:26:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ab7cf6e

sys-fs/zfs-kmod: add 2.2.0_rc3

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest| 2 ++
 sys-fs/zfs-kmod/{zfs-kmod-.ebuild => zfs-kmod-2.2.0_rc3.ebuild} | 2 +-
 sys-fs/zfs-kmod/zfs-kmod-.ebuild| 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index c01ce1f71997..36404e8fd024 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -8,3 +8,5 @@ DIST zfs-2.2.0-rc1.tar.gz 33656024 BLAKE2B 
1157db51d2736905b787a2627e599d7ac527b
 DIST zfs-2.2.0-rc1.tar.gz.asc 195 BLAKE2B 
8df7d05729716ca75e8c975df92f8a1976b7712a3c98e3479582550e60bd97af77f80e9b72be094b57650948136ad8a9276e7d4ea0a1d0473a5d56988058bcc8
 SHA512 
de6ee565f864080dfcf69ecdf832cebdabaa29d9f3dac1ad5f5928e664352aa3da4ed0ba5f2e634e3629f10eedbae9d1613ac3d3a13285fef846f7beabfa2f79
 DIST zfs-2.2.0-rc2.tar.gz 33657059 BLAKE2B 
efcac0a74ba3a0168eed868457cbc5c38572e4ed5653979d874d5c61ff9ee1ea474b4f7d8ef0df7e05e0e45e0802f2ad46fe54414af8d53375fb968fe6927757
 SHA512 
c509b8078907fb644c7a88b9ff386c16b6b72a1ee3156011887b98d93b57fe6bb73575c6de173ce7897d31c425c8f87ff3450091e3687ee5a8e1bebc15ecdd80
 DIST zfs-2.2.0-rc2.tar.gz.asc 195 BLAKE2B 
45ab6dbe068845643fef92f539f4fb1b312b41684768276a849806adb26a6a30a7f635c8050f9cd435aa5374c5fda229b2688f33b9171b63f5bb1d3028d5b955
 SHA512 
8d300fb013e495bb631f170606003154d6f3eaf630d7598e1ec83d0031e83c3de0166682522fbb287a7e860967e6b9e439ad81e115c1f6d4a27680ca90cf6dfd
+DIST zfs-2.2.0-rc3.tar.gz 3388 BLAKE2B 
37c47bcbf34d9238f42bbc80e2b0712a9e64a48196a390e30cfc02a510e0a8c28da5aa52eb3963a2363d2d23881628cadad13e2121cf54a0582cfc7d55685313
 SHA512 
d82991e6ff63910b38aa0d9b79fce19d1deb79a214adca4bec3fd468077674ef1de264b6f5b0acf9dc0418ce1ed4c9e98d1ad4596274a1769061ae20e017fb92
+DIST zfs-2.2.0-rc3.tar.gz.asc 195 BLAKE2B 
cbbced9255a3b6a5ec0190806b73e62533600975dad073b82532fb1e488bf81b8d056c7a4f59b9e212a9825ec4900d6f2e2c0141b3d4d58577fe36d9bc3c15b9
 SHA512 
45424815e39b33107805da737ecfcb95c761ab774143e72449dacfe98a851ddf52c7cb08a587548159305b4c4fe51a0fb9cfbf30fdadf093518eb4c8ce49e12c

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc3.ebuild
similarity index 99%
copy from sys-fs/zfs-kmod/zfs-kmod-.ebuild
copy to sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc3.ebuild
index 6e98cece951c..10ad3189457d 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc3.ebuild
@@ -8,7 +8,7 @@ inherit autotools dist-kernel-utils 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.3
+MODULES_KERNEL_MAX=6.4
 MODULES_KERNEL_MIN=3.10
 
 if [[ ${PV} ==  ]] ; then

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index 6e98cece951c..10ad3189457d 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -8,7 +8,7 @@ inherit autotools dist-kernel-utils 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.3
+MODULES_KERNEL_MAX=6.4
 MODULES_KERNEL_MIN=3.10
 
 if [[ ${PV} ==  ]] ; then

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-07-27 Thread Sam James

commit: b5fe4bf95d7506752dd43c3d219ebf61751881dd
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 28 01:26:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 28 01:26:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5fe4bf9

sys-fs/zfs-kmod: drop 2.2.0_rc1, 2.2.0_rc2

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest  |   4 -
 sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc1.ebuild | 217 --
 sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc2.ebuild | 217 --
 3 files changed, 438 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 36404e8fd024..34e7ed5dc0b4 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -4,9 +4,5 @@ DIST zfs-2.1.12.tar.gz 35155013 BLAKE2B 
652780e6bf7b63f45909110726d53795fada034f
 DIST zfs-2.1.12.tar.gz.asc 836 BLAKE2B 
9215e732981a82254115cd17ec3c9810d4e9e5d5f7bb848778848f911478fc2e4bdbfc563e9835a2e876c26d9e0e8755724a0995baf9ad24e9265123e10cfddf
 SHA512 
69c8b618947fd966eba0bba1c7326ddd463861f051a6cf1d06e23bd6d840fe7503f02adec2c3cbb203fa7b1cced51500f3689c224b653d13d227edd51b5a44f6
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B 
d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812
 SHA512 
a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 
1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486
 SHA512 
35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0
-DIST zfs-2.2.0-rc1.tar.gz 33656024 BLAKE2B 
1157db51d2736905b787a2627e599d7ac527be281edc9a76da0f746ae39483df3b4b8b31e5af504b9b06cd99a3776cd16670a8774d0e68f50014b09971209437
 SHA512 
22285ea1b34d4dbed311e3855449cad51c6f6ddb29c906f106fa6f4816d8e478f073b29fbc4d9636bf783558e041b20d2f2c5c0c33f65153d3b21da6cd9b7689
-DIST zfs-2.2.0-rc1.tar.gz.asc 195 BLAKE2B 
8df7d05729716ca75e8c975df92f8a1976b7712a3c98e3479582550e60bd97af77f80e9b72be094b57650948136ad8a9276e7d4ea0a1d0473a5d56988058bcc8
 SHA512 
de6ee565f864080dfcf69ecdf832cebdabaa29d9f3dac1ad5f5928e664352aa3da4ed0ba5f2e634e3629f10eedbae9d1613ac3d3a13285fef846f7beabfa2f79
-DIST zfs-2.2.0-rc2.tar.gz 33657059 BLAKE2B 
efcac0a74ba3a0168eed868457cbc5c38572e4ed5653979d874d5c61ff9ee1ea474b4f7d8ef0df7e05e0e45e0802f2ad46fe54414af8d53375fb968fe6927757
 SHA512 
c509b8078907fb644c7a88b9ff386c16b6b72a1ee3156011887b98d93b57fe6bb73575c6de173ce7897d31c425c8f87ff3450091e3687ee5a8e1bebc15ecdd80
-DIST zfs-2.2.0-rc2.tar.gz.asc 195 BLAKE2B 
45ab6dbe068845643fef92f539f4fb1b312b41684768276a849806adb26a6a30a7f635c8050f9cd435aa5374c5fda229b2688f33b9171b63f5bb1d3028d5b955
 SHA512 
8d300fb013e495bb631f170606003154d6f3eaf630d7598e1ec83d0031e83c3de0166682522fbb287a7e860967e6b9e439ad81e115c1f6d4a27680ca90cf6dfd
 DIST zfs-2.2.0-rc3.tar.gz 3388 BLAKE2B 
37c47bcbf34d9238f42bbc80e2b0712a9e64a48196a390e30cfc02a510e0a8c28da5aa52eb3963a2363d2d23881628cadad13e2121cf54a0582cfc7d55685313
 SHA512 
d82991e6ff63910b38aa0d9b79fce19d1deb79a214adca4bec3fd468077674ef1de264b6f5b0acf9dc0418ce1ed4c9e98d1ad4596274a1769061ae20e017fb92
 DIST zfs-2.2.0-rc3.tar.gz.asc 195 BLAKE2B 
cbbced9255a3b6a5ec0190806b73e62533600975dad073b82532fb1e488bf81b8d056c7a4f59b9e212a9825ec4900d6f2e2c0141b3d4d58577fe36d9bc3c15b9
 SHA512 
45424815e39b33107805da737ecfcb95c761ab774143e72449dacfe98a851ddf52c7cb08a587548159305b4c4fe51a0fb9cfbf30fdadf093518eb4c8ce49e12c

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc1.ebuild
deleted file mode 100644
index 6e98cece951c..
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools dist-kernel-utils 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.3
-MODULES_KERNEL_MIN=3.10
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
-   inherit git-r3
-   unset MODULES_KERNEL_MAX
-else
-   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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.
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-07-23 Thread Sam James

commit: 6274851aff68689645048af40bb9eed772ddf5e3
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 23 23:15:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 23 23:21:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6274851a

sys-fs/zfs-kmod: add 2.2.0_rc2

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest  |   2 +
 sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc2.ebuild | 217 ++
 2 files changed, 219 insertions(+)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 591c3082e3c1..c01ce1f71997 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -6,3 +6,5 @@ DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B 
d7553cc162687531b254089e29e2e15e2eb6b362c
 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 
1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486
 SHA512 
35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0
 DIST zfs-2.2.0-rc1.tar.gz 33656024 BLAKE2B 
1157db51d2736905b787a2627e599d7ac527be281edc9a76da0f746ae39483df3b4b8b31e5af504b9b06cd99a3776cd16670a8774d0e68f50014b09971209437
 SHA512 
22285ea1b34d4dbed311e3855449cad51c6f6ddb29c906f106fa6f4816d8e478f073b29fbc4d9636bf783558e041b20d2f2c5c0c33f65153d3b21da6cd9b7689
 DIST zfs-2.2.0-rc1.tar.gz.asc 195 BLAKE2B 
8df7d05729716ca75e8c975df92f8a1976b7712a3c98e3479582550e60bd97af77f80e9b72be094b57650948136ad8a9276e7d4ea0a1d0473a5d56988058bcc8
 SHA512 
de6ee565f864080dfcf69ecdf832cebdabaa29d9f3dac1ad5f5928e664352aa3da4ed0ba5f2e634e3629f10eedbae9d1613ac3d3a13285fef846f7beabfa2f79
+DIST zfs-2.2.0-rc2.tar.gz 33657059 BLAKE2B 
efcac0a74ba3a0168eed868457cbc5c38572e4ed5653979d874d5c61ff9ee1ea474b4f7d8ef0df7e05e0e45e0802f2ad46fe54414af8d53375fb968fe6927757
 SHA512 
c509b8078907fb644c7a88b9ff386c16b6b72a1ee3156011887b98d93b57fe6bb73575c6de173ce7897d31c425c8f87ff3450091e3687ee5a8e1bebc15ecdd80
+DIST zfs-2.2.0-rc2.tar.gz.asc 195 BLAKE2B 
45ab6dbe068845643fef92f539f4fb1b312b41684768276a849806adb26a6a30a7f635c8050f9cd435aa5374c5fda229b2688f33b9171b63f5bb1d3028d5b955
 SHA512 
8d300fb013e495bb631f170606003154d6f3eaf630d7598e1ec83d0031e83c3de0166682522fbb287a7e860967e6b9e439ad81e115c1f6d4a27680ca90cf6dfd

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc2.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc2.ebuild
new file mode 100644
index ..6e98cece951c
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc2.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils 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.3
+MODULES_KERNEL_MIN=3.10
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
+   inherit git-r3
+   unset MODULES_KERNEL_MAX
+else
+   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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 ~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} !=  ]] ; then
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+
+   IUSE+=" +dist-kernel-cap"
+   RDEPEND="
+   dist-kernel-cap? ( dist-kernel? (
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/

2023-07-04 Thread Conrad Kostecki

commit: 8f8f5aa6c09915bf646550fde077b06c97891971
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Jul  4 09:58:19 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Jul  4 22:16:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8f5aa6

sys-fs/zfs-kmod: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31737
Signed-off-by: Conrad Kostecki  gentoo.org>

 sys-fs/zfs-kmod/files/zfs-kmod-2.1.6-fgrep.patch | 53 
 1 file changed, 53 deletions(-)

diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-2.1.6-fgrep.patch 
b/sys-fs/zfs-kmod/files/zfs-kmod-2.1.6-fgrep.patch
deleted file mode 100644
index 2e47c5bcc093..
--- a/sys-fs/zfs-kmod/files/zfs-kmod-2.1.6-fgrep.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://github.com/openzfs/zfs/commit/d30577c9dd811688f2609ad532b011b99bceb485
-
-From d30577c9dd811688f2609ad532b011b99bceb485 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= 
-Date: Sat, 12 Mar 2022 00:26:46 +0100
-Subject: [PATCH] fgrep -> grep -F
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Brian Behlendorf 
-Reviewed-by: John Kennedy 
-Reviewed-by: Ryan Moeller 
-Signed-off-by: Ahelenia Ziemiańska 
-Closes #13259
 a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -394,11 +394,11 @@ AC_DEFUN([ZFS_AC_KERNEL], [
-   utsrelease1=$kernelbuild/include/linux/version.h
-   utsrelease2=$kernelbuild/include/linux/utsrelease.h
-   utsrelease3=$kernelbuild/include/generated/utsrelease.h
--  AS_IF([test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1], [
-+  AS_IF([test -r $utsrelease1 && grep -qF UTS_RELEASE $utsrelease1], [
-   utsrelease=$utsrelease1
--  ], [test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2], [
-+  ], [test -r $utsrelease2 && grep -qF UTS_RELEASE $utsrelease2], [
-   utsrelease=$utsrelease2
--  ], [test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3], [
-+  ], [test -r $utsrelease3 && grep -qF UTS_RELEASE $utsrelease3], [
-   utsrelease=$utsrelease3
-   ])
- 
 a/config/zfs-build.m4
-+++ b/config/zfs-build.m4
-@@ -173,7 +173,7 @@ AC_DEFUN([ZFS_AC_DEBUG_KMEM_TRACKING], [
- ])
- 
- AC_DEFUN([ZFS_AC_DEBUG_INVARIANTS_DETECT_FREEBSD], [
--  AS_IF([sysctl -n kern.conftxt | fgrep -qx $'options\tINVARIANTS'],
-+  AS_IF([sysctl -n kern.conftxt | grep -Fqx $'options\tINVARIANTS'],
-   [enable_invariants="yes"],
-   [enable_invariants="no"])
- ])
 a/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
-+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
-@@ -120,5 +120,5 @@ function check_while_waiting
- # Whether any vdev in the given pool is initializing
- function is_vdev_initializing # pool
- {
--  zpool status -i "$1" | grep 'initialized, started' >/dev/null
-+  zpool status -i "$1" | grep -q 'initialized, started'
- }
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/, sys-fs/zfs-kmod/files/

2023-07-03 Thread Sam James

commit: fc34e770d935ffee16256ea1d8b616dbd20bd1c6
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul  3 21:01:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  3 21:01:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc34e770

sys-fs/zfs-kmod: drop 2.1.7, 2.1.10-r1

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest   |   4 -
 ...IOC_COUNT_FILLED-does-unnecessary-txg_wai.patch |  67 ---
 .../files/2.1.7-ppc64-ieee128-compat.patch | 217 
 sys-fs/zfs-kmod/zfs-kmod-2.1.10-r1.ebuild  | 217 
 sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild  | 219 -
 5 files changed, 724 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index c2835e7dc8d2..591c3082e3c1 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,11 +1,7 @@
-DIST zfs-2.1.10.tar.gz 35101856 BLAKE2B 
5b1a17d192097f5eab1ef3192217fa34b276b6f344a5114a5411be43208616ac682ae2129ae9da15b4ba6207171ae82140f823041a8067441459d51d994df271
 SHA512 
3189c6f822c7b6caba650a43f321114ef0bd42b72f566c44ba245c61cc3d420149a72520aed5b94494c51c35629a6f645273941774d964f2b61c31c366b2
-DIST zfs-2.1.10.tar.gz.asc 836 BLAKE2B 
5a6b408932cb4f39f5a226598527115aa4fa6c105c8b8ad9f236a5909a948150db712bb1f35e4e16a2b7fc7e434530f93c6a6cd2aab40d628b1ded9891694578
 SHA512 
a45bcce13e7261f90feda51a131fa0c86e2d3c2711286a462072fb120ccbc85719c2bbecb441147a057accffb841ca82df0ba65e1abc0ece9dea8a97cfa31af5
 DIST zfs-2.1.11.tar.gz 35100716 BLAKE2B 
991ac2347bcd452812e247358e2c44a04a88e700d25878b5b95f86939e6114e1205e7afabfd2a1ea9220947876511374d7224aa587d3d66184838d705f71a89a
 SHA512 
335a543644d2dbba919213a28cc5922bf6a118fc19069db84562ce056449a2d6ca4ba827e54f304ab7d9be22260aa9b255134f1b12e2bc98890f757f35e48bd7
 DIST zfs-2.1.11.tar.gz.asc 836 BLAKE2B 
0b904d8e1de2dd08a377efc94e32862192d6b9ccb8628af058a71b3ea51f5e483e0cf527906cd222fe9b41b28ca0b30b0efa07d97c480e5546f6e2bed8cbcb01
 SHA512 
7329e62012ba64288345d8959611de82502ef1da4020e215462fbb2ed209413ec8638d211a31dd6e70be71c998f1da1d8a0d19e5df1f2778782ebb988c94aa41
 DIST zfs-2.1.12.tar.gz 35155013 BLAKE2B 
652780e6bf7b63f45909110726d53795fada034f6044c8393fa3980e30217ada6931e3c2bb57210719e3c78c16f973f69287b7e2b475601f4ce12d701d9d96ae
 SHA512 
f48493a21883e441cda705fb085353bed033f1620a1d0f93069c345c76cf2c0759a2e6f7a80c47c9398e9878abfe1d90d931fe5ceaf2588770a71491a434631e
 DIST zfs-2.1.12.tar.gz.asc 836 BLAKE2B 
9215e732981a82254115cd17ec3c9810d4e9e5d5f7bb848778848f911478fc2e4bdbfc563e9835a2e876c26d9e0e8755724a0995baf9ad24e9265123e10cfddf
 SHA512 
69c8b618947fd966eba0bba1c7326ddd463861f051a6cf1d06e23bd6d840fe7503f02adec2c3cbb203fa7b1cced51500f3689c224b653d13d227edd51b5a44f6
-DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 
9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad
 SHA512 
6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
-DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 
648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948
 SHA512 
4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B 
d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812
 SHA512 
a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 
1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486
 SHA512 
35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0
 DIST zfs-2.2.0-rc1.tar.gz 33656024 BLAKE2B 
1157db51d2736905b787a2627e599d7ac527be281edc9a76da0f746ae39483df3b4b8b31e5af504b9b06cd99a3776cd16670a8774d0e68f50014b09971209437
 SHA512 
22285ea1b34d4dbed311e3855449cad51c6f6ddb29c906f106fa6f4816d8e478f073b29fbc4d9636bf783558e041b20d2f2c5c0c33f65153d3b21da6cd9b7689

diff --git 
a/sys-fs/zfs-kmod/files/2.1.10-Revert-ZFS_IOC_COUNT_FILLED-does-unnecessary-txg_wai.patch
 
b/sys-fs/zfs-kmod/files/2.1.10-Revert-ZFS_IOC_COUNT_FILLED-does-unnecessary-txg_wai.patch
deleted file mode 100644
index 150d1b5145d9..
--- 
a/sys-fs/zfs-kmod/files/2.1.10-Revert-ZFS_IOC_COUNT_FILLED-does-unnecessary-txg_wai.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From ac6b8f40981cb9328c22a3485e1a4b060ea89b1e Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Sun, 16 Apr 2023 04:49:04 +0100
-Subject: [PATCH] Revert "ZFS_IOC_COUNT_FILLED does unnecessary
- txg_wait_synced()"
-
-This reverts commit

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-07-03 Thread Sam James

commit: e935abbbc0034a2c8df073912d91fb26ff6584a9
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul  3 20:59:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  3 20:59:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e935abbb

sys-fs/zfs-kmod: add 2.2.0_rc1 (unkeyworded)

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest  | 2 ++
 .../zfs-kmod/{zfs-kmod-.ebuild => zfs-kmod-2.2.0_rc1.ebuild}  | 8 
 sys-fs/zfs-kmod/zfs-kmod-.ebuild  | 8 
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 9f12bf8dd950..c2835e7dc8d2 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -8,3 +8,5 @@ DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 
9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e81
 DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 
648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948
 SHA512 
4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B 
d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812
 SHA512 
a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 
1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486
 SHA512 
35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0
+DIST zfs-2.2.0-rc1.tar.gz 33656024 BLAKE2B 
1157db51d2736905b787a2627e599d7ac527be281edc9a76da0f746ae39483df3b4b8b31e5af504b9b06cd99a3776cd16670a8774d0e68f50014b09971209437
 SHA512 
22285ea1b34d4dbed311e3855449cad51c6f6ddb29c906f106fa6f4816d8e478f073b29fbc4d9636bf783558e041b20d2f2c5c0c33f65153d3b21da6cd9b7689
+DIST zfs-2.2.0-rc1.tar.gz.asc 195 BLAKE2B 
8df7d05729716ca75e8c975df92f8a1976b7712a3c98e3479582550e60bd97af77f80e9b72be094b57650948136ad8a9276e7d4ea0a1d0473a5d56988058bcc8
 SHA512 
de6ee565f864080dfcf69ecdf832cebdabaa29d9f3dac1ad5f5928e664352aa3da4ed0ba5f2e634e3629f10eedbae9d1613ac3d3a13285fef846f7beabfa2f79

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc1.ebuild
similarity index 97%
copy from sys-fs/zfs-kmod/zfs-kmod-.ebuild
copy to sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc1.ebuild
index 0c5bfab161cc..6e98cece951c 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.0_rc1.ebuild
@@ -22,7 +22,7 @@ else
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-${PV%_rc?}"
+   S="${WORKDIR}/zfs-${MY_PV}"
 
ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}"
# Increments minor eg 5.14 -> 5.15, and still supports override.
@@ -40,8 +40,8 @@ IUSE="custom-cflags debug +rootfs"
 RESTRICT="test"
 
 BDEPEND="
-   dev-lang/perl
app-alternatives/awk
+   dev-lang/perl
 "
 
 if [[ ${PV} !=  ]] ; then
@@ -183,10 +183,10 @@ _old_layout_cleanup() {
 }
 
 pkg_postinst() {
-   # check for old module layout before doing anything else.
+   # 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.
+   # 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
 

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index 0c5bfab161cc..6e98cece951c 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -22,7 +22,7 @@ else
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-${PV%_rc?}"
+   S="${WORKDIR}/zfs-${MY_PV}"
 
ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}"
# Increments minor eg 5.14 -> 5.15, and still supports override.
@@ -40,8 +40,8 @@ IUSE="custom-cflags debug +rootfs"
 RESTRICT="test"
 
 BDEPEND="
-   dev-lang/perl

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-06-07 Thread Sam James

commit: 9eea962b6f1c889ed86f814c99e7f415ae3f452a
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun  7 09:42:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun  7 09:46:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eea962b

sys-fs/zfs-kmod: add 2.1.12

Closes: https://bugs.gentoo.org/905438
Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest   |  2 ++
 ...zfs-kmod-.ebuild => zfs-kmod-2.1.12.ebuild} | 42 +-
 sys-fs/zfs-kmod/zfs-kmod-.ebuild   |  2 +-
 3 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index b97d975dd517..9f12bf8dd950 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -2,6 +2,8 @@ DIST zfs-2.1.10.tar.gz 35101856 BLAKE2B 
5b1a17d192097f5eab1ef3192217fa34b276b6f3
 DIST zfs-2.1.10.tar.gz.asc 836 BLAKE2B 
5a6b408932cb4f39f5a226598527115aa4fa6c105c8b8ad9f236a5909a948150db712bb1f35e4e16a2b7fc7e434530f93c6a6cd2aab40d628b1ded9891694578
 SHA512 
a45bcce13e7261f90feda51a131fa0c86e2d3c2711286a462072fb120ccbc85719c2bbecb441147a057accffb841ca82df0ba65e1abc0ece9dea8a97cfa31af5
 DIST zfs-2.1.11.tar.gz 35100716 BLAKE2B 
991ac2347bcd452812e247358e2c44a04a88e700d25878b5b95f86939e6114e1205e7afabfd2a1ea9220947876511374d7224aa587d3d66184838d705f71a89a
 SHA512 
335a543644d2dbba919213a28cc5922bf6a118fc19069db84562ce056449a2d6ca4ba827e54f304ab7d9be22260aa9b255134f1b12e2bc98890f757f35e48bd7
 DIST zfs-2.1.11.tar.gz.asc 836 BLAKE2B 
0b904d8e1de2dd08a377efc94e32862192d6b9ccb8628af058a71b3ea51f5e483e0cf527906cd222fe9b41b28ca0b30b0efa07d97c480e5546f6e2bed8cbcb01
 SHA512 
7329e62012ba64288345d8959611de82502ef1da4020e215462fbb2ed209413ec8638d211a31dd6e70be71c998f1da1d8a0d19e5df1f2778782ebb988c94aa41
+DIST zfs-2.1.12.tar.gz 35155013 BLAKE2B 
652780e6bf7b63f45909110726d53795fada034f6044c8393fa3980e30217ada6931e3c2bb57210719e3c78c16f973f69287b7e2b475601f4ce12d701d9d96ae
 SHA512 
f48493a21883e441cda705fb085353bed033f1620a1d0f93069c345c76cf2c0759a2e6f7a80c47c9398e9878abfe1d90d931fe5ceaf2588770a71491a434631e
+DIST zfs-2.1.12.tar.gz.asc 836 BLAKE2B 
9215e732981a82254115cd17ec3c9810d4e9e5d5f7bb848778848f911478fc2e4bdbfc563e9835a2e876c26d9e0e8755724a0995baf9ad24e9265123e10cfddf
 SHA512 
69c8b618947fd966eba0bba1c7326ddd463861f051a6cf1d06e23bd6d840fe7503f02adec2c3cbb203fa7b1cced51500f3689c224b653d13d227edd51b5a44f6
 DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 
9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad
 SHA512 
6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
 DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 
648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948
 SHA512 
4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B 
d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812
 SHA512 
a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild
similarity index 77%
copy from sys-fs/zfs-kmod/zfs-kmod-.ebuild
copy to sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild
index 5727676398f5..1b4db3530a72 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.12.ebuild
@@ -8,7 +8,7 @@ inherit autotools dist-kernel-utils 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.2
+MODULES_KERNEL_MAX=6.3
 MODULES_KERNEL_MIN=3.10
 
 if [[ ${PV} ==  ]] ; then
@@ -149,47 +149,7 @@ src_install() {
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},

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-05-30 Thread Sam James

commit: 6482def6b8a1bbfec5c3440eaa8cce628a9a5eb8
Author: Sam James  gentoo  org>
AuthorDate: Wed May 31 02:55:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 31 02:55:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6482def6

sys-fs/zfs-kmod: restore die-hard if kernel exceeds supported maximum

We ended up discussing the limit and gyakovlev feels strongly about keeping it,
which is fine by me (was on the fence/unsure).

So:
* Put back the hard die for too-new kernels unless ZFS_KERNEL_COMPAT_OVERRIDE 
is set.
* Keep dist-kernel-cap (at least for now?) to allow people who *do* override
to get the nice convenient rebuilds.

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild | 22 ++
 sys-fs/zfs-kmod/zfs-kmod-.ebuild  | 22 ++
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild
index cd38e7bd2037..7bf3ebaec2e0 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild
@@ -12,18 +12,22 @@ MODULES_KERNEL_MAX=6.2
 MODULES_KERNEL_MIN=3.10
 
 if [[ ${PV} ==  ]] ; then
-   inherit git-r3
EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
+   inherit git-r3
unset MODULES_KERNEL_MAX
 else
+   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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-${PV%_rc?}"
-   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
+
+   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 ~ppc64 ~riscv ~sparc"
@@ -46,7 +50,7 @@ if [[ ${PV} !=  ]] ; then
IUSE+=" +dist-kernel-cap"
RDEPEND="
dist-kernel-cap? ( dist-kernel? (
-   https://github.com/openzfs/zfs.git;
+   inherit git-r3
unset MODULES_KERNEL_MAX
 else
+   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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-${PV%_rc?}"
-   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
+
+   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 ~ppc64 ~riscv ~sparc"
@@ -46,7 +50,7 @@ if [[ ${PV} !=  ]] ; then
IUSE+=" +dist-kernel-cap"
RDEPEND="
dist-kernel-cap? ( dist-kernel? (
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-05-30 Thread Arthur Zamarin

commit: b551cc7f58ebc94e245fb0d59ce6a30bc8c31792
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May 30 11:23:32 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May 30 11:23:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b551cc7f

sys-fs/zfs-kmod: Stabilize 2.1.11 amd64, #907393

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild
index 8f9eaa5b452c..2e8ab39bb2d3 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild
@@ -26,7 +26,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]]; then
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-05-29 Thread Sam James

commit: 1b0b98a5615b84018cc7af5c47206fc4f7d64c9a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed May 24 16:33:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 30 02:51:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b0b98a5

sys-fs/zfs-kmod: further linux-mod-r1 adaptations & style tweaks

Just meant to integrate MODULES_KERNEL_MIN+MAX ended up making quick
changes to my liking while at it. Thus the separate commit (also is
barely tested changes). Probably can still use polishing.

MAX is non-fatal, but gives a very large warning that is hard to miss,
imo removing the need for a hidden override variable. Made optional
for dist-kernel through another USE so people can still get automated
rebuilds if they e.g. patched it (pondered adding a similar mechanism
builtin the eclass but believe too few ebuilds really need this and
don't want to encourage it globally unless really needed).

wrt https://bugs.gentoo.org/814194
Bug: https://bugs.gentoo.org/865157
Signed-off-by: Ionen Wolkens  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/metadata.xml  |   1 +
 sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild | 106 ++
 2 files changed, 37 insertions(+), 70 deletions(-)

diff --git a/sys-fs/zfs-kmod/metadata.xml b/sys-fs/zfs-kmod/metadata.xml
index 936f4ff82c8e..7e27782c6aeb 100644
--- a/sys-fs/zfs-kmod/metadata.xml
+++ b/sys-fs/zfs-kmod/metadata.xml
@@ -10,6 +10,7 @@
Sam James


+   Prevents upgrading to an 
unsupported kernel version when combined with USE=dist-kernel
Pull dependencies and check kernel options 
required for root-on-zfs



diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild
index 146556170e08..cd38e7bd2037 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild
@@ -8,24 +8,24 @@ inherit autotools dist-kernel-utils flag-o-matic linux-mod-r1 
multiprocessing
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="https://github.com/openzfs/zfs;
 
-if [[ ${PV} == "" ]]; then
+MODULES_KERNEL_MAX=6.2
+MODULES_KERNEL_MIN=3.10
+
+if [[ ${PV} ==  ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
+   unset MODULES_KERNEL_MAX
 else
-   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
inherit verify-sig
 
-   MY_PV="${PV/_rc/-rc}"
+   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-${PV%_rc?}"
-   ZFS_KERNEL_COMPAT="6.2"
-
-   # 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))"
+   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
 
-   if [[ ${PV} != *_rc* ]]; then
+   if [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
fi
 fi
@@ -33,33 +33,27 @@ fi
 LICENSE="CDDL MIT debug? ( GPL-2+ )"
 SLOT="0/${PVR}"
 IUSE="custom-cflags debug +rootfs"
-
-RDEPEND="${DEPEND}"
+RESTRICT="test"
 
 BDEPEND="
dev-lang/perl
app-alternatives/awk
 "
 
-# we want dist-kernel block in BDEPEND because of portage resolver.
-# since linux-mod.eclass already sets version-unbounded dep, portage
-# will pull new versions. So we set it in BDEPEND which takes priority.
-# and we don't need in in git ebuild.
-if [[ ${PV} != "" ]] ; then
-   BDEPEND+="
-   verify-sig? ( sec-keys/openpgp-keys-openzfs )
-   dist-kernel? (

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/, sys-fs/zfs-kmod/files/

2023-05-29 Thread Sam James

commit: 7b66ebce8f979c5dfc190070c22745b7aa375cc3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed May 24 00:03:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 30 02:50:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b66ebce

sys-fs/zfs-kmod: migrate to linux-mod-r1

(sam: Taking ionen's PoC conversion and committing it after testing.)

Closes: https://bugs.gentoo.org/814194
Closes: https://bugs.gentoo.org/865157
Signed-off-by: Ionen Wolkens  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/files/zfs-kmod-2.1.11-gentoo.patch |  24 +++
 sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild  | 197 +
 2 files changed, 221 insertions(+)

diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-2.1.11-gentoo.patch 
b/sys-fs/zfs-kmod/files/zfs-kmod-2.1.11-gentoo.patch
new file mode 100644
index ..53c5f27b3bed
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-2.1.11-gentoo.patch
@@ -0,0 +1,24 @@
+Hack to pass the full linux-mod-r1 toolchain to make during ./configure.
+Not needed at build time given can pass it normally then.
+
+Eclass has workarounds, compiler/version matching, and its own set of
+user variables which creates disparity between ebuilds if not used.
+
+For the (normal) alternative: KERNEL_{CC,LD} alone is insufficient,
+but combining with KERNEL_LLVM=1 when CC_IS_CLANG will allow it
+to work for *most* people (will likely still need KERNEL_LD from
+linux-mod-r1, or ThinLTO kernels may fail with sandbox violations).
+
+Note KERNEL_* also cause failure if they contain spaces.
+
+https://bugs.gentoo.org/865157
+--- a/config/kernel.m4
 b/config/kernel.m4
+@@ -646,6 +646,5 @@
+   AC_TRY_COMMAND([
+   KBUILD_MODPOST_NOFINAL="$5" KBUILD_MODPOST_WARN="$6"
+-  make modules -k -j$TEST_JOBS ${KERNEL_CC:+CC=$KERNEL_CC}
+-  ${KERNEL_LD:+LD=$KERNEL_LD} ${KERNEL_LLVM:+LLVM=$KERNEL_LLVM}
++  make modules -k -j$TEST_JOBS '${GENTOO_MAKEARGS_EVAL}'
+   CONFIG_MODULES=y CFLAGS_MODULE=-DCONFIG_MODULES
+   -C $LINUX_OBJ $ARCH_UM M=$PWD/$1 >$1/build.log 2>&1])

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild
new file mode 100644
index ..146556170e08
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils flag-o-matic linux-mod-r1 multiprocessing
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs;
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/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-${PV%_rc?}"
+   ZFS_KERNEL_COMPAT="6.2"
+
+   # 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 ~ppc64 ~riscv ~sparc"
+   fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+   dev-lang/perl
+   app-alternatives/awk
+"
+
+# we want dist-kernel block in BDEPEND because of portage resolver.
+# since linux-mod.eclass already sets version-unbounded dep, portage
+# will pull new versions. So we set it in BDEPEND which takes priority.
+# and we don't need in in git ebuild.
+if [[ ${PV} != "" ]] ; then
+   BDEPEND+="
+   verify-sig? ( sec-keys/openpgp-keys-openzfs )
+   dist-kernel? (

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-05-29 Thread Sam James

commit: daa1294b8328bec24e5ef525bf60be71bbab0f15
Author: Sam James  gentoo  org>
AuthorDate: Tue May 30 02:40:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 30 02:51:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daa1294b

sys-fs/zfs-kmod: sync live

Bug: https://bugs.gentoo.org/814194
Bug: https://bugs.gentoo.org/865157
Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-.ebuild | 141 +--
 1 file changed, 51 insertions(+), 90 deletions(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index 1df8508ad03d..82ac6d7c464a 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -3,29 +3,29 @@
 
 EAPI=8
 
-inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
+inherit autotools dist-kernel-utils flag-o-matic linux-mod-r1 multiprocessing
 
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="https://github.com/openzfs/zfs;
 
-if [[ ${PV} == "" ]]; then
+MODULES_KERNEL_MAX=6.2
+MODULES_KERNEL_MIN=3.10
+
+if [[ ${PV} ==  ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
+   unset MODULES_KERNEL_MAX
 else
-   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
inherit verify-sig
 
-   MY_PV="${PV/_rc/-rc}"
+   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-${PV%_rc?}"
-   ZFS_KERNEL_COMPAT="6.2"
-
-   # 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))"
+   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
 
-   if [[ ${PV} != *_rc* ]]; then
+   if [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
fi
 fi
@@ -33,32 +33,30 @@ fi
 LICENSE="CDDL MIT debug? ( GPL-2+ )"
 SLOT="0/${PVR}"
 IUSE="custom-cflags debug +rootfs"
-
-RDEPEND="${DEPEND}"
+RESTRICT="test"
 
 BDEPEND="
dev-lang/perl
app-alternatives/awk
 "
 
-# we want dist-kernel block in BDEPEND because of portage resolver.
-# since linux-mod.eclass already sets version-unbounded dep, portage
-# will pull new versions. So we set it in BDEPEND which takes priority.
-# and we don't need in in git ebuild.
-if [[ ${PV} != "" ]] ; then
-   BDEPEND+="
-   verify-sig? ( sec-keys/openpgp-keys-openzfs )
-   dist-kernel? ( https://bugs.gentoo.org/811600
-   export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
-
local myconf=(
-   HOSTCC="$(tc-getBUILD_CC)"
-   --bindir="${EPREFIX}/bin"
-   --sbindir="${EPREFIX}/sbin"
+   --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() {
-   set_arch_to_kernel
-
-   myemakeargs=(
-   HOSTCC="$(tc-getBUILD_CC)"
-   V=1
-   )
-
-   emake "${myemakeargs[@]}"
+   emake "${MODULES_MAKEARGS[@]}"
 }
 
 src_install() {
-   set_arch_to_kernel
+   emake "${MODULES_MAKEARGS[@]}" DESTDIR="${ED}" install
+   modules_post_process
 
-   myemakeargs+=(
-   DEPMOD=:
-   # INSTALL_MOD_PATH ?= $(DESTDIR) in module/Makefile
-   DESTDIR="${D}"
-   )
-
-   emake "${myemakeargs[@]}" install
-
-   einstalldocs
+   dodoc AUTHORS COPYRIGHT META README.md
 }
 
 _old_layout_cleanup() {
@@ -190,7 +151,7 @@ _old_layout_cleanup() {
 
# kernel/module/Kconfig contains possible compressed extentions.
local kext kextfiles
-   for kext in .ko{,.{gz,xz,zst}}; do
+   for kext in .ko{,.{gz,xz,zst}}; do
kextfiles+=( "${olddir[@]/%/${kext}}" )
done
 
@@ -214,19 +175,19 @@ pkg_postinst() {
# 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_pkg_postinst
 
-   if [[ -z ${ROOT} ]] && use dist-kernel; then
-   set_arch_to_pkgmgr
+   linux-mod-r1_pkg_postinst
+
+   if [[ -z ${ROOT} ]] && use dist-kernel ; then

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-04-20 Thread Sam James

commit: 4dc24ee00b2f095257a74d0ca6f67589644ec3c5
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 20 16:06:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 20 16:06:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dc24ee0

sys-fs/zfs-kmod: add 2.1.11

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest   |   2 +
 sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild | 212 +
 2 files changed, 214 insertions(+)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index f9fe2b0c0c22..b97d975dd517 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,5 +1,7 @@
 DIST zfs-2.1.10.tar.gz 35101856 BLAKE2B 
5b1a17d192097f5eab1ef3192217fa34b276b6f344a5114a5411be43208616ac682ae2129ae9da15b4ba6207171ae82140f823041a8067441459d51d994df271
 SHA512 
3189c6f822c7b6caba650a43f321114ef0bd42b72f566c44ba245c61cc3d420149a72520aed5b94494c51c35629a6f645273941774d964f2b61c31c366b2
 DIST zfs-2.1.10.tar.gz.asc 836 BLAKE2B 
5a6b408932cb4f39f5a226598527115aa4fa6c105c8b8ad9f236a5909a948150db712bb1f35e4e16a2b7fc7e434530f93c6a6cd2aab40d628b1ded9891694578
 SHA512 
a45bcce13e7261f90feda51a131fa0c86e2d3c2711286a462072fb120ccbc85719c2bbecb441147a057accffb841ca82df0ba65e1abc0ece9dea8a97cfa31af5
+DIST zfs-2.1.11.tar.gz 35100716 BLAKE2B 
991ac2347bcd452812e247358e2c44a04a88e700d25878b5b95f86939e6114e1205e7afabfd2a1ea9220947876511374d7224aa587d3d66184838d705f71a89a
 SHA512 
335a543644d2dbba919213a28cc5922bf6a118fc19069db84562ce056449a2d6ca4ba827e54f304ab7d9be22260aa9b255134f1b12e2bc98890f757f35e48bd7
+DIST zfs-2.1.11.tar.gz.asc 836 BLAKE2B 
0b904d8e1de2dd08a377efc94e32862192d6b9ccb8628af058a71b3ea51f5e483e0cf527906cd222fe9b41b28ca0b30b0efa07d97c480e5546f6e2bed8cbcb01
 SHA512 
7329e62012ba64288345d8959611de82502ef1da4020e215462fbb2ed209413ec8638d211a31dd6e70be71c998f1da1d8a0d19e5df1f2778782ebb988c94aa41
 DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 
9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad
 SHA512 
6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
 DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 
648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948
 SHA512 
4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B 
d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812
 SHA512 
a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild
new file mode 100644
index ..8f9eaa5b452c
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs;
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/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-${PV%_rc?}"
+   ZFS_KERNEL_COMPAT="6.2"
+
+   # 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 ~ppc64 ~riscv ~sparc"
+   fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+   dev-lang/perl
+   app-alternatives/awk
+"
+
+# we want dist-kernel block in BDEPEND because of portage resolver.
+# since linux-mod.eclass already sets version-unbounded dep, portage
+# will pull new versions. So we set it in BDEPEND which takes priority.
+# and we don't need in in git ebuild.
+if [[ ${PV} != "" ]] ; then
+   BDEPEND+="
+   verify-sig? ( sec-keys/openpgp-keys-openzfs )
+   dist-kernel? ( https://bugs.gentoo.org/811600
+   export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
+
+   local myconf=(
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/, profiles/, sys-fs/zfs-kmod/files/

2023-04-15 Thread Sam James

commit: a64fff9b8106dec5affc6a9e82bb9cbbb1fe6fec
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 16 03:57:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 16 04:00:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64fff9b

sys-fs/zfs-kmod: revert patch causing SEEK_HOLE corruption (again)

This reverts commit 4b3133e671b958fa2c915a4faf57812820124a7b upstream.

See #14753 - possible corruption again, very similar symptoms to the
nightmare that was #11900 and same area of code.

We can safely revert it as it's an optimisation rather than a bugfix
in itself.

Keen Gentoo users may remember the following commits (in Gentoo):
- 8e5626dc90e4e6166c2e296371b6ff5a9d13a8c4
- 9fb275f656de639e25acc9497b70b4cae593d35d
- 95c250a3f3986b2bc2091dd3981ff1e1d3de0c73

Bug: https://github.com/openzfs/zfs/issues/14753
Bug: https://github.com/openzfs/zfs/issues/11900
Signed-off-by: Sam James  gentoo.org>

 profiles/package.mask  |  5 ++
 ...IOC_COUNT_FILLED-does-unnecessary-txg_wai.patch | 67 ++
 ...mod-2.1.10.ebuild => zfs-kmod-2.1.10-r1.ebuild} |  5 ++
 3 files changed, 77 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index d2367486b2b3..0f9d33d0dd71 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James  (2023-04-16)
+# SEEK_HOLE issues causing corruption with (sparse?) copies again.
+# See https://github.com/openzfs/zfs/issues/14753.
+=sys-fs/zfs-kmod-2.1.10
+
 # Sam James  (2023-04-16)
 # OpenRC is broken with this version, but the issue is on OpenRC's side
 # and needs to be fixed there. bug #904277

diff --git 
a/sys-fs/zfs-kmod/files/2.1.10-Revert-ZFS_IOC_COUNT_FILLED-does-unnecessary-txg_wai.patch
 
b/sys-fs/zfs-kmod/files/2.1.10-Revert-ZFS_IOC_COUNT_FILLED-does-unnecessary-txg_wai.patch
new file mode 100644
index ..150d1b5145d9
--- /dev/null
+++ 
b/sys-fs/zfs-kmod/files/2.1.10-Revert-ZFS_IOC_COUNT_FILLED-does-unnecessary-txg_wai.patch
@@ -0,0 +1,67 @@
+From ac6b8f40981cb9328c22a3485e1a4b060ea89b1e Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sun, 16 Apr 2023 04:49:04 +0100
+Subject: [PATCH] Revert "ZFS_IOC_COUNT_FILLED does unnecessary
+ txg_wait_synced()"
+
+This reverts commit 4b3133e671b958fa2c915a4faf57812820124a7b.
+
+See #14753 - possible corruption again, very similar symptoms to the
+nightmare that was #11900 and same area of code.
+
+We can safely revert it as it's an optimisation rather than a bugfix
+in itself.
+
+Bug: https://github.com/openzfs/zfs/issues/14753
+Bug: https://github.com/openzfs/zfs/issues/11900
+Signed-off-by: Sam James 
+--- a/module/zfs/dnode.c
 b/module/zfs/dnode.c
+@@ -1773,29 +1773,20 @@ dnode_try_claim(objset_t *os, uint64_t object, int 
slots)
+ }
+ 
+ /*
+- * Checks if the dnode might contain any uncommitted changes to data blocks.
+- * Dirty metadata (e.g. bonus buffer) does not count.
++ * Checks if the dnode contains any uncommitted dirty records.
+  */
+ boolean_t
+ dnode_is_dirty(dnode_t *dn)
+ {
+   mutex_enter(>dn_mtx);
++
+   for (int i = 0; i < TXG_SIZE; i++) {
+-  list_t *list = >dn_dirty_records[i];
+-  for (dbuf_dirty_record_t *dr = list_head(list);
+-  dr != NULL; dr = list_next(list, dr)) {
+-  if (dr->dr_dbuf == NULL ||
+-  (dr->dr_dbuf->db_blkid != DMU_BONUS_BLKID &&
+-  dr->dr_dbuf->db_blkid != DMU_SPILL_BLKID)) {
+-  mutex_exit(>dn_mtx);
+-  return (B_TRUE);
+-  }
+-  }
+-  if (dn->dn_free_ranges[i] != NULL) {
++  if (multilist_link_active(>dn_dirty_link[i])) {
+   mutex_exit(>dn_mtx);
+   return (B_TRUE);
+   }
+   }
++
+   mutex_exit(>dn_mtx);
+ 
+   return (B_FALSE);
+@@ -2667,9 +2658,7 @@ dnode_next_offset(dnode_t *dn, int flags, uint64_t 
*offset,
+   rw_enter(>dn_struct_rwlock, RW_READER);
+ 
+   if (dn->dn_phys->dn_nlevels == 0) {
+-  if (!(flags & DNODE_FIND_HOLE)) {
+-  error = SET_ERROR(ESRCH);
+-  }
++  error = SET_ERROR(ESRCH);
+   goto out;
+   }
+ 
+-- 
+2.40.0
+

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.10.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.10-r1.ebuild
similarity index 97%
rename from sys-fs/zfs-kmod/zfs-kmod-2.1.10.ebuild
rename to sys-fs/zfs-kmod/zfs-kmod-2.1.10-r1.ebuild
index 8f9eaa5b452c..bd0070f85ad1 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.10.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.10-r1.ebuild
@@ -60,6 +60,11 @@ RESTRICT="debug? ( strip ) test"
 
 DOCS=( AUTHORS COPYRIGHT META README.md )
 
+PATCHES=(
+   # https://github.com/openzfs/zfs/issues/14753
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-04-14 Thread Sam James

commit: 625f80f0c9131f6633cb6a00c660129a7cb42cef
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 15 00:07:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 15 00:07:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625f80f0

sys-fs/zfs-kmod: sync live ZFS_KERNEL_COMPAT (noop)

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index 7e319bd53ee7..1df8508ad03d 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -19,7 +19,7 @@ else

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-${PV%_rc?}"
-   ZFS_KERNEL_COMPAT="6.1"
+   ZFS_KERNEL_COMPAT="6.2"
 
# increments minor eg 5.14 -> 5.15, and still supports override.
ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-04-14 Thread Sam James

commit: 9ecc6482347411bbfefb4a8fbb57d6b3794eeb6a
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 14 23:51:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 23:52:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ecc6482

sys-fs/zfs-kmod: add 2.1.10

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest   |   2 +
 sys-fs/zfs-kmod/zfs-kmod-2.1.10.ebuild | 212 +
 2 files changed, 214 insertions(+)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 6e96c441e20d..f9fe2b0c0c22 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,3 +1,5 @@
+DIST zfs-2.1.10.tar.gz 35101856 BLAKE2B 
5b1a17d192097f5eab1ef3192217fa34b276b6f344a5114a5411be43208616ac682ae2129ae9da15b4ba6207171ae82140f823041a8067441459d51d994df271
 SHA512 
3189c6f822c7b6caba650a43f321114ef0bd42b72f566c44ba245c61cc3d420149a72520aed5b94494c51c35629a6f645273941774d964f2b61c31c366b2
+DIST zfs-2.1.10.tar.gz.asc 836 BLAKE2B 
5a6b408932cb4f39f5a226598527115aa4fa6c105c8b8ad9f236a5909a948150db712bb1f35e4e16a2b7fc7e434530f93c6a6cd2aab40d628b1ded9891694578
 SHA512 
a45bcce13e7261f90feda51a131fa0c86e2d3c2711286a462072fb120ccbc85719c2bbecb441147a057accffb841ca82df0ba65e1abc0ece9dea8a97cfa31af5
 DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 
9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad
 SHA512 
6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
 DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 
648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948
 SHA512 
4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B 
d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812
 SHA512 
a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.10.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.10.ebuild
new file mode 100644
index ..8f9eaa5b452c
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.10.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs;
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/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-${PV%_rc?}"
+   ZFS_KERNEL_COMPAT="6.2"
+
+   # 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 ~ppc64 ~riscv ~sparc"
+   fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+   dev-lang/perl
+   app-alternatives/awk
+"
+
+# we want dist-kernel block in BDEPEND because of portage resolver.
+# since linux-mod.eclass already sets version-unbounded dep, portage
+# will pull new versions. So we set it in BDEPEND which takes priority.
+# and we don't need in in git ebuild.
+if [[ ${PV} != "" ]] ; then
+   BDEPEND+="
+   verify-sig? ( sec-keys/openpgp-keys-openzfs )
+   dist-kernel? ( https://bugs.gentoo.org/811600
+   export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
+
+   local myconf=(
+   HOSTCC="$(tc-getBUILD_CC)"
+   --bindir="${EPREFIX}/bin"
+   --sbindir="${EPREFIX}/sbin"
+   --with-config=kernel
+   --with-linux="${KV_DIR}"
+   --with-linux-obj="${KV_OUT_DIR}"
+   $(use_enable debug)
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_compile() {
+   set_arch_to_kernel
+
+   myemakeargs=(
+   HOSTCC="$(tc-getBUILD_CC)"
+   V=1
+   )
+
+   emake "${myemakeargs[@]}"
+}
+
+src_install() {
+   set_arch_to_kernel
+
+   myemakeargs+=(
+   DEPMOD=:
+   #

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-02-23 Thread Georgy Yakovlev

commit: 45b3f3539cdd2869399ab67efad21b7d7d1df4d4
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Feb 23 23:54:45 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Feb 23 23:54:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45b3f353

sys-fs/zfs-kmod: Stabilize 2.1.9 ppc64, #894668

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild
index cedcef29f186..757ec7f6be66 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild
@@ -26,7 +26,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]]; then
-   KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-02-23 Thread Sam James

commit: 7e240ab5172826d0535d8a2bdebe0f132cd68b13
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 23 22:15:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 23 22:15:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e240ab5

sys-fs/zfs-kmod: Stabilize 2.1.9 arm64, #894668

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild
index 17f439188040..cedcef29f186 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild
@@ -26,7 +26,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]]; then
-   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-02-15 Thread Sam James

commit: 0727412658596c4cc87745950ec2755370edc341
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 16 04:46:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 16 04:46:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07274126

sys-fs/zfs-kmod: Stabilize 2.1.9 amd64, #894668

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild
index ac514d696c4f..17f439188040 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild
@@ -26,7 +26,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]]; then
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-01-27 Thread Georgy Yakovlev

commit: 076cf89ca3d5a6d3cf296ae327c57587568bee67
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Jan 27 19:22:01 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Jan 27 19:33:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=076cf89c

sys-fs/zfs-kmod: add 2.1.9

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/Manifest  |   2 +
 sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild | 212 ++
 2 files changed, 214 insertions(+)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 2941588dd4ad..e2e1f8bbdc71 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -4,3 +4,5 @@ DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 
9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e81
 DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 
648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948
 SHA512 
4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
 DIST zfs-2.1.8.tar.gz 35109766 BLAKE2B 
e725a43e5a62998209d638adcec061858f0caf05abd30bcfbaf8c6f6b9f47209808d9fcd726a830ea800793cd719c4471a498a10dab66119c4d24dbf09b1c481
 SHA512 
9c6c2c30f55b089ce29f8895ccc9032615ab25e47291b2d3384bcbb3d1fdb2e7a6fb67725a6fae04b6e28bfdc6dc97fae3b9b3ed8f802e75866c83eabf79c296
 DIST zfs-2.1.8.tar.gz.asc 836 BLAKE2B 
833457dee5948b255312c30da090c77cf8ec1d82b7498a8e85ccd8e4be12f948e9f00e742e76fc1392550756dd1d9c3b610fa29d25a61c41afe32b1c1a728602
 SHA512 
91f964e33772e77d1c4501e0ad526f2ff5cb45fb571bb25218f3f45f4662d544a92146633ef570d067bb7e6e7f36bd00da878b373143cae41611cae6f6c644cb
+DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B 
d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812
 SHA512 
a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
+DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 
1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486
 SHA512 
35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild
new file mode 100644
index ..ac514d696c4f
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs;
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/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-${PV%_rc?}"
+   ZFS_KERNEL_COMPAT="6.1"
+
+   # 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 ~ppc64 ~riscv ~sparc"
+   fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+   dev-lang/perl
+   app-alternatives/awk
+"
+
+# we want dist-kernel block in BDEPEND because of portage resolver.
+# since linux-mod.eclass already sets version-unbounded dep, portage
+# will pull new versions. So we set it in BDEPEND which takes priority.
+# and we don't need in in git ebuild.
+if [[ ${PV} != "" ]] ; then
+   BDEPEND+="
+   verify-sig? ( sec-keys/openpgp-keys-openzfs )
+   dist-kernel? ( https://bugs.gentoo.org/811600
+   export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
+
+   local myconf=(
+   HOSTCC="$(tc-getBUILD_CC)"
+   --bindir="${EPREFIX}/bin"
+   --sbindir="${EPREFIX}/sbin"
+   --with-config=kernel
+   --with-linux="${KV_DIR}"
+   --with-linux-obj="${KV_OUT_DIR}"
+   $(use_enable debug)
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_compile() {
+   set_arch_to_kernel
+
+   myemakeargs=(
+   HOSTCC="$(tc-getBUILD_CC)"
+   V=1
+   )
+
+   emake "${myemakeargs[@]}"
+}
+
+src_install() {
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-01-27 Thread Georgy Yakovlev

commit: 0a5a81d6e947847753f7b90606937496b037d01a
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Jan 27 19:33:01 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Jan 27 19:33:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a5a81d6

sys-fs/zfs-kmod: drop 2.1.6

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/Manifest  |   2 -
 sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild | 216 --
 2 files changed, 218 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index f7e8d6284543..6e96c441e20d 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,5 +1,3 @@
-DIST zfs-2.1.6.tar.gz 34951282 BLAKE2B 
615fe7a2128af77c6c855ea52b6503a78f0c992ea845b02875ac19aa9dd155c5d4110b668da91c463f96a54767ab92e67e5303572337352484c055c0a0ff9e46
 SHA512 
75639e4cecb281fe73a6e6bd116693f6609ace9b358385450297d175087b10938c2f489a08c657cf0a64250a8db995cbd19abc808a8523cb4c5344b3f76668d6
-DIST zfs-2.1.6.tar.gz.asc 836 BLAKE2B 
d85a79f8824a92c4d0a9682646f79c14871ebe27764289dc87cd9b0a773b7295538780401e70c492a9e4e7097ff2b3e459f7e0a7fdce2e2a59d3f467c41d88b3
 SHA512 
a83fcc00a8b35f1a1f9b94097d453019333a5351a3d78656dbd9ef732655ee817ccc88068c5ba11b5ff4a285e02250aee4169cc1450025edf547a2329fca7e15
 DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 
9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad
 SHA512 
6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
 DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 
648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948
 SHA512 
4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B 
d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812
 SHA512 
a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
deleted file mode 100644
index 17f2418fa83c..
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs;
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
-else
-   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/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-${PV%_rc?}"
-   ZFS_KERNEL_COMPAT="5.19"
-
-   #  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 ppc64 ~riscv ~sparc"
-   fi
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0/${PVR}"
-IUSE="custom-cflags debug +rootfs"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-   dev-lang/perl
-   app-alternatives/awk
-"
-
-# we want dist-kernel block in BDEPEND because of portage resolver.
-# since linux-mod.eclass already sets version-unbounded dep, portage
-# will pull new versions. So we set it in BDEPEND which takes priority.
-# and we don't need in in git ebuild.
-if [[ ${PV} != "" ]] ; then
-   BDEPEND+="
-   verify-sig? ( sec-keys/openpgp-keys-openzfs )
-   dist-kernel? ( https://bugs.gentoo.org/811600
-   export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
-
-   local myconf=(
-   HOSTCC="$(tc-getBUILD_CC)"
-   --bindir="${EPREFIX}/bin"
-   --sbindir="${EPREFIX}/sbin"
-   --with-config=kernel
-   --with-linux="${KV_DIR}"
-   --with-linux-obj="${KV_OUT_DIR}"
-   $(use_enable debug)
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_compile() {
-   set_arch_to_kernel
-
-   myemakeargs=(
-   HOSTCC="$(tc-getBUILD_CC)"
-   V=1
-   )
-
-   emake "${myemakeargs[@]}"
-}
-
-src_install() {
-   set_arch_to_kernel
-
-   myemakeargs+=(
-   DEPMOD=:
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/, sys-fs/zfs-kmod/

2023-01-27 Thread Georgy Yakovlev

commit: 234cba44970ef6d6e2fa89fcd1a73f101b0781a6
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Jan 27 19:24:04 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Jan 27 19:33:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234cba44

sys-fs/zfs-kmod: drop 2.1.8-r1

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/Manifest  |   2 -
 sys-fs/zfs-kmod/files/2.1.8-gang-revert.patch |  14 --
 sys-fs/zfs-kmod/zfs-kmod-2.1.8-r1.ebuild  | 217 --
 3 files changed, 233 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index e2e1f8bbdc71..f7e8d6284543 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -2,7 +2,5 @@ DIST zfs-2.1.6.tar.gz 34951282 BLAKE2B 
615fe7a2128af77c6c855ea52b6503a78f0c992ea
 DIST zfs-2.1.6.tar.gz.asc 836 BLAKE2B 
d85a79f8824a92c4d0a9682646f79c14871ebe27764289dc87cd9b0a773b7295538780401e70c492a9e4e7097ff2b3e459f7e0a7fdce2e2a59d3f467c41d88b3
 SHA512 
a83fcc00a8b35f1a1f9b94097d453019333a5351a3d78656dbd9ef732655ee817ccc88068c5ba11b5ff4a285e02250aee4169cc1450025edf547a2329fca7e15
 DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 
9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad
 SHA512 
6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
 DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 
648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948
 SHA512 
4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
-DIST zfs-2.1.8.tar.gz 35109766 BLAKE2B 
e725a43e5a62998209d638adcec061858f0caf05abd30bcfbaf8c6f6b9f47209808d9fcd726a830ea800793cd719c4471a498a10dab66119c4d24dbf09b1c481
 SHA512 
9c6c2c30f55b089ce29f8895ccc9032615ab25e47291b2d3384bcbb3d1fdb2e7a6fb67725a6fae04b6e28bfdc6dc97fae3b9b3ed8f802e75866c83eabf79c296
-DIST zfs-2.1.8.tar.gz.asc 836 BLAKE2B 
833457dee5948b255312c30da090c77cf8ec1d82b7498a8e85ccd8e4be12f948e9f00e742e76fc1392550756dd1d9c3b610fa29d25a61c41afe32b1c1a728602
 SHA512 
91f964e33772e77d1c4501e0ad526f2ff5cb45fb571bb25218f3f45f4662d544a92146633ef570d067bb7e6e7f36bd00da878b373143cae41611cae6f6c644cb
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B 
d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812
 SHA512 
a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 
1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486
 SHA512 
35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0

diff --git a/sys-fs/zfs-kmod/files/2.1.8-gang-revert.patch 
b/sys-fs/zfs-kmod/files/2.1.8-gang-revert.patch
deleted file mode 100644
index 13ab0575f4c8..
--- a/sys-fs/zfs-kmod/files/2.1.8-gang-revert.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-@gyakovlev:
-revert: 
https://github.com/openzfs/zfs/commit/0156253d29a303bdcca3e535958e754d8f086e33
-due to: https://github.com/openzfs/zfs/issues/14413
 b/module/zfs/zio.c
-+++ a/module/zfs/zio.c
-@@ -2827,7 +2827,7 @@
-* have a third copy.
-*/
-   gbh_copies = MIN(copies + 1, spa_max_replication(spa));
-+  if (gio->io_prop.zp_encrypt && gbh_copies >= SPA_DVAS_PER_BP)
--  if (BP_IS_ENCRYPTED(bp) && gbh_copies >= SPA_DVAS_PER_BP)
-   gbh_copies = SPA_DVAS_PER_BP - 1;
- 
-   int flags = METASLAB_HINTBP_FAVOR | METASLAB_GANG_HEADER;

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.8-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.8-r1.ebuild
deleted file mode 100644
index 4213efde8be1..
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.8-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs;
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
-else
-   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/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-${PV%_rc?}"
-   ZFS_KERNEL_COMPAT="6.1"
-
-   # increments minor eg 5.14 -> 5.15, and still

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/, sys-fs/zfs-kmod/

2023-01-24 Thread Georgy Yakovlev

commit: ee070d0d2ea651c3f6cf50c335f5e98317d060ca
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Jan 24 21:01:01 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Jan 24 21:03:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee070d0d

sys-fs/zfs-kmod: revbump 2.1.8, revert 0156253

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/files/2.1.8-gang-revert.patch  | 14 ++
 .../{zfs-kmod-2.1.8.ebuild => zfs-kmod-2.1.8-r1.ebuild}|  5 +
 2 files changed, 19 insertions(+)

diff --git a/sys-fs/zfs-kmod/files/2.1.8-gang-revert.patch 
b/sys-fs/zfs-kmod/files/2.1.8-gang-revert.patch
new file mode 100644
index ..13ab0575f4c8
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/2.1.8-gang-revert.patch
@@ -0,0 +1,14 @@
+@gyakovlev:
+revert: 
https://github.com/openzfs/zfs/commit/0156253d29a303bdcca3e535958e754d8f086e33
+due to: https://github.com/openzfs/zfs/issues/14413
+--- b/module/zfs/zio.c
 a/module/zfs/zio.c
+@@ -2827,7 +2827,7 @@
+* have a third copy.
+*/
+   gbh_copies = MIN(copies + 1, spa_max_replication(spa));
++  if (gio->io_prop.zp_encrypt && gbh_copies >= SPA_DVAS_PER_BP)
+-  if (BP_IS_ENCRYPTED(bp) && gbh_copies >= SPA_DVAS_PER_BP)
+   gbh_copies = SPA_DVAS_PER_BP - 1;
+ 
+   int flags = METASLAB_HINTBP_FAVOR | METASLAB_GANG_HEADER;

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.8.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.8-r1.ebuild
similarity index 98%
rename from sys-fs/zfs-kmod/zfs-kmod-2.1.8.ebuild
rename to sys-fs/zfs-kmod/zfs-kmod-2.1.8-r1.ebuild
index ac514d696c4f..4213efde8be1 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.8.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.8-r1.ebuild
@@ -60,6 +60,11 @@ RESTRICT="debug? ( strip ) test"
 
 DOCS=( AUTHORS COPYRIGHT META README.md )
 
+PATCHES=(
+   # https://github.com/openzfs/zfs/issues/14413
+   "${FILESDIR}/${PV}-gang-revert.patch"
+)
+
 pkg_pretend() {
use rootfs || return 0

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-01-20 Thread Sam James

commit: 0d8e132c2497e50807976eabe8423c70ad19243d
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 20 22:26:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 20 22:28:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d8e132c

sys-fs/zfs-kmod: add 2.1.8

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest   |  2 +
 ...{zfs-kmod-.ebuild => zfs-kmod-2.1.8.ebuild} | 52 +-
 sys-fs/zfs-kmod/zfs-kmod-.ebuild   |  4 +-
 3 files changed, 15 insertions(+), 43 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 5622cc6ec71f..2941588dd4ad 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -2,3 +2,5 @@ DIST zfs-2.1.6.tar.gz 34951282 BLAKE2B 
615fe7a2128af77c6c855ea52b6503a78f0c992ea
 DIST zfs-2.1.6.tar.gz.asc 836 BLAKE2B 
d85a79f8824a92c4d0a9682646f79c14871ebe27764289dc87cd9b0a773b7295538780401e70c492a9e4e7097ff2b3e459f7e0a7fdce2e2a59d3f467c41d88b3
 SHA512 
a83fcc00a8b35f1a1f9b94097d453019333a5351a3d78656dbd9ef732655ee817ccc88068c5ba11b5ff4a285e02250aee4169cc1450025edf547a2329fca7e15
 DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 
9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad
 SHA512 
6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
 DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 
648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948
 SHA512 
4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
+DIST zfs-2.1.8.tar.gz 35109766 BLAKE2B 
e725a43e5a62998209d638adcec061858f0caf05abd30bcfbaf8c6f6b9f47209808d9fcd726a830ea800793cd719c4471a498a10dab66119c4d24dbf09b1c481
 SHA512 
9c6c2c30f55b089ce29f8895ccc9032615ab25e47291b2d3384bcbb3d1fdb2e7a6fb67725a6fae04b6e28bfdc6dc97fae3b9b3ed8f802e75866c83eabf79c296
+DIST zfs-2.1.8.tar.gz.asc 836 BLAKE2B 
833457dee5948b255312c30da090c77cf8ec1d82b7498a8e85ccd8e4be12f948e9f00e742e76fc1392550756dd1d9c3b610fa29d25a61c41afe32b1c1a728602
 SHA512 
91f964e33772e77d1c4501e0ad526f2ff5cb45fb571bb25218f3f45f4662d544a92146633ef570d067bb7e6e7f36bd00da878b373143cae41611cae6f6c644cb

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.8.ebuild
similarity index 78%
copy from sys-fs/zfs-kmod/zfs-kmod-.ebuild
copy to sys-fs/zfs-kmod/zfs-kmod-2.1.8.ebuild
index 8b8cb3689aef..ac514d696c4f 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ else

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-${PV%_rc?}"
-   ZFS_KERNEL_COMPAT="6.0"
+   ZFS_KERNEL_COMPAT="6.1"
 
# increments minor eg 5.14 -> 5.15, and still supports override.
ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
@@ -112,6 +112,15 @@ pkg_setup() {
linux-mod_pkg_setup
 }
 
+src_unpack() {
+   if use verify-sig ; then
+   # Needed for downloaded patch (which is unsigned, which is fine)
+   verify-sig_verify_detached 
"${DISTDIR}"/zfs-${MY_PV}.tar.gz{,.asc}
+   fi
+
+   default
+}
+
 src_prepare() {
default
 
@@ -174,46 +183,7 @@ src_install() {
einstalldocs
 }
 
-_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.
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-01-12 Thread Sam James

commit: 5ead660cbf861caa6c0a9e3d1372903d2cb1c255
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 13 05:35:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 05:35:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ead660c

sys-fs/zfs-kmod: Stabilize 2.1.7 amd64, #890612

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
index 867f89aa1635..3f2082380eaf 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
@@ -26,7 +26,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]]; then
-   KEYWORDS="~amd64 arm64 ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-01-12 Thread Georgy Yakovlev

commit: 1975bd02544565d07d17293247098abc46f5d5cb
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Jan 13 04:47:43 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Jan 13 05:34:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1975bd02

sys-fs/zfs-kmod: Stabilize 2.1.7 arm64, #890612

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
index b996ea790d4b..867f89aa1635 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
@@ -26,7 +26,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]]; then
-   KEYWORDS="~amd64 ~arm64 ppc64 ~riscv ~sparc"
+   KEYWORDS="~amd64 arm64 ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/, sys-fs/zfs-kmod/

2023-01-12 Thread Georgy Yakovlev

commit: 06df21657de6a4d31985750139fe4817c6a256ad
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Jan 13 04:32:45 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Jan 13 04:32:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06df2165

sys-fs/zfs-kmod: add ieee-long-double patch to 2.1.7

Signed-off-by: Georgy Yakovlev  gentoo.org>

 .../files/2.1.7-ppc64-ieee128-compat.patch | 217 +
 sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild  |   5 +-
 2 files changed, 221 insertions(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/files/2.1.7-ppc64-ieee128-compat.patch 
b/sys-fs/zfs-kmod/files/2.1.7-ppc64-ieee128-compat.patch
new file mode 100644
index ..5613cb8ca9d1
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/2.1.7-ppc64-ieee128-compat.patch
@@ -0,0 +1,217 @@
+From 8324d738fdb3096bd97336476bb399e6c312289a Mon Sep 17 00:00:00 2001
+From: Richard Yao 
+Date: Thu, 12 Jan 2023 11:06:57 -0500
+Subject: [PATCH] Linux ppc64le ieee128 compat: Do not redefine __asm on
+ external headers
+
+There is an external assembly declaration extension in GNU C that glibc
+uses when building with ieee128 floating point support on ppc64le.
+Marking that as volatile makes no sense, so the build breaks.
+
+It does not make sense to only mark this as volatile on Linux, since if
+do not want the compiler reordering things on Linux, we do not want the
+compiler reordering things on any other platform, so we stop treating
+Linux specially and just manually inline the CPP macro so that we can
+eliminate it. This should fix the build on ppc64le.
+
+Closes openzfs/zfs#14308
+Signed-off-by: Richard Yao 
+---
+ .../vdev_raidz_math_powerpc_altivec_common.h  | 44 +--
+ 1 file changed, 20 insertions(+), 24 deletions(-)
+
+diff --git a/module/zfs/vdev_raidz_math_powerpc_altivec_common.h 
b/module/zfs/vdev_raidz_math_powerpc_altivec_common.h
+index 46d42c5e241..f76eb47a9c6 100644
+--- a/module/zfs/vdev_raidz_math_powerpc_altivec_common.h
 b/module/zfs/vdev_raidz_math_powerpc_altivec_common.h
+@@ -26,10 +26,6 @@
+ #include 
+ #include 
+ 
+-#ifdef __linux__
+-#define   __asm __asm__ __volatile__
+-#endif
+-
+ #define   _REG_CNT(_0, _1, _2, _3, _4, _5, _6, _7, N, ...) N
+ #define   REG_CNT(r...) _REG_CNT(r, 8, 7, 6, 5, 4, 3, 2, 1)
+ 
+@@ -142,7 +138,7 @@ typedef struct v {
+ { \
+   switch (REG_CNT(r)) {   \
+   case 8: \
+-  __asm(  \
++  __asm__ __volatile__(   \
+   "lvx 21,0,%[SRC0]\n"\
+   "lvx 20,0,%[SRC1]\n"\
+   "lvx 19,0,%[SRC2]\n"\
+@@ -172,7 +168,7 @@ typedef struct v {
+   :   "v18", "v19", "v20", "v21");\
+   break;  \
+   case 4: \
+-  __asm(  \
++  __asm__ __volatile__(   \
+   "lvx 21,0,%[SRC0]\n"\
+   "lvx 20,0,%[SRC1]\n"\
+   "lvx 19,0,%[SRC2]\n"\
+@@ -189,7 +185,7 @@ typedef struct v {
+   :   "v18", "v19", "v20", "v21");\
+   break;  \
+   case 2: \
+-  __asm(  \
++  __asm__ __volatile__(   \
+   "lvx 21,0,%[SRC0]\n"\
+   "lvx 20,0,%[SRC1]\n"\
+   "vxor " VR0(r) "," VR0(r) ",21\n"   \
+@@ -208,7 +204,7 @@ typedef struct v {
+ { \
+   switch (REG_CNT(r)) {   \
+   case 8: \
+-  __asm(  \
++  __asm__ __volatile__(   \
+   "vxor " VR4(r) "," VR4(r) "," VR0(r) "\n"   \
+   "vxor " VR5(r) "," VR5(r) "," VR1(r) "\n"   \
+   "vxor " VR6(r) "," VR6(r) "," VR2(r) "\n"   \
+@@ -217,7 +213,7 @@ typedef struct v {
+   :   RVR0(r), RVR1(r), RVR2(r), RVR3(r));\
+   break;  \
+   case 4: \
+-  __asm(  \
++  __asm__ __volatile__(

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2023-01-12 Thread Georgy Yakovlev

commit: d421cc8be448c9cc87c154dffb859cdf1905aa94
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Jan 13 04:33:11 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Jan 13 04:33:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d421cc8b

sys-fs/zfs-kmod: Stabilize 2.1.7 ppc64, #890612

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
index 4b53b2ee95a4..b996ea790d4b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
@@ -26,7 +26,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]]; then
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="~amd64 ~arm64 ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-12-08 Thread Georgy Yakovlev

commit: 4db3ae5436c9b677515e0d15ce89cc88e3ef121a
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Dec  8 19:34:54 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Dec  8 19:47:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db3ae54

sys-fs/zfs-kmod: drop 2.1.5-r1

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/Manifest |   3 -
 sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild | 218 ---
 2 files changed, 221 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index b1f070f79fb9..5622cc6ec71f 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,6 +1,3 @@
-DIST zfs-2.1.5-patches.tar.xz 13324 BLAKE2B 
bfef8abd298cebd54491272b8c1deacace901d9a1acce67cb927bab6447eafd985352fd09f64336aa9d6611bab0e5c761d7973f0a65c408d77bb735a94c60253
 SHA512 
d2b009664f8eb4f2a8596693011fde578b6eae123c6169e5dfb70bd920c0f987f5177f7b1be008705a421574a8a9bc930f99823785c69e81573f18b0350cb9bd
-DIST zfs-2.1.5.tar.gz 34951632 BLAKE2B 
c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49
 SHA512 
d9ccf1049cefa9167d25f71fbdca70092cd02368b60f09341e6489fb68dc5f89e87b026b0191f4d81181a8851449124d824a1d959d0e2fb29c8a3d624edc4f03
-DIST zfs-2.1.5.tar.gz.asc 836 BLAKE2B 
4a81c266967540850a2cc824e79555ca9d05b2e17e45fa2723893cbd85b55e3d7d791986d6667b7ee1530e7692c03818f15e8b6798393b54989f90801b775786
 SHA512 
224b0dcf4982c63a8eff0a39d054537e7d023f7c35e154e4d20490b8daf184c076bc8e4de7d2c5af4059f8a802b747e637aad4479cd8d1330cf5b26da2f19c94
 DIST zfs-2.1.6.tar.gz 34951282 BLAKE2B 
615fe7a2128af77c6c855ea52b6503a78f0c992ea845b02875ac19aa9dd155c5d4110b668da91c463f96a54767ab92e67e5303572337352484c055c0a0ff9e46
 SHA512 
75639e4cecb281fe73a6e6bd116693f6609ace9b358385450297d175087b10938c2f489a08c657cf0a64250a8db995cbd19abc808a8523cb4c5344b3f76668d6
 DIST zfs-2.1.6.tar.gz.asc 836 BLAKE2B 
d85a79f8824a92c4d0a9682646f79c14871ebe27764289dc87cd9b0a773b7295538780401e70c492a9e4e7097ff2b3e459f7e0a7fdce2e2a59d3f467c41d88b3
 SHA512 
a83fcc00a8b35f1a1f9b94097d453019333a5351a3d78656dbd9ef732655ee817ccc88068c5ba11b5ff4a285e02250aee4169cc1450025edf547a2329fca7e15
 DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 
9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad
 SHA512 
6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
deleted file mode 100644
index 9f2b825e2eb9..
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs;
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
-else
-   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/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+=" 
https://dev.gentoo.org/~sam/distfiles/sys-fs/zfs/${P/-kmod}-patches.tar.xz;
-   SRC_URI+=" verify-sig? ( 
https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc
 )"
-   S="${WORKDIR}/zfs-${PV%_rc?}"
-   ZFS_KERNEL_COMPAT="5.18"
-
-   #  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 ppc64 ~riscv"
-   fi
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0/${PVR}"
-IUSE="custom-cflags debug +rootfs"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-   dev-lang/perl
-   app-alternatives/awk
-"
-
-# we want dist-kernel block in BDEPEND because of portage resolver.
-# since linux-mod.eclass already sets version-unbounded dep, portage
-# will pull new versions. So we set it in BDEPEND which takes priority.
-# and we don't need in in git ebuild.
-if [[ ${PV} != "" ]] ; then
-   BDEPEND+="
-   verify-sig? ( sec-keys/openpgp-keys-openzfs )
-   dist-kernel? ( https://bugs.gentoo.org/811600
-   export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
-
-   local myconf=(
-   HOSTCC="$(tc-getBUILD_CC)"
-   --bindir="${EPREFIX}/bin"
-   --sbindir="${EPREFIX}/sbin"
-   --with-config=kernel
-   --with-linux="${KV_DIR}"
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-12-08 Thread Georgy Yakovlev

commit: 00c9af7ffafbb9e37fce2c88d44107035b2654ee
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Dec  8 19:29:49 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Dec  8 19:47:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00c9af7f

sys-fs/zfs-kmod: Stabilize 2.1.6 amd64, #884865

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
index 7b2b210f5e88..17f2418fa83c 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
@@ -26,7 +26,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]]; then
-   KEYWORDS="~amd64 arm64 ppc64 ~riscv ~sparc"
+   KEYWORDS="amd64 arm64 ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-12-08 Thread Georgy Yakovlev

commit: 2ed93c6c0eea96b66b682303eed97490f283acff
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Dec  8 19:13:36 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Dec  8 19:13:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ed93c6c

sys-fs/zfs-kmod: Stabilize 2.1.6 arm64, #884865

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
index 8da231f43959..7b2b210f5e88 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
@@ -26,7 +26,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]]; then
-   KEYWORDS="~amd64 ~arm64 ppc64 ~riscv ~sparc"
+   KEYWORDS="~amd64 arm64 ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-12-08 Thread Georgy Yakovlev

commit: 00f73fbc176aca5318c3b78df6890c5437d14ff8
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Dec  8 19:13:22 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Dec  8 19:13:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f73fbc

sys-fs/zfs-kmod: Stabilize 2.1.6 ppc64, #884865

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
index f6204d45b2e9..8da231f43959 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
@@ -26,7 +26,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]]; then
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+   KEYWORDS="~amd64 ~arm64 ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-12-04 Thread Georgy Yakovlev

commit: 7b2361ddcde62d424ed759b2444ba3b8c91017fd
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sun Dec  4 20:55:30 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sun Dec  4 20:56:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b2361dd

sys-fs/zfs-kmod: fix minor typo

Thanks-to: Louis Sautier  gentoo.org>
Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild | 2 +-
 sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild| 2 +-
 sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild| 2 +-
 sys-fs/zfs-kmod/zfs-kmod-.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
index 71bd00382b65..9f2b825e2eb9 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
@@ -209,7 +209,7 @@ pkg_postinst() {
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 newpool that is backward compatible wih GRUB2, 
use "
+   ewarn "create a new pool that is backward compatible wih GRUB2, 
use "
ewarn
ewarn "zpool create -o compatibility=grub2 ..."
ewarn

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
index e561949719a9..f6204d45b2e9 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
@@ -207,7 +207,7 @@ pkg_postinst() {
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 newpool that is backward compatible wih GRUB2, 
use "
+   ewarn "create a new pool that is backward compatible wih GRUB2, 
use "
ewarn
ewarn "zpool create -o compatibility=grub2 ..."
ewarn

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
index 2f23be8f7d39..d12dfd611acc 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
@@ -207,7 +207,7 @@ pkg_postinst() {
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 newpool that is backward compatible wih GRUB2, 
use "
+   ewarn "create a new pool that is backward compatible wih GRUB2, 
use "
ewarn
ewarn "zpool create -o compatibility=grub2 ..."
ewarn

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index b31dd845873c..8b8cb3689aef 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -233,7 +233,7 @@ pkg_postinst() {
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 newpool that is backward compatible wih GRUB2, 
use "
+   ewarn "create a new pool that is backward compatible wih GRUB2, 
use "
ewarn
ewarn "zpool create -o compatibility=grub2 ..."
ewarn

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-12-03 Thread Georgy Yakovlev

commit: 2d475f8a7b560fe09d760d56ce9787688d848390
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Dec  3 21:55:42 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Dec  3 21:59:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d475f8a

sys-fs/zfs-kmod: improve new module check in live ebuild

Closes: https://github.com/gentoo/gentoo/pull/28498
Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index 3e4508af22fc..b31dd845873c 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -210,8 +210,10 @@ _old_layout_cleanup() {
 pkg_postinst() {
# check for old module layout before doing anything else.
# only attempt layout cleanup if new .ko location is used.
-   [[ -f "${EROOT}/lib/modules/${KV_FULL}/extra/zfs.ko" ]] && 
_old_layout_cleanup
-
+   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_pkg_postinst
 
if [[ -z ${ROOT} ]] && use dist-kernel; then

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-12-03 Thread Georgy Yakovlev

commit: 40e35a1b2001aae0741c54595c2ea871274c37be
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Dec  1 23:50:38 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Dec  3 21:59:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e35a1b

sys-fs/zfs-kmod: clean up old modules in live ebuild

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-.ebuild | 37 
 1 file changed, 37 insertions(+)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index b2fa04c9966a..3e4508af22fc 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -174,7 +174,44 @@ src_install() {
einstalldocs
 }
 
+_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.
+   [[ -f "${EROOT}/lib/modules/${KV_FULL}/extra/zfs.ko" ]] && 
_old_layout_cleanup
+
linux-mod_pkg_postinst
 
if [[ -z ${ROOT} ]] && use dist-kernel; then

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-12-01 Thread Sam James

commit: 8dce8b45f0c15ecff4018fe7a9ae3af87cf91f71
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  2 02:52:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  2 02:52:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dce8b45

sys-fs/zfs-kmod: sync live

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index 8edf8733327b..faa5875ad758 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
 
@@ -21,12 +21,12 @@ else
S="${WORKDIR}/zfs-${PV%_rc?}"
ZFS_KERNEL_COMPAT="6.0"
 
-   #  increments minor eg 5.14 -> 5.15, and still supports override.
+   # 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 ~ppc64 ~riscv"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-12-01 Thread Sam James

commit: 1a85bcbd54f704d37e7aee2fc952ce5bc603961c
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  2 02:43:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  2 02:51:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a85bcbd

sys-fs/zfs-kmod: add 2.1.7

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest  |   2 +
 sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild | 216 ++
 2 files changed, 218 insertions(+)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 894b7751ea9b..b1f070f79fb9 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -3,3 +3,5 @@ DIST zfs-2.1.5.tar.gz 34951632 BLAKE2B 
c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1
 DIST zfs-2.1.5.tar.gz.asc 836 BLAKE2B 
4a81c266967540850a2cc824e79555ca9d05b2e17e45fa2723893cbd85b55e3d7d791986d6667b7ee1530e7692c03818f15e8b6798393b54989f90801b775786
 SHA512 
224b0dcf4982c63a8eff0a39d054537e7d023f7c35e154e4d20490b8daf184c076bc8e4de7d2c5af4059f8a802b747e637aad4479cd8d1330cf5b26da2f19c94
 DIST zfs-2.1.6.tar.gz 34951282 BLAKE2B 
615fe7a2128af77c6c855ea52b6503a78f0c992ea845b02875ac19aa9dd155c5d4110b668da91c463f96a54767ab92e67e5303572337352484c055c0a0ff9e46
 SHA512 
75639e4cecb281fe73a6e6bd116693f6609ace9b358385450297d175087b10938c2f489a08c657cf0a64250a8db995cbd19abc808a8523cb4c5344b3f76668d6
 DIST zfs-2.1.6.tar.gz.asc 836 BLAKE2B 
d85a79f8824a92c4d0a9682646f79c14871ebe27764289dc87cd9b0a773b7295538780401e70c492a9e4e7097ff2b3e459f7e0a7fdce2e2a59d3f467c41d88b3
 SHA512 
a83fcc00a8b35f1a1f9b94097d453019333a5351a3d78656dbd9ef732655ee817ccc88068c5ba11b5ff4a285e02250aee4169cc1450025edf547a2329fca7e15
+DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 
9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad
 SHA512 
6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
+DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 
648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948
 SHA512 
4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
new file mode 100644
index ..b52760e7ef3d
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs;
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/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-${PV%_rc?}"
+   ZFS_KERNEL_COMPAT="6.0"
+
+   # 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 ~ppc64 ~riscv ~sparc"
+   fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+   dev-lang/perl
+   virtual/awk
+"
+
+# we want dist-kernel block in BDEPEND because of portage resolver.
+# since linux-mod.eclass already sets version-unbounded dep, portage
+# will pull new versions. So we set it in BDEPEND which takes priority.
+# and we don't need in in git ebuild.
+if [[ ${PV} != "" ]] ; then
+   BDEPEND+="
+   verify-sig? ( sec-keys/openpgp-keys-openzfs )
+   dist-kernel? ( https://bugs.gentoo.org/811600
+   export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
+
+   local myconf=(
+   HOSTCC="$(tc-getBUILD_CC)"
+   --bindir="${EPREFIX}/bin"
+   --sbindir="${EPREFIX}/sbin"
+   --with-config=kernel
+   --with-linux="${KV_DIR}"
+   --with-linux-obj="${KV_OUT_DIR}"
+   $(use_enable debug)
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_compile() {
+   set_arch_to_kernel
+
+   myemakeargs=(
+   HOSTCC="$(tc-getBUILD_CC)"
+   V=1
+   )
+
+   emake "${myemakeargs[@]}"
+}
+
+src_install() {
+   set_arch_to_kernel
+
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-10-28 Thread Sam James

commit: 6e89e597aef6fb867bab9ba54718a207e10905f3
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 09:42:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 09:42:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e89e597

sys-fs/zfs-kmod: update ZFS_KERNEL_COMPAT for  to 6.0

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index e0888f5b3a45..8edf8733327b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -19,7 +19,7 @@ else

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-${PV%_rc?}"
-   ZFS_KERNEL_COMPAT="5.19"
+   ZFS_KERNEL_COMPAT="6.0"
 
#  increments minor eg 5.14 -> 5.15, and still supports override.
ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-10-14 Thread Arthur Zamarin

commit: 8779ba481926572dd96949ade48dccfb76bfa6bc
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Oct 14 12:43:13 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Oct 14 12:43:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8779ba48

sys-fs/zfs-kmod: Keyword 2.1.6 sparc, #866308

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
index 321ab809d1e2..61ce8c8c8c75 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
@@ -26,7 +26,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]]; then
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/, sys-fs/zfs-kmod/files/

2022-10-03 Thread Sam James

commit: e2e26044c0dce9d993e280fc3e9cc81da0f828a3
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct  4 05:02:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct  4 05:06:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2e26044

sys-fs/zfs-kmod: add 2.1.6

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest   |  2 +
 sys-fs/zfs-kmod/files/zfs-kmod-2.1.6-fgrep.patch   | 53 ++
 ...{zfs-kmod-.ebuild => zfs-kmod-2.1.6.ebuild} | 15 +-
 sys-fs/zfs-kmod/zfs-kmod-.ebuild   |  2 +-
 4 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 9e6e521d9fef..894b7751ea9b 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,3 +1,5 @@
 DIST zfs-2.1.5-patches.tar.xz 13324 BLAKE2B 
bfef8abd298cebd54491272b8c1deacace901d9a1acce67cb927bab6447eafd985352fd09f64336aa9d6611bab0e5c761d7973f0a65c408d77bb735a94c60253
 SHA512 
d2b009664f8eb4f2a8596693011fde578b6eae123c6169e5dfb70bd920c0f987f5177f7b1be008705a421574a8a9bc930f99823785c69e81573f18b0350cb9bd
 DIST zfs-2.1.5.tar.gz 34951632 BLAKE2B 
c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49
 SHA512 
d9ccf1049cefa9167d25f71fbdca70092cd02368b60f09341e6489fb68dc5f89e87b026b0191f4d81181a8851449124d824a1d959d0e2fb29c8a3d624edc4f03
 DIST zfs-2.1.5.tar.gz.asc 836 BLAKE2B 
4a81c266967540850a2cc824e79555ca9d05b2e17e45fa2723893cbd85b55e3d7d791986d6667b7ee1530e7692c03818f15e8b6798393b54989f90801b775786
 SHA512 
224b0dcf4982c63a8eff0a39d054537e7d023f7c35e154e4d20490b8daf184c076bc8e4de7d2c5af4059f8a802b747e637aad4479cd8d1330cf5b26da2f19c94
+DIST zfs-2.1.6.tar.gz 34951282 BLAKE2B 
615fe7a2128af77c6c855ea52b6503a78f0c992ea845b02875ac19aa9dd155c5d4110b668da91c463f96a54767ab92e67e5303572337352484c055c0a0ff9e46
 SHA512 
75639e4cecb281fe73a6e6bd116693f6609ace9b358385450297d175087b10938c2f489a08c657cf0a64250a8db995cbd19abc808a8523cb4c5344b3f76668d6
+DIST zfs-2.1.6.tar.gz.asc 836 BLAKE2B 
d85a79f8824a92c4d0a9682646f79c14871ebe27764289dc87cd9b0a773b7295538780401e70c492a9e4e7097ff2b3e459f7e0a7fdce2e2a59d3f467c41d88b3
 SHA512 
a83fcc00a8b35f1a1f9b94097d453019333a5351a3d78656dbd9ef732655ee817ccc88068c5ba11b5ff4a285e02250aee4169cc1450025edf547a2329fca7e15

diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-2.1.6-fgrep.patch 
b/sys-fs/zfs-kmod/files/zfs-kmod-2.1.6-fgrep.patch
new file mode 100644
index ..2e47c5bcc093
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-2.1.6-fgrep.patch
@@ -0,0 +1,53 @@
+https://github.com/openzfs/zfs/commit/d30577c9dd811688f2609ad532b011b99bceb485
+
+From d30577c9dd811688f2609ad532b011b99bceb485 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= 
+Date: Sat, 12 Mar 2022 00:26:46 +0100
+Subject: [PATCH] fgrep -> grep -F
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reviewed-by: Brian Behlendorf 
+Reviewed-by: John Kennedy 
+Reviewed-by: Ryan Moeller 
+Signed-off-by: Ahelenia Ziemiańska 
+Closes #13259
+--- a/config/kernel.m4
 b/config/kernel.m4
+@@ -394,11 +394,11 @@ AC_DEFUN([ZFS_AC_KERNEL], [
+   utsrelease1=$kernelbuild/include/linux/version.h
+   utsrelease2=$kernelbuild/include/linux/utsrelease.h
+   utsrelease3=$kernelbuild/include/generated/utsrelease.h
+-  AS_IF([test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1], [
++  AS_IF([test -r $utsrelease1 && grep -qF UTS_RELEASE $utsrelease1], [
+   utsrelease=$utsrelease1
+-  ], [test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2], [
++  ], [test -r $utsrelease2 && grep -qF UTS_RELEASE $utsrelease2], [
+   utsrelease=$utsrelease2
+-  ], [test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3], [
++  ], [test -r $utsrelease3 && grep -qF UTS_RELEASE $utsrelease3], [
+   utsrelease=$utsrelease3
+   ])
+ 
+--- a/config/zfs-build.m4
 b/config/zfs-build.m4
+@@ -173,7 +173,7 @@ AC_DEFUN([ZFS_AC_DEBUG_KMEM_TRACKING], [
+ ])
+ 
+ AC_DEFUN([ZFS_AC_DEBUG_INVARIANTS_DETECT_FREEBSD], [
+-  AS_IF([sysctl -n kern.conftxt | fgrep -qx $'options\tINVARIANTS'],
++  AS_IF([sysctl -n kern.conftxt | grep -Fqx $'options\tINVARIANTS'],
+   [enable_invariants="yes"],
+   [enable_invariants="no"])
+ ])
+--- a/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
 b/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
+@@ -120,5 +120,5 @@ function check_while_waiting
+ # Whether any vdev in the given pool is initializing
+ function is_vdev_initializing # pool
+ {
+-  zpool status -i "$1" | grep 'initialized, started' >/dev/null
++  zpool status -i "$1" | grep -q 'initialized, started'
+ }
+

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
similarity index 95%
copy from

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/, sys-fs/zfs-kmod/files/

2022-09-17 Thread Georgy Yakovlev

commit: 343037a0b292a176d153a7e188f259bb57162007
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Sep 17 22:13:13 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Sep 17 22:14:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343037a0

sys-fs/zfs-kmod: drop 2.1.4-r1

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/Manifest |   2 -
 sys-fs/zfs-kmod/files/2.1.4-ZERO_RANGE.patch | 304 ---
 sys-fs/zfs-kmod/zfs-kmod-2.1.4-r1.ebuild | 209 --
 3 files changed, 515 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index e252f0fccc10..9e6e521d9fef 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,5 +1,3 @@
-DIST zfs-2.1.4.tar.gz 34896310 BLAKE2B 
be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200
 SHA512 
c7b57c43fc287b22905067ab022df4133d32e1a5dc335f7baf743b4ef88f64c2bf9d41318c2083230d077dd49e68f7d9e6172266e13d4b1eee29d359860f969e
-DIST zfs-2.1.4.tar.gz.asc 836 BLAKE2B 
b311730f72d534c87a782515f35a354bfbefba0513dc0cee5b0b497cf742590f13be6a49ff8a70d7d6503d0ba06b0266e7d290d718337add614812c3d1b0731a
 SHA512 
53880cd5369f468551bab685eb83739ed76aa286886fdd2cbad4270755fe809da730082a91bba61011f59594fac297ce05645ae32c2c73b4a9aa835f2991a1ee
 DIST zfs-2.1.5-patches.tar.xz 13324 BLAKE2B 
bfef8abd298cebd54491272b8c1deacace901d9a1acce67cb927bab6447eafd985352fd09f64336aa9d6611bab0e5c761d7973f0a65c408d77bb735a94c60253
 SHA512 
d2b009664f8eb4f2a8596693011fde578b6eae123c6169e5dfb70bd920c0f987f5177f7b1be008705a421574a8a9bc930f99823785c69e81573f18b0350cb9bd
 DIST zfs-2.1.5.tar.gz 34951632 BLAKE2B 
c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49
 SHA512 
d9ccf1049cefa9167d25f71fbdca70092cd02368b60f09341e6489fb68dc5f89e87b026b0191f4d81181a8851449124d824a1d959d0e2fb29c8a3d624edc4f03
 DIST zfs-2.1.5.tar.gz.asc 836 BLAKE2B 
4a81c266967540850a2cc824e79555ca9d05b2e17e45fa2723893cbd85b55e3d7d791986d6667b7ee1530e7692c03818f15e8b6798393b54989f90801b775786
 SHA512 
224b0dcf4982c63a8eff0a39d054537e7d023f7c35e154e4d20490b8daf184c076bc8e4de7d2c5af4059f8a802b747e637aad4479cd8d1330cf5b26da2f19c94

diff --git a/sys-fs/zfs-kmod/files/2.1.4-ZERO_RANGE.patch 
b/sys-fs/zfs-kmod/files/2.1.4-ZERO_RANGE.patch
deleted file mode 100644
index 338b14208dab..
--- a/sys-fs/zfs-kmod/files/2.1.4-ZERO_RANGE.patch
+++ /dev/null
@@ -1,304 +0,0 @@
-https://github.com/openzfs/zfs/commit/c220771a47e4206fb43e6849957657c9504b1b14
-https://github.com/openzfs/zfs/issues/13329
-
-From c220771a47e4206fb43e6849957657c9504b1b14 Mon Sep 17 00:00:00 2001
-From: Rich Ercolani <214141+rincebr...@users.noreply.github.com>
-Date: Wed, 20 Apr 2022 19:07:03 -0400
-Subject: [PATCH] Corrected oversight in ZERO_RANGE behavior
-
-It turns out, no, in fact, ZERO_RANGE and PUNCH_HOLE do
-have differing semantics in some ways - in particular,
-one requires KEEP_SIZE, and the other does not.
-
-Also added a zero-range test to catch this, corrected a flaw
-that made the punch-hole test succeed vacuously, and a typo
-in file_write.
-
-Reviewed-by: Brian Behlendorf 
-Signed-off-by: Rich Ercolani 
-Closes #13329
-Closes #13338
 a/module/os/linux/zfs/zpl_file.c
-+++ b/module/os/linux/zfs/zpl_file.c
-@@ -781,11 +781,13 @@ zpl_fallocate_common(struct inode *ip, int mode, loff_t 
offset, loff_t len)
-   if (mode & (test_mode)) {
-   flock64_t bf;
- 
--  if (offset > olen)
--  goto out_unmark;
-+  if (mode & FALLOC_FL_KEEP_SIZE) {
-+  if (offset > olen)
-+  goto out_unmark;
- 
--  if (offset + len > olen)
--  len = olen - offset;
-+  if (offset + len > olen)
-+  len = olen - offset;
-+  }
-   bf.l_type = F_WRLCK;
-   bf.l_whence = SEEK_SET;
-   bf.l_start = offset;
 a/tests/runfiles/linux.run
-+++ b/tests/runfiles/linux.run
-@@ -94,7 +94,7 @@ tests = ['events_001_pos', 'events_002_pos', 
'zed_rc_filter', 'zed_fd_spill']
- tags = ['functional', 'events']
- 
- [tests/functional/fallocate:Linux]
--tests = ['fallocate_prealloc']
-+tests = ['fallocate_prealloc', 'fallocate_zero-range']
- tags = ['functional', 'fallocate']
- 
- [tests/functional/fault:Linux]
 a/tests/zfs-tests/cmd/file_write/file_write.c
-+++ b/tests/zfs-tests/cmd/file_write/file_write.c
-@@ -251,7 +251,7 @@ usage(char *prog)
-   "\t[-s offset] [-c write_count] [-d data]\n\n"
-   "Where [data] equal to zero causes chars "
-   "0->%d to be repeated throughout, or [data]\n"
--  "equal to 'R' for psudorandom data.\n",
-+  "equal to 'R' for pseudorandom data.\n",
-   prog, DATA_RANGE);
- 
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-09-17 Thread Georgy Yakovlev

commit: 2d975e6387170cffdd3e1b54a939c7c6ab1f7507
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Sep 17 22:16:01 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Sep 17 22:16:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d975e63

sys-fs/zfs-kmod: remove 2y old spl blocker

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild | 4 +---
 sys-fs/zfs-kmod/zfs-kmod-.ebuild | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
index e15a7aa768a8..56c94fb50e46 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
@@ -35,9 +35,7 @@ LICENSE="CDDL MIT debug? ( GPL-2+ )"
 SLOT="0/${PVR}"
 IUSE="custom-cflags debug +rootfs"
 
-RDEPEND="${DEPEND}
-   !sys-kernel/spl
-"
+RDEPEND="${DEPEND}"
 
 BDEPEND="
dev-lang/perl

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index 65567e49fef7..c7623deb64c8 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -34,9 +34,7 @@ LICENSE="CDDL MIT debug? ( GPL-2+ )"
 SLOT="0/${PVR}"
 IUSE="custom-cflags debug +rootfs"
 
-RDEPEND="${DEPEND}
-   !sys-kernel/spl
-"
+RDEPEND="${DEPEND}"
 
 BDEPEND="
dev-lang/perl

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-09-17 Thread Georgy Yakovlev

commit: 00b05e4f9b7dae326fad7433bd2b4ac670940b37
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Sep 17 22:11:19 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Sep 17 22:13:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00b05e4f

sys-fs/zfs-kmod: drop 2.0.7

Bug: https://bugs.gentoo.org/850508
Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/Manifest  |   2 -
 sys-fs/zfs-kmod/zfs-kmod-2.0.7.ebuild | 212 --
 2 files changed, 214 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 7b982f51e740..e252f0fccc10 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,5 +1,3 @@
-DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 
80f7297f04a21cd8f3f2043d895b0325512ba0cea3bb9223561237754495c8233d29af5a9418a3c06a87510100240a45ef3d59c7ce776fffb5aafdcd18167c21
 SHA512 
1135abf74bf74685439018f7cd65fc52088f179d113bdd2e6481689bb0f4a016716a07d859107b74501fda00689e80b2488c7c2c53d5f058d6b659909ed85f6f
-DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 
65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38
 SHA512 
b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682
 DIST zfs-2.1.4.tar.gz 34896310 BLAKE2B 
be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200
 SHA512 
c7b57c43fc287b22905067ab022df4133d32e1a5dc335f7baf743b4ef88f64c2bf9d41318c2083230d077dd49e68f7d9e6172266e13d4b1eee29d359860f969e
 DIST zfs-2.1.4.tar.gz.asc 836 BLAKE2B 
b311730f72d534c87a782515f35a354bfbefba0513dc0cee5b0b497cf742590f13be6a49ff8a70d7d6503d0ba06b0266e7d290d718337add614812c3d1b0731a
 SHA512 
53880cd5369f468551bab685eb83739ed76aa286886fdd2cbad4270755fe809da730082a91bba61011f59594fac297ce05645ae32c2c73b4a9aa835f2991a1ee
 DIST zfs-2.1.5-patches.tar.xz 13324 BLAKE2B 
bfef8abd298cebd54491272b8c1deacace901d9a1acce67cb927bab6447eafd985352fd09f64336aa9d6611bab0e5c761d7973f0a65c408d77bb735a94c60253
 SHA512 
d2b009664f8eb4f2a8596693011fde578b6eae123c6169e5dfb70bd920c0f987f5177f7b1be008705a421574a8a9bc930f99823785c69e81573f18b0350cb9bd

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.7.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.0.7.ebuild
deleted file mode 100644
index a928c1eac6f9..
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.7.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs;
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
-else
-   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/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-${PV%_rc?}"
-   ZFS_KERNEL_COMPAT="5.15"
-
-   #  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 ppc64"
-   fi
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0/${PVR}"
-IUSE="custom-cflags debug +rootfs"
-
-RDEPEND="${DEPEND}
-   !sys-kernel/spl
-"
-
-BDEPEND="
-   dev-lang/perl
-   virtual/awk
-"
-
-# we want dist-kernel block in BDEPEND because of portage resolver.
-# since linux-mod.eclass already sets version-unbounded dep, portage
-# will pull new versions. So we set it in BDEPEND which takes priority.
-# and we don't need in in git ebuild.
-if [[ ${PV} != "" ]] ; then
-   BDEPEND+="
-   verify-sig? ( sec-keys/openpgp-keys-openzfs )
-   dist-kernel? ( https://bugs.gentoo.org/811600
-   export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
-
-   local myconf=(
-   HOSTCC="$(tc-getBUILD_CC)"
-   --bindir="${EPREFIX}/bin"
-   --sbindir="${EPREFIX}/sbin"
-   --with-config=kernel
-   --with-linux="${KV_DIR}"
-   --with-linux-obj="${KV_OUT_DIR}"
-   $(use_enable debug)
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_compile() {
-   set_arch_to_kernel
-
-   myemakeargs=(
-   HOSTCC="$(tc-getBUILD_CC)"
-   V=1
-   )
-
-   emake "${myemakeargs[@]}"
-}
-
-src_install() {
-   set_arch_to_kernel
-
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-09-17 Thread Georgy Yakovlev

commit: ca7238eed13a81a458ddc37c71a74a064977bc1b
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Sep 17 19:58:18 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Sep 17 19:58:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca7238ee

sys-fs/zfs-kmod: Stabilize 2.1.5-r1 ppc64, #866644

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
index 40463fb6c90f..e15a7aa768a8 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
@@ -27,7 +27,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]]; then
-   KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
+   KEYWORDS="amd64 arm64 ppc64 ~riscv"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-09-16 Thread Georgy Yakovlev

commit: 962e37385a0f8c9ae0f864fff870944c02fbabf3
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Sep 17 04:10:37 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Sep 17 04:10:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=962e3738

sys-fs/zfs-kmod: Stabilize 2.1.5-r1 arm64, #866644

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
index d6ea047f157a..40463fb6c90f 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
@@ -27,7 +27,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]]; then
-   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
+   KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/

2022-09-16 Thread Georgy Yakovlev

commit: e5c293ab58539c16bd0ccde7fba01da09651474a
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Sep 16 23:19:00 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Sep 16 23:19:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5c293ab

sys-fs/zfs-kmod: drop unused patch

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/files/2.1.5-build-issues.patch | 74 --
 1 file changed, 74 deletions(-)

diff --git a/sys-fs/zfs-kmod/files/2.1.5-build-issues.patch 
b/sys-fs/zfs-kmod/files/2.1.5-build-issues.patch
deleted file mode 100644
index cca6561b16f7..
--- a/sys-fs/zfs-kmod/files/2.1.5-build-issues.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-https://github.com/openzfs/zfs/commit/a6e8113fed8a508ffda13cf1c4d8da99a4e8133a
-https://github.com/openzfs/zfs/commit/60e389ca10085acfa7cd35f79ab4465d968a942f
-Cherry-picked from https://github.com/openzfs/zfs/pull/13575
-
-https://bugs.gentoo.org/855182
 a/config/always-compiler-options.m4
-+++ b/config/always-compiler-options.m4
-@@ -205,6 +205,29 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_OMIT_FRAME_POINTER], 
[
-   AC_SUBST([NO_OMIT_FRAME_POINTER])
- ])
- 
-+dnl #
-+dnl # Check if cc supports -Winfinite-recursion option.
-+dnl #
-+AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_INFINITE_RECURSION], [
-+  AC_MSG_CHECKING([whether $CC supports -Winfinite-recursion])
-+
-+  saved_flags="$CFLAGS"
-+  CFLAGS="$CFLAGS -Werror -Winfinite-recursion"
-+
-+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
-+  INFINITE_RECURSION=-Winfinite-recursion
-+  AC_DEFINE([HAVE_INFINITE_RECURSION], 1,
-+  [Define if compiler supports -Winfinite-recursion])
-+  AC_MSG_RESULT([yes])
-+  ], [
-+  INFINITE_RECURSION=
-+  AC_MSG_RESULT([no])
-+  ])
-+
-+  CFLAGS="$saved_flags"
-+  AC_SUBST([INFINITE_RECURSION])
-+])
-+
- dnl #
- dnl # Check if cc supports -fno-ipa-sra option.
- dnl #
 a/config/zfs-build.m4
-+++ b/config/zfs-build.m4
-@@ -211,6 +211,7 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
- 
-   ZFS_AC_CONFIG_ALWAYS_CC_NO_UNUSED_BUT_SET_VARIABLE
-   ZFS_AC_CONFIG_ALWAYS_CC_NO_BOOL_COMPARE
-+  ZFS_AC_CONFIG_ALWAYS_CC_INFINITE_RECURSION
-   ZFS_AC_CONFIG_ALWAYS_CC_IMPLICIT_FALLTHROUGH
-   ZFS_AC_CONFIG_ALWAYS_CC_FRAME_LARGER_THAN
-   ZFS_AC_CONFIG_ALWAYS_CC_NO_FORMAT_TRUNCATION
 a/module/lua/ldo.c
-+++ b/module/lua/ldo.c
-@@ -168,6 +168,13 @@ static void seterrorobj (lua_State *L, int errcode, StkId 
oldtop) {
-   L->top = oldtop + 1;
- }
- 
-+/*
-+ * Silence infinite recursion warning which was added to -Wall in gcc 12.1
-+ */
-+#if defined(HAVE_INFINITE_RECURSION)
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Winfinite-recursion"
-+#endif
- 
- l_noret luaD_throw (lua_State *L, int errcode) {
-   if (L->errorJmp) {  /* thread has an error handler? */
-@@ -190,6 +197,10 @@ l_noret luaD_throw (lua_State *L, int errcode) {
-   }
- }
- 
-+#if defined(HAVE_INFINITE_RECURSION)
-+#pragma GCC diagnostic pop
-+#endif
-+
- 
- int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
-   unsigned short oldnCcalls = L->nCcalls;

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-09-16 Thread Georgy Yakovlev

commit: 2498f88be7ecb8ac17f32380d26b1603ca2b95b7
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Sep 16 23:11:54 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Sep 16 23:12:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2498f88b

sys-fs/zfs-kmod: drop 2.1.5

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild | 210 --
 1 file changed, 210 deletions(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild
deleted file mode 100644
index ac917091d0b4..
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs;
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
-else
-   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/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-${PV%_rc?}"
-   ZFS_KERNEL_COMPAT="5.18"
-
-   #  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 ~ppc64 ~riscv"
-   fi
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0/${PVR}"
-IUSE="custom-cflags debug +rootfs"
-
-RDEPEND="${DEPEND}
-   !sys-kernel/spl
-"
-
-BDEPEND="
-   dev-lang/perl
-   virtual/awk
-"
-
-# we want dist-kernel block in BDEPEND because of portage resolver.
-# since linux-mod.eclass already sets version-unbounded dep, portage
-# will pull new versions. So we set it in BDEPEND which takes priority.
-# and we don't need in in git ebuild.
-if [[ ${PV} != "" ]] ; then
-   BDEPEND+="
-   verify-sig? ( sec-keys/openpgp-keys-openzfs )
-   dist-kernel? ( https://bugs.gentoo.org/811600
-   export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
-
-   local myconf=(
-   HOSTCC="$(tc-getBUILD_CC)"
-   --bindir="${EPREFIX}/bin"
-   --sbindir="${EPREFIX}/sbin"
-   --with-config=kernel
-   --with-linux="${KV_DIR}"
-   --with-linux-obj="${KV_OUT_DIR}"
-   $(use_enable debug)
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_compile() {
-   set_arch_to_kernel
-
-   myemakeargs=(
-   HOSTCC="$(tc-getBUILD_CC)"
-   V=1
-   )
-
-   emake "${myemakeargs[@]}"
-}
-
-src_install() {
-   set_arch_to_kernel
-
-   myemakeargs+=(
-   DEPMOD=:
-   # INSTALL_MOD_PATH ?= $(DESTDIR) in module/Makefile
-   DESTDIR="${D}"
-   )
-
-   emake "${myemakeargs[@]}" install
-
-   einstalldocs
-}
-
-pkg_postinst() {
-   linux-mod_pkg_postinst
-
-   if [[ -z ${ROOT} ]] && use dist-kernel; then
-   set_arch_to_pkgmgr
-   dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-   fi
-
-   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 newpool 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
-}

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-09-02 Thread Sam James

commit: 329f257526c8f35182f8b8d264fff4c85c5c9c34
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep  2 20:11:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep  2 20:11:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=329f2575

sys-fs/zfs-kmod: Stabilize 2.1.5-r1 amd64, #866644

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
index 93d1733d51df..d6ea047f157a 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
@@ -27,7 +27,7 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
if [[ ${PV} != *_rc* ]]; then
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
fi
 fi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-08-03 Thread Sam James

commit: 153564d2412de6e1a4c73ef9589de972b694210d
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  3 18:55:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  3 18:55:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=153564d2

sys-fs/zfs-kmod: keyword 2.1.5-r1

Bug: https://bugs.gentoo.org/863212
Bug: https://bugs.gentoo.org/855182
Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
index eae6fb587434..93d1733d51df 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
@@ -26,10 +26,9 @@ else
ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
-   # Unkeyworded briefly for testing
-   #if [[ ${PV} != *_rc* ]]; then
-   #   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-   #fi
+   if [[ ${PV} != *_rc* ]]; then
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+   fi
 fi
 
 LICENSE="CDDL MIT debug? ( GPL-2+ )"

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-08-02 Thread Sam James

commit: 2b658334aaa40c30c08d1e003c11135507b83174
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  3 04:18:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  3 04:35:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b658334

sys-fs/zfs-kmod: backport various fixes

Mostly build fixes (https://github.com/openzfs/zfs/pull/13684)
but also https://github.com/openzfs/zfs/pull/13714.

All from upstream zfs-2.1.6-staging branch.

Temporarily unkeyworded.

Bug: https://bugs.gentoo.org/855182
Bug: https://bugs.gentoo.org/863212
Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest |   1 +
 sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild | 221 +++
 2 files changed, 222 insertions(+)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 8d6ae4d6ba30..7b982f51e740 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -2,5 +2,6 @@ DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 
80f7297f04a21cd8f3f2043d895b0325512ba0cea
 DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 
65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38
 SHA512 
b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682
 DIST zfs-2.1.4.tar.gz 34896310 BLAKE2B 
be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200
 SHA512 
c7b57c43fc287b22905067ab022df4133d32e1a5dc335f7baf743b4ef88f64c2bf9d41318c2083230d077dd49e68f7d9e6172266e13d4b1eee29d359860f969e
 DIST zfs-2.1.4.tar.gz.asc 836 BLAKE2B 
b311730f72d534c87a782515f35a354bfbefba0513dc0cee5b0b497cf742590f13be6a49ff8a70d7d6503d0ba06b0266e7d290d718337add614812c3d1b0731a
 SHA512 
53880cd5369f468551bab685eb83739ed76aa286886fdd2cbad4270755fe809da730082a91bba61011f59594fac297ce05645ae32c2c73b4a9aa835f2991a1ee
+DIST zfs-2.1.5-patches.tar.xz 13324 BLAKE2B 
bfef8abd298cebd54491272b8c1deacace901d9a1acce67cb927bab6447eafd985352fd09f64336aa9d6611bab0e5c761d7973f0a65c408d77bb735a94c60253
 SHA512 
d2b009664f8eb4f2a8596693011fde578b6eae123c6169e5dfb70bd920c0f987f5177f7b1be008705a421574a8a9bc930f99823785c69e81573f18b0350cb9bd
 DIST zfs-2.1.5.tar.gz 34951632 BLAKE2B 
c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49
 SHA512 
d9ccf1049cefa9167d25f71fbdca70092cd02368b60f09341e6489fb68dc5f89e87b026b0191f4d81181a8851449124d824a1d959d0e2fb29c8a3d624edc4f03
 DIST zfs-2.1.5.tar.gz.asc 836 BLAKE2B 
4a81c266967540850a2cc824e79555ca9d05b2e17e45fa2723893cbd85b55e3d7d791986d6667b7ee1530e7692c03818f15e8b6798393b54989f90801b775786
 SHA512 
224b0dcf4982c63a8eff0a39d054537e7d023f7c35e154e4d20490b8daf184c076bc8e4de7d2c5af4059f8a802b747e637aad4479cd8d1330cf5b26da2f19c94

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
new file mode 100644
index ..eae6fb587434
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs;
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/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+=" 
https://dev.gentoo.org/~sam/distfiles/sys-fs/zfs/${P/-kmod}-patches.tar.xz;
+   SRC_URI+=" verify-sig? ( 
https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc
 )"
+   S="${WORKDIR}/zfs-${PV%_rc?}"
+   ZFS_KERNEL_COMPAT="5.18"
+
+   #  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))"
+
+   # Unkeyworded briefly for testing
+   #if [[ ${PV} != *_rc* ]]; then
+   #   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+   #fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+
+RDEPEND="${DEPEND}
+   !sys-kernel/spl
+"
+
+BDEPEND="
+   dev-lang/perl
+   virtual/awk
+"
+
+# we want dist-kernel block in BDEPEND because of portage resolver.
+# since linux-mod.eclass already sets version-unbounded dep, portage
+# will pull new versions. So we set it in BDEPEND which takes priority.
+# and we don't need in in git ebuild.
+if [[ ${PV} != "" ]] ; then
+   BDEPEND+="
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/, sys-fs/zfs-kmod/

2022-06-30 Thread Sam James

commit: 468b165fb4ef100a9fb630dffa4feda1ed3089c5
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 30 10:37:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 30 10:37:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=468b165f

sys-fs/zfs-kmod: backport build fixes

Closes: https://bugs.gentoo.org/855182
Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/files/2.1.5-build-issues.patch | 74 ++
 sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild  |  5 ++
 2 files changed, 79 insertions(+)

diff --git a/sys-fs/zfs-kmod/files/2.1.5-build-issues.patch 
b/sys-fs/zfs-kmod/files/2.1.5-build-issues.patch
new file mode 100644
index ..cca6561b16f7
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/2.1.5-build-issues.patch
@@ -0,0 +1,74 @@
+https://github.com/openzfs/zfs/commit/a6e8113fed8a508ffda13cf1c4d8da99a4e8133a
+https://github.com/openzfs/zfs/commit/60e389ca10085acfa7cd35f79ab4465d968a942f
+Cherry-picked from https://github.com/openzfs/zfs/pull/13575
+
+https://bugs.gentoo.org/855182
+--- a/config/always-compiler-options.m4
 b/config/always-compiler-options.m4
+@@ -205,6 +205,29 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_OMIT_FRAME_POINTER], 
[
+   AC_SUBST([NO_OMIT_FRAME_POINTER])
+ ])
+ 
++dnl #
++dnl # Check if cc supports -Winfinite-recursion option.
++dnl #
++AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_INFINITE_RECURSION], [
++  AC_MSG_CHECKING([whether $CC supports -Winfinite-recursion])
++
++  saved_flags="$CFLAGS"
++  CFLAGS="$CFLAGS -Werror -Winfinite-recursion"
++
++  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
++  INFINITE_RECURSION=-Winfinite-recursion
++  AC_DEFINE([HAVE_INFINITE_RECURSION], 1,
++  [Define if compiler supports -Winfinite-recursion])
++  AC_MSG_RESULT([yes])
++  ], [
++  INFINITE_RECURSION=
++  AC_MSG_RESULT([no])
++  ])
++
++  CFLAGS="$saved_flags"
++  AC_SUBST([INFINITE_RECURSION])
++])
++
+ dnl #
+ dnl # Check if cc supports -fno-ipa-sra option.
+ dnl #
+--- a/config/zfs-build.m4
 b/config/zfs-build.m4
+@@ -211,6 +211,7 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
+ 
+   ZFS_AC_CONFIG_ALWAYS_CC_NO_UNUSED_BUT_SET_VARIABLE
+   ZFS_AC_CONFIG_ALWAYS_CC_NO_BOOL_COMPARE
++  ZFS_AC_CONFIG_ALWAYS_CC_INFINITE_RECURSION
+   ZFS_AC_CONFIG_ALWAYS_CC_IMPLICIT_FALLTHROUGH
+   ZFS_AC_CONFIG_ALWAYS_CC_FRAME_LARGER_THAN
+   ZFS_AC_CONFIG_ALWAYS_CC_NO_FORMAT_TRUNCATION
+--- a/module/lua/ldo.c
 b/module/lua/ldo.c
+@@ -168,6 +168,13 @@ static void seterrorobj (lua_State *L, int errcode, StkId 
oldtop) {
+   L->top = oldtop + 1;
+ }
+ 
++/*
++ * Silence infinite recursion warning which was added to -Wall in gcc 12.1
++ */
++#if defined(HAVE_INFINITE_RECURSION)
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Winfinite-recursion"
++#endif
+ 
+ l_noret luaD_throw (lua_State *L, int errcode) {
+   if (L->errorJmp) {  /* thread has an error handler? */
+@@ -190,6 +197,10 @@ l_noret luaD_throw (lua_State *L, int errcode) {
+   }
+ }
+ 
++#if defined(HAVE_INFINITE_RECURSION)
++#pragma GCC diagnostic pop
++#endif
++
+ 
+ int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
+   unsigned short oldnCcalls = L->nCcalls;

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild
index 65567e49fef7..ac917091d0b4 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild
@@ -62,6 +62,11 @@ RESTRICT="debug? ( strip ) test"
 
 DOCS=( AUTHORS COPYRIGHT META README.md )
 
+PATCHES=(
+   # bug #855182
+   "${FILESDIR}"/${PV}-build-issues.patch
+)
+
 pkg_pretend() {
use rootfs || return 0

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-06-22 Thread Sam James

commit: b5eaaeff596018aac51bae1854cc43bc5a25902d
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 22 22:39:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 22 22:40:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5eaaeff

sys-fs/zfs-kmod: add 2.1.5

Signed-off-by: Sam James  gentoo.org>

 sys-fs/zfs-kmod/Manifest| 2 ++
 sys-fs/zfs-kmod/{zfs-kmod-.ebuild => zfs-kmod-2.1.5.ebuild} | 2 +-
 sys-fs/zfs-kmod/zfs-kmod-.ebuild| 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index e7fff2635157..8d6ae4d6ba30 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -2,3 +2,5 @@ DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 
80f7297f04a21cd8f3f2043d895b0325512ba0cea
 DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 
65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38
 SHA512 
b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682
 DIST zfs-2.1.4.tar.gz 34896310 BLAKE2B 
be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200
 SHA512 
c7b57c43fc287b22905067ab022df4133d32e1a5dc335f7baf743b4ef88f64c2bf9d41318c2083230d077dd49e68f7d9e6172266e13d4b1eee29d359860f969e
 DIST zfs-2.1.4.tar.gz.asc 836 BLAKE2B 
b311730f72d534c87a782515f35a354bfbefba0513dc0cee5b0b497cf742590f13be6a49ff8a70d7d6503d0ba06b0266e7d290d718337add614812c3d1b0731a
 SHA512 
53880cd5369f468551bab685eb83739ed76aa286886fdd2cbad4270755fe809da730082a91bba61011f59594fac297ce05645ae32c2c73b4a9aa835f2991a1ee
+DIST zfs-2.1.5.tar.gz 34951632 BLAKE2B 
c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49
 SHA512 
d9ccf1049cefa9167d25f71fbdca70092cd02368b60f09341e6489fb68dc5f89e87b026b0191f4d81181a8851449124d824a1d959d0e2fb29c8a3d624edc4f03
+DIST zfs-2.1.5.tar.gz.asc 836 BLAKE2B 
4a81c266967540850a2cc824e79555ca9d05b2e17e45fa2723893cbd85b55e3d7d791986d6667b7ee1530e7692c03818f15e8b6798393b54989f90801b775786
 SHA512 
224b0dcf4982c63a8eff0a39d054537e7d023f7c35e154e4d20490b8daf184c076bc8e4de7d2c5af4059f8a802b747e637aad4479cd8d1330cf5b26da2f19c94

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild
similarity index 99%
copy from sys-fs/zfs-kmod/zfs-kmod-.ebuild
copy to sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild
index 1b9f31ac7666..65567e49fef7 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild
@@ -19,7 +19,7 @@ else

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-${PV%_rc?}"
-   ZFS_KERNEL_COMPAT="5.17"
+   ZFS_KERNEL_COMPAT="5.18"
 
#  increments minor eg 5.14 -> 5.15, and still supports override.
ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"

diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index 1b9f31ac7666..65567e49fef7 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -19,7 +19,7 @@ else

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-${PV%_rc?}"
-   ZFS_KERNEL_COMPAT="5.17"
+   ZFS_KERNEL_COMPAT="5.18"
 
#  increments minor eg 5.14 -> 5.15, and still supports override.
ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

2022-06-07 Thread Georgy Yakovlev

commit: 2d82af013e401799f56e2c50c222cef30ba6083e
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Jun  7 18:55:55 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Jun  7 18:55:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d82af01

sys-fs/zfs-kmod: drop 2.1.2

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/Manifest  |   2 -
 sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild | 205 --
 2 files changed, 207 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index fbb9a55c3dc1..e7fff2635157 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,6 +1,4 @@
 DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 
80f7297f04a21cd8f3f2043d895b0325512ba0cea3bb9223561237754495c8233d29af5a9418a3c06a87510100240a45ef3d59c7ce776fffb5aafdcd18167c21
 SHA512 
1135abf74bf74685439018f7cd65fc52088f179d113bdd2e6481689bb0f4a016716a07d859107b74501fda00689e80b2488c7c2c53d5f058d6b659909ed85f6f
 DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 
65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38
 SHA512 
b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682
-DIST zfs-2.1.2.tar.gz 34829045 BLAKE2B 
ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584
 SHA512 
3e3932259da2a27f1c4cca8da62b909edc43bf51ab0229d2d5d0234d9a7eaa7b63b67c06a98cbe2d29ba1eb5cbcaab16e5062c2a2bc8e84cab770be10ebf2102
-DIST zfs-2.1.2.tar.gz.asc 836 BLAKE2B 
8f5666f5c3d7016a4d79191f42d0a220fe8c654a0d64e3da3b575644fe52c83dcb9f9ef49ba0553771a127bba44e2802f1d366a7a38f670e73612deef76755c3
 SHA512 
da6bfccd19a249a6891f5e1de6c4b332e98ce4f125f638c046b9cedac3fd79c56a99dd9a620105a40741e5f04b382f5d5996b56cbe576fb268b31e57e0fed6eb
 DIST zfs-2.1.4.tar.gz 34896310 BLAKE2B 
be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200
 SHA512 
c7b57c43fc287b22905067ab022df4133d32e1a5dc335f7baf743b4ef88f64c2bf9d41318c2083230d077dd49e68f7d9e6172266e13d4b1eee29d359860f969e
 DIST zfs-2.1.4.tar.gz.asc 836 BLAKE2B 
b311730f72d534c87a782515f35a354bfbefba0513dc0cee5b0b497cf742590f13be6a49ff8a70d7d6503d0ba06b0266e7d290d718337add614812c3d1b0731a
 SHA512 
53880cd5369f468551bab685eb83739ed76aa286886fdd2cbad4270755fe809da730082a91bba61011f59594fac297ce05645ae32c2c73b4a9aa835f2991a1ee

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild
deleted file mode 100644
index 6eacb6cbcf38..
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs;
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
-else
-   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/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-${PV%_rc?}"
-   ZFS_KERNEL_COMPAT="5.15"
-
-   #  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 ppc64 ~riscv"
-   fi
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0/${PVR}"
-IUSE="custom-cflags debug +rootfs"
-
-RDEPEND="${DEPEND}
-   !sys-kernel/spl
-"
-
-BDEPEND="
-   dev-lang/perl
-   virtual/awk
-"
-
-# we want dist-kernel block in BDEPEND because of portage resolver.
-# since linux-mod.eclass already sets version-unbounded dep, portage
-# will pull new versions. So we set it in BDEPEND which takes priority.
-# and we don't need in in git ebuild.
-if [[ ${PV} != "" ]] ; then
-   BDEPEND+="
-   verify-sig? ( sec-keys/openpgp-keys-openzfs )
-   dist-kernel? ( https://bugs.gentoo.org/811600
-   export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
-
-   local myconf=(
-   HOSTCC="$(tc-getBUILD_CC)"
-   --bindir="${EPREFIX}/bin"
-   --sbindir="${EPREFIX}/sbin"
-   --with-config=kernel
-   --with-linux="${KV_DIR}"
-   --with-linux-obj="${KV_OUT_DIR}"
-   $(use_enable debug)
-   )
-
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/, sys-fs/zfs-kmod/

2022-06-07 Thread Georgy Yakovlev

commit: d63ee4d2e784fceca7406466a7085df61c48f5ba
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Jun  7 18:44:53 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Jun  7 18:44:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63ee4d2

sys-fs/zfs-kmod: drop 0.8.6

Bug: https://bugs.gentoo.org/830020
Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-fs/zfs-kmod/Manifest   |   1 -
 sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch |  27 
 sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild  | 212 -
 3 files changed, 240 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 737e23e8e6ef..fbb9a55c3dc1 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,4 +1,3 @@
-DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 
45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2
 SHA512 
626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
 DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 
80f7297f04a21cd8f3f2043d895b0325512ba0cea3bb9223561237754495c8233d29af5a9418a3c06a87510100240a45ef3d59c7ce776fffb5aafdcd18167c21
 SHA512 
1135abf74bf74685439018f7cd65fc52088f179d113bdd2e6481689bb0f4a016716a07d859107b74501fda00689e80b2488c7c2c53d5f058d6b659909ed85f6f
 DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 
65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38
 SHA512 
b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682
 DIST zfs-2.1.2.tar.gz 34829045 BLAKE2B 
ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584
 SHA512 
3e3932259da2a27f1c4cca8da62b909edc43bf51ab0229d2d5d0234d9a7eaa7b63b67c06a98cbe2d29ba1eb5cbcaab16e5062c2a2bc8e84cab770be10ebf2102

diff --git a/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch 
b/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch
deleted file mode 100644
index 2b1ef8582546..
--- a/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0ce99b43b339226d62362f624d37f80a921eb197 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev 
-Date: Fri, 18 Dec 2020 11:35:07 -0800
-Subject: [PATCH] copy-builtin: handle missing .gitignore
-
-acfc4944d0d6db114db9f2bb5401251c5bd767b6 broke copy-builtin in
-release tarballs, because those do not contain .gitignore file.
-Adding -f to rm call will make it return 0 even if file does not exist.
-
-Signed-off-by: Georgy Yakovlev 

- copy-builtin | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/copy-builtin b/copy-builtin
-index 84f469fef02..6a6eb1f3695 100755
 a/copy-builtin
-+++ b/copy-builtin
-@@ -36,7 +36,7 @@ rm -rf "$KERNEL_DIR/include/zfs" "$KERNEL_DIR/fs/zfs"
- cp --recursive include "$KERNEL_DIR/include/zfs"
- cp --recursive module "$KERNEL_DIR/fs/zfs"
- cp zfs_config.h "$KERNEL_DIR/include/zfs/"
--rm "$KERNEL_DIR/include/zfs/.gitignore"
-+rm -f "$KERNEL_DIR/include/zfs/.gitignore"
- 
- for MODULE in "${MODULES[@]}"
- do

diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
deleted file mode 100644
index 49d364f92cc3..
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs;
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/openzfs/zfs.git;
-else
-   
SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz;
-   KEYWORDS="amd64 arm64 ppc64"
-   S="${WORKDIR}/zfs-${PV}"
-   ZFS_KERNEL_COMPAT="5.9"
-
-   # 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))"
-fi
-
-LICENSE="CDDL debug? ( GPL-2+ )"
-SLOT="0/${PVR}"
-IUSE="custom-cflags debug +rootfs"
-
-DEPEND=""
-
-RDEPEND="${DEPEND}
-   !sys-kernel/spl
-"
-
-BDEPEND="
-   dev-lang/perl
-   virtual/awk
-   dist-kernel? ( https://github.com/openzfs/zfs/pull/11371
-PATCHES=( "${FILESDIR}/${PV}-copy-builtin.patch" )
-
-pkg_setup() {
-   CONFIG_CHECK="
-   !DEBUG_LOCK_ALLOC
-   EFI_PARTITION
-   MODULES
-   !PAX_KERNEXEC_PLUGIN_METHOD_OR
-   !TRIM_UNUSED_KSYMS
-   ZLIB_DEFLATE
-   ZLIB_INFLATE
-   "
-
-   use debug &&

1 2 3 4 >

1 - 100 of 320 matches

Mail list logo