[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
commit: 86e852d3a5c67174af6c72beaca4dc7165d16028
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Sep 8 06:04:26 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Sep 8 06:04:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86e852d3
sys-fs/zfs: Stabilize 2.2.5 arm64, #938270
Signed-off-by: Arthur Zamarin gentoo.org>
sys-fs/zfs/zfs-2.2.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.2.5.ebuild b/sys-fs/zfs/zfs-2.2.5.ebuild
index f66317b0b066..eda194d59abc 100644
--- a/sys-fs/zfs/zfs-2.2.5.ebuild
+++ b/sys-fs/zfs/zfs-2.2.5.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${MY_P}"
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/
commit: 9748052071fcc257238efddcda21ac54e8e5eb1e
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Sep 8 06:04:30 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Sep 8 06:04:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97480520
sys-fs/zfs-kmod: Stabilize 2.2.5 ppc64, #938270
Signed-off-by: Arthur Zamarin gentoo.org>
sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
index d8f9c3cd3f54..1eb122934d00 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
@@ -31,7 +31,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/
commit: a2d9252367ce83277291a82f1ed3ba3d4c9b225f
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Sep 8 06:04:29 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Sep 8 06:04:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2d92523
sys-fs/zfs: Stabilize 2.2.5 ppc64, #938270
Signed-off-by: Arthur Zamarin gentoo.org>
sys-fs/zfs/zfs-2.2.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.2.5.ebuild b/sys-fs/zfs/zfs-2.2.5.ebuild
index eda194d59abc..962beb163214 100644
--- a/sys-fs/zfs/zfs-2.2.5.ebuild
+++ b/sys-fs/zfs/zfs-2.2.5.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${MY_P}"
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/
commit: a36b9986e04712e5fe802defe0ff5f511208234a
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Sep 8 06:04:26 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Sep 8 06:04:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a36b9986
sys-fs/zfs-kmod: Stabilize 2.2.5 arm64, #938270
Signed-off-by: Arthur Zamarin gentoo.org>
sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
index f190fb198686..d8f9c3cd3f54 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
@@ -31,7 +31,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/
commit: c6d6fef885e50de439a3a1e12f3e9d6f6281ca52
Author: Sam James gentoo org>
AuthorDate: Thu Sep 5 13:02:07 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Sep 5 13:03:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d6fef8
sys-fs/zfs: fix whitespace, missync with 2.2.5 (unwind)
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.2.6.ebuild | 438 ++--
1 file changed, 220 insertions(+), 218 deletions(-)
diff --git a/sys-fs/zfs/zfs-2.2.6.ebuild b/sys-fs/zfs/zfs-2.2.6.ebuild
index 87689751ff17..5264247e69af 100644
--- a/sys-fs/zfs/zfs-2.2.6.ebuild
+++ b/sys-fs/zfs/zfs-2.2.6.ebuild
@@ -13,20 +13,20 @@ DESCRIPTION="Userland utilities for ZFS Linux kernel module"
HOMEPAGE="https://github.com/openzfs/zfs";
if [[ ${PV} == "" ]]; then
-inherit git-r3
-EGIT_REPO_URI="https://github.com/openzfs/zfs.git";
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/openzfs/zfs.git";
else
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
-inherit verify-sig
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+ inherit verify-sig
-MY_P="${P/_rc/-rc}"
-
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
-SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
-S="${WORKDIR}/${MY_P}"
+ MY_P="${P/_rc/-rc}"
+
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
+ SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+ S="${WORKDIR}/${MY_P}"
-if [[ ${PV} != *_rc* ]]; then
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
-fi
+ if [[ ${PV} != *_rc* ]]; then
+ KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+ fi
fi
LICENSE="BSD-2 CDDL MIT"
@@ -34,61 +34,62 @@ LICENSE="BSD-2 CDDL MIT"
# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
# see libsoversion_check() below as well
SLOT="0/5"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite unwind"
DEPEND="
-dev-libs/openssl:=
-net-libs/libtirpc:=
-sys-apps/util-linux
-sys-libs/zlib
-virtual/libudev:=
-!minimal? ( ${PYTHON_DEPS} )
-pam? ( sys-libs/pam )
-python? (
-$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
-)
+ dev-libs/openssl:=
+ net-libs/libtirpc:=
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libudev:=
+ !minimal? ( ${PYTHON_DEPS} )
+ pam? ( sys-libs/pam )
+ python? (
+ $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
+ )
+ unwind? ( sys-libs/libunwind:= )
"
BDEPEND="
-app-alternatives/awk
-virtual/pkgconfig
-nls? ( sys-devel/gettext )
-python? (
-${DISTUTILS_DEPS}
-|| (
-dev-python/packaging[${PYTHON_USEDEP}]
-dev-python/distlib[${PYTHON_USEDEP}]
-)
-)
+ app-alternatives/awk
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ python? (
+ ${DISTUTILS_DEPS}
+ || (
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/distlib[${PYTHON_USEDEP}]
+ )
+ )
"
if [[ ${PV} != "" ]] ; then
-BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
fi
# awk is used for some scripts, completions, and the Dracut module
RDEPEND="
-${DEPEND}
-!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
-!prefix? ( virtual/udev )
-app-alternatives/awk
-sys-fs/udev-init-scripts
-dist-kernel? ( virtual/dist-kernel:= )
-rootfs? (
-app-alternatives/cpio
-app-misc/pax-utils
-)
-selinux? ( sec-policy/selinux-zfs )
-test-suite? (
-app-shells/ksh
-sys-apps/kmod[tools]
-sys-apps/util-linux
-app-alternatives/bc
-sys-block/parted
-sys-fs/lsscsi
-sys-fs/mdadm
-sys-process/procps
-)
+ ${DEPEND}
+ !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
+ !prefix? ( virtual/udev )
+ app-alternatives/awk
+ sys-fs/udev-init-scripts
+ dist-kernel? ( virtual/dist-kernel:= )
+ rootfs? (
+ a
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
commit: e8808dd7cd7078b2c2a3204767c4e800a2153ea4
Author: Luke Schwager blucobalt dev>
AuthorDate: Wed Sep 4 22:55:06 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Sep 5 13:00:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8808dd7
sys-fs/zfs-kmod: add 2.2.6
Signed-off-by: Luke Schwager blucobalt.dev>
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs-kmod/Manifest| 2 ++
sys-fs/zfs-kmod/{zfs-kmod-.ebuild => zfs-kmod-2.2.6.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 99794d263e7a..6a58959b8242 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -10,3 +10,5 @@ DIST zfs-2.2.4.tar.gz 33882933 BLAKE2B
f0026a12b7c1252bf8941e39f23d3e16575003470
DIST zfs-2.2.4.tar.gz.asc 836 BLAKE2B
7fde4232c25056eac2fae76abec4d6749c91d285d79ae6dce4ae4880fa90a26c9fb370dfa4daaf8a849f30fcc1b63eeb215444bfca724f6750bf7e4344f35fa7
SHA512
0cb3caf01b9e4d1f0c35d9f7933a4b11560b9bbf6c05494d8a1775b0a52ac1d642aebd77ef1c7b23a0a06f92e2b1ab3d8afacce41017eb07745d148af7f76a17
DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B
ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f
SHA512
8e288620ce78fb235fa0c9929fc97150987a64091a8a5209209f1e0975d4d6213b8b307e32b3c89d934e83dc8468a1998b797fcdff5d023f07674877b0c6
DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B
ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef
SHA512
0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060
+DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B
0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2
SHA512
c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745
+DIST zfs-2.2.6.tar.gz.asc 836 BLAKE2B
db66f3e2e629ab8a344a8e0c2609bcbb98d69d110fc9e064760ee0c5c25cd67421a71764c4b65d7005e8ff66167bf24beb4be2560a47318eabffa888c1539f26
SHA512
d09f343b3acc3a81e96c069072cfb16d0b490ee77562f50e14524faf05560f9e1d1325ec4bc1760c86ed29186d5860d59646d4ea07385ee3b28d879f2374b9b4
diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
b/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild
similarity index 99%
copy from sys-fs/zfs-kmod/zfs-kmod-.ebuild
copy to sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild
index bf0cdfe58be6..8f1c08d298b6 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild
@@ -9,7 +9,7 @@ inherit autotools flag-o-matic linux-mod-r1 multiprocessing
DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
HOMEPAGE="https://github.com/openzfs/zfs";
-MODULES_KERNEL_MAX=6.9
+MODULES_KERNEL_MAX=6.10
MODULES_KERNEL_MIN=3.10
if [[ ${PV} == ]] ; then
diff --git a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
index bf0cdfe58be6..8f1c08d298b6 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -9,7 +9,7 @@ inherit autotools flag-o-matic linux-mod-r1 multiprocessing
DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
HOMEPAGE="https://github.com/openzfs/zfs";
-MODULES_KERNEL_MAX=6.9
+MODULES_KERNEL_MAX=6.10
MODULES_KERNEL_MIN=3.10
if [[ ${PV} == ]] ; then
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
commit: 27deb10d15cda7124f51e257352774d0f1e3ab84
Author: Luke Schwager blucobalt dev>
AuthorDate: Wed Sep 4 22:56:47 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Sep 5 13:00:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27deb10d
sys-fs/zfs: add 2.2.6
Signed-off-by: Luke Schwager blucobalt.dev>
Closes: https://github.com/gentoo/gentoo/pull/38442
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/Manifest | 2 +
sys-fs/zfs/zfs-2.2.6.ebuild | 308
2 files changed, 310 insertions(+)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 99794d263e7a..6a58959b8242 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -10,3 +10,5 @@ DIST zfs-2.2.4.tar.gz 33882933 BLAKE2B
f0026a12b7c1252bf8941e39f23d3e16575003470
DIST zfs-2.2.4.tar.gz.asc 836 BLAKE2B
7fde4232c25056eac2fae76abec4d6749c91d285d79ae6dce4ae4880fa90a26c9fb370dfa4daaf8a849f30fcc1b63eeb215444bfca724f6750bf7e4344f35fa7
SHA512
0cb3caf01b9e4d1f0c35d9f7933a4b11560b9bbf6c05494d8a1775b0a52ac1d642aebd77ef1c7b23a0a06f92e2b1ab3d8afacce41017eb07745d148af7f76a17
DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B
ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f
SHA512
8e288620ce78fb235fa0c9929fc97150987a64091a8a5209209f1e0975d4d6213b8b307e32b3c89d934e83dc8468a1998b797fcdff5d023f07674877b0c6
DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B
ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef
SHA512
0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060
+DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B
0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2
SHA512
c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745
+DIST zfs-2.2.6.tar.gz.asc 836 BLAKE2B
db66f3e2e629ab8a344a8e0c2609bcbb98d69d110fc9e064760ee0c5c25cd67421a71764c4b65d7005e8ff66167bf24beb4be2560a47318eabffa888c1539f26
SHA512
d09f343b3acc3a81e96c069072cfb16d0b490ee77562f50e14524faf05560f9e1d1325ec4bc1760c86ed29186d5860d59646d4ea07385ee3b28d879f2374b9b4
diff --git a/sys-fs/zfs/zfs-2.2.6.ebuild b/sys-fs/zfs/zfs-2.2.6.ebuild
new file mode 100644
index ..87689751ff17
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.2.6.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+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=/usr/share/openpgp-keys/openzfs.asc
+inherit verify-sig
+
+MY_P="${P/_rc/-rc}"
+
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
+SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+S="${WORKDIR}/${MY_P}"
+
+if [[ ${PV} != *_rc* ]]; then
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/5"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
+
+DEPEND="
+dev-libs/openssl:=
+net-libs/libtirpc:=
+sys-apps/util-linux
+sys-libs/zlib
+virtual/libudev:=
+!minimal? ( ${PYTHON_DEPS} )
+pam? ( sys-libs/pam )
+python? (
+$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
+)
+"
+
+BDEPEND="
+app-alternatives/awk
+virtual/pkgconfig
+nls? ( sys-devel/gettext )
+python? (
+${DISTUTILS_DEPS}
+|| (
+dev-python/packaging[${PYTHON_USEDEP}]
+dev-python/distlib[${PYTHON_USEDEP}]
+)
+)
+"
+
+if [[ ${PV} != "" ]] ; then
+BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="
+${DEPEND}
+!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
+!prefix? ( virtual/udev )
+app-alternatives/awk
+
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
commit: 3bdb3afef9807b38f866a50f504b6c2ce3cf3ac0
Author: Sam James gentoo org>
AuthorDate: Wed Aug 21 14:31:33 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 21 14:31:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bdb3afe
sys-fs/zfs-kmod: Stabilize 2.2.5 amd64, #938270
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
index bf0cdfe58be6..f190fb198686 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
@@ -31,7 +31,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/
commit: d2a35b30198c848a45573fecd1e37e7542ecf2ca
Author: Sam James gentoo org>
AuthorDate: Wed Aug 21 14:31:32 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 21 14:31:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a35b30
sys-fs/zfs: Stabilize 2.2.5 amd64, #938270
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.2.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.2.5.ebuild b/sys-fs/zfs/zfs-2.2.5.ebuild
index 5264247e69af..f66317b0b066 100644
--- a/sys-fs/zfs/zfs-2.2.5.ebuild
+++ b/sys-fs/zfs/zfs-2.2.5.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${MY_P}"
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/
commit: 99451bed00e58644a27510be3ba41175a01f648d
Author: Sam James gentoo org>
AuthorDate: Wed Aug 21 11:47:23 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 21 11:47:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99451bed
sys-fs/zfs: Stabilize 2.2.4 ppc64, #935709
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.2.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.2.4.ebuild b/sys-fs/zfs/zfs-2.2.4.ebuild
index 1a6d59e44b58..950fccc9ba5f 100644
--- a/sys-fs/zfs/zfs-2.2.4.ebuild
+++ b/sys-fs/zfs/zfs-2.2.4.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${MY_P}"
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/
commit: 2811eede94925f771107c19676d91c641a716c47
Author: Sam James gentoo org>
AuthorDate: Wed Aug 21 11:47:18 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 21 11:47:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2811eede
sys-fs/zfs: Stabilize 2.2.4 arm64, #935709
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.2.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.2.4.ebuild b/sys-fs/zfs/zfs-2.2.4.ebuild
index 7ac9e93eacae..1a6d59e44b58 100644
--- a/sys-fs/zfs/zfs-2.2.4.ebuild
+++ b/sys-fs/zfs/zfs-2.2.4.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${MY_P}"
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/
commit: bcdbbb77da2c1b3411ce8f49ba7212610b8a015e
Author: Sam James gentoo org>
AuthorDate: Wed Aug 21 11:47:17 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 21 11:47:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcdbbb77
sys-fs/zfs-kmod: Stabilize 2.2.4 arm64, #935709
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
b/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
index a9129e65b825..a489b16c4390 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
@@ -31,7 +31,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/
commit: e03b832d1972e3a19c0afab5b4969b1a34b0a9a4
Author: Sam James gentoo org>
AuthorDate: Wed Aug 21 11:47:22 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 21 11:47:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e03b832d
sys-fs/zfs-kmod: Stabilize 2.2.4 ppc64, #935709
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
b/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
index a489b16c4390..c3bb25d6fc53 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
@@ -31,7 +31,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/
commit: 931e01e91398ba030ae89168a5061066aa21531f
Author: Sam James gentoo org>
AuthorDate: Wed Aug 21 11:47:12 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 21 11:47:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=931e01e9
sys-fs/zfs-kmod: Stabilize 2.2.4 amd64, #935709
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
b/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
index 79b2c443b06d..a9129e65b825 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
@@ -31,7 +31,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/
commit: 707ce1b7d14d3a066f986ad3d232833fb04bbcba
Author: Sam James gentoo org>
AuthorDate: Wed Aug 21 11:47:13 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 21 11:47:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=707ce1b7
sys-fs/zfs: Stabilize 2.2.4 amd64, #935709
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.2.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.2.4.ebuild b/sys-fs/zfs/zfs-2.2.4.ebuild
index 71e2889ab794..7ac9e93eacae 100644
--- a/sys-fs/zfs/zfs-2.2.4.ebuild
+++ b/sys-fs/zfs/zfs-2.2.4.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${MY_P}"
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/
commit: 7823de662577f6f0bd1192c7ba6b0eb259303b54
Author: Luke Schwager blucobalt dev>
AuthorDate: Fri Aug 9 18:12:09 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 10 20:41:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7823de66
sys-fs/zfs-kmod: bump kernel version
Closes: https://github.com/gentoo/gentoo/pull/38001
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 79b2c443b06d..bf0cdfe58be6 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-.ebuild
@@ -9,7 +9,7 @@ inherit autotools flag-o-matic linux-mod-r1 multiprocessing
DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
HOMEPAGE="https://github.com/openzfs/zfs";
-MODULES_KERNEL_MAX=6.8
+MODULES_KERNEL_MAX=6.9
MODULES_KERNEL_MIN=3.10
if [[ ${PV} == ]] ; then
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
commit: ea78e677e9c6fc9bc8a76f0aed66eac22cd67bad
Author: Luke Schwager blucobalt dev>
AuthorDate: Wed Aug 7 07:25:55 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 10 20:41:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea78e677
sys-fs/zfs: add 2.2.5
[sam: Fix formatting.]
Signed-off-by: Luke Schwager blucobalt.dev>
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/Manifest | 2 +
sys-fs/zfs/zfs-2.2.5.ebuild | 308
2 files changed, 310 insertions(+)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 6e4c6cbd42b2..99794d263e7a 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -8,3 +8,5 @@ DIST zfs-2.2.3.tar.gz 33854765 BLAKE2B
f83439aa929609191a048dd326b2a15e0f57c72d2
DIST zfs-2.2.3.tar.gz.asc 836 BLAKE2B
86e1adc393d1f4643a6fd8c188b555e9dc0fdf7e25690f37ff0a04ff8826eb4fe3c125b54f0c5b9ab33f1daff43c4b44373ee9a4df506f6714f98d77782e6c3c
SHA512
fe23ddb9bde78416776411d66a56aa662fa051c8544b4be01ba238b8c1a85ccde1c55329f228fe8ab2681b54a4e4cb08d4e927c597c117242f0b536a40921dc9
DIST zfs-2.2.4.tar.gz 33882933 BLAKE2B
f0026a12b7c1252bf8941e39f23d3e165750034707dfddf034d8aac942a749cb7f0108478797ca978704a22743d9928240b29cf78fe89eda9f873f40102413f0
SHA512
1d17e30573d594fb5c9ea77cde104616dca362fed7530296816d1b55173594f66170fcfb23ab57c27074f85b79d3eb557b4ee9a1c420e507b2434a7902d8dcc1
DIST zfs-2.2.4.tar.gz.asc 836 BLAKE2B
7fde4232c25056eac2fae76abec4d6749c91d285d79ae6dce4ae4880fa90a26c9fb370dfa4daaf8a849f30fcc1b63eeb215444bfca724f6750bf7e4344f35fa7
SHA512
0cb3caf01b9e4d1f0c35d9f7933a4b11560b9bbf6c05494d8a1775b0a52ac1d642aebd77ef1c7b23a0a06f92e2b1ab3d8afacce41017eb07745d148af7f76a17
+DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B
ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f
SHA512
8e288620ce78fb235fa0c9929fc97150987a64091a8a5209209f1e0975d4d6213b8b307e32b3c89d934e83dc8468a1998b797fcdff5d023f07674877b0c6
+DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B
ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef
SHA512
0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060
diff --git a/sys-fs/zfs/zfs-2.2.5.ebuild b/sys-fs/zfs/zfs-2.2.5.ebuild
new file mode 100644
index ..71e2889ab794
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.2.5.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+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=/usr/share/openpgp-keys/openzfs.asc
+ inherit verify-sig
+
+ MY_P="${P/_rc/-rc}"
+
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
+ SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+ S="${WORKDIR}/${MY_P}"
+
+ if [[ ${PV} != *_rc* ]]; then
+ KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+ fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/5"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
+
+DEPEND="
+ dev-libs/openssl:=
+ net-libs/libtirpc:=
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libudev:=
+ !minimal? ( ${PYTHON_DEPS} )
+ pam? ( sys-libs/pam )
+ python? (
+ $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
+ )
+"
+
+BDEPEND="
+ app-alternatives/awk
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ python? (
+ ${DISTUTILS_DEPS}
+ || (
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/distlib[${PYTHON_USEDEP}]
+ )
+ )
+"
+
+if [[ ${PV} != "" ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="
+ ${DEPEND}
+ !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
+ !prefix? ( virtual/udev )
+ app-alternatives/awk
+ sys-fs/udev-init-scripts
+ dist-kernel? ( virtual/dist-kernel
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
commit: 6e1623528f4f569c1cd40f24dd927c83c99c209e
Author: Sam James gentoo org>
AuthorDate: Sat Aug 10 20:41:18 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 10 20:41:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e162352
sys-fs/zfs: wire up new libunwind option
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.2.5.ebuild | 4 +++-
sys-fs/zfs/zfs-.ebuild | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/sys-fs/zfs/zfs-2.2.5.ebuild b/sys-fs/zfs/zfs-2.2.5.ebuild
index 71e2889ab794..5264247e69af 100644
--- a/sys-fs/zfs/zfs-2.2.5.ebuild
+++ b/sys-fs/zfs/zfs-2.2.5.ebuild
@@ -34,7 +34,7 @@ LICENSE="BSD-2 CDDL MIT"
# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
# see libsoversion_check() below as well
SLOT="0/5"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite unwind"
DEPEND="
dev-libs/openssl:=
@@ -47,6 +47,7 @@ DEPEND="
python? (
$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
)
+ unwind? ( sys-libs/libunwind:= )
"
BDEPEND="
@@ -222,6 +223,7 @@ src_configure() {
$(use_enable nls)
$(use_enable pam)
$(use_enable python pyzfs)
+ $(use_with unwind libunwind)
--disable-static
$(usex minimal --without-python --with-python="${EPYTHON}")
)
diff --git a/sys-fs/zfs/zfs-.ebuild b/sys-fs/zfs/zfs-.ebuild
index 7b38a676beca..d54b8ffe39b1 100644
--- a/sys-fs/zfs/zfs-.ebuild
+++ b/sys-fs/zfs/zfs-.ebuild
@@ -34,7 +34,7 @@ LICENSE="BSD-2 CDDL MIT"
# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
# see libsoversion_check() below as well
SLOT="0/5"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite unwind"
DEPEND="
dev-libs/openssl:=
@@ -47,6 +47,7 @@ DEPEND="
python? (
$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
)
+ unwind? ( sys-libs/libunwind:= )
"
BDEPEND="
@@ -220,6 +221,7 @@ src_configure() {
$(use_enable nls)
$(use_enable pam)
$(use_enable python pyzfs)
+ $(use_with unwind libunwind)
--disable-static
$(usex minimal --without-python --with-python="${EPYTHON}")
)
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
commit: 1e166ae1a53eab002b1e4c5e81d60602a596dd88
Author: Luke Schwager blucobalt dev>
AuthorDate: Wed Aug 7 07:26:28 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 10 20:41:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e166ae1
sys-fs/zfs-kmod: add 2.2.5
Signed-off-by: Luke Schwager blucobalt.dev>
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs-kmod/Manifest | 2 +
sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild | 207 ++
2 files changed, 209 insertions(+)
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 6e4c6cbd42b2..99794d263e7a 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -8,3 +8,5 @@ DIST zfs-2.2.3.tar.gz 33854765 BLAKE2B
f83439aa929609191a048dd326b2a15e0f57c72d2
DIST zfs-2.2.3.tar.gz.asc 836 BLAKE2B
86e1adc393d1f4643a6fd8c188b555e9dc0fdf7e25690f37ff0a04ff8826eb4fe3c125b54f0c5b9ab33f1daff43c4b44373ee9a4df506f6714f98d77782e6c3c
SHA512
fe23ddb9bde78416776411d66a56aa662fa051c8544b4be01ba238b8c1a85ccde1c55329f228fe8ab2681b54a4e4cb08d4e927c597c117242f0b536a40921dc9
DIST zfs-2.2.4.tar.gz 33882933 BLAKE2B
f0026a12b7c1252bf8941e39f23d3e165750034707dfddf034d8aac942a749cb7f0108478797ca978704a22743d9928240b29cf78fe89eda9f873f40102413f0
SHA512
1d17e30573d594fb5c9ea77cde104616dca362fed7530296816d1b55173594f66170fcfb23ab57c27074f85b79d3eb557b4ee9a1c420e507b2434a7902d8dcc1
DIST zfs-2.2.4.tar.gz.asc 836 BLAKE2B
7fde4232c25056eac2fae76abec4d6749c91d285d79ae6dce4ae4880fa90a26c9fb370dfa4daaf8a849f30fcc1b63eeb215444bfca724f6750bf7e4344f35fa7
SHA512
0cb3caf01b9e4d1f0c35d9f7933a4b11560b9bbf6c05494d8a1775b0a52ac1d642aebd77ef1c7b23a0a06f92e2b1ab3d8afacce41017eb07745d148af7f76a17
+DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B
ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f
SHA512
8e288620ce78fb235fa0c9929fc97150987a64091a8a5209209f1e0975d4d6213b8b307e32b3c89d934e83dc8468a1998b797fcdff5d023f07674877b0c6
+DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B
ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef
SHA512
0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
new file mode 100644
index ..bf0cdfe58be6
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_INITRAMFS_IUSE=+initramfs
+inherit autotools flag-o-matic linux-mod-r1 multiprocessing
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs";
+
+MODULES_KERNEL_MAX=6.9
+MODULES_KERNEL_MIN=3.10
+
+if [[ ${PV} == ]] ; 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/
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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
commit: 69246d0b12ba6ce771b92467ad865ec83fa7af02
Author: Sam James gentoo org>
AuthorDate: Sat May 11 02:02:27 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat May 11 02:02:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69246d0b
sys-fs/zfs: Stabilize 2.2.3 arm64, #931699
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.2.3.ebuild b/sys-fs/zfs/zfs-2.2.3.ebuild
index 7ac9e93eacae..1a6d59e44b58 100644
--- a/sys-fs/zfs/zfs-2.2.3.ebuild
+++ b/sys-fs/zfs/zfs-2.2.3.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${MY_P}"
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/
commit: 18ac2dc8dca547938c8e7d4123a67ecba9f9ae62
Author: Sam James gentoo org>
AuthorDate: Sat May 11 02:02:30 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat May 11 02:02:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ac2dc8
sys-fs/zfs: Stabilize 2.2.3 ppc64, #931699
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.2.3.ebuild b/sys-fs/zfs/zfs-2.2.3.ebuild
index 1a6d59e44b58..950fccc9ba5f 100644
--- a/sys-fs/zfs/zfs-2.2.3.ebuild
+++ b/sys-fs/zfs/zfs-2.2.3.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${MY_P}"
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/
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/
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/
commit: 751e86f85faa8fb29e2a19b34253fe32977db0f6
Author: Sam James gentoo org>
AuthorDate: Sat May 11 02:02:19 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat May 11 02:02:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=751e86f8
sys-fs/zfs: Stabilize 2.1.15 ppc64, #931698
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.1.15.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.1.15.ebuild b/sys-fs/zfs/zfs-2.1.15.ebuild
index 8a7a037a39d1..5dcfd94d6ae2 100644
--- a/sys-fs/zfs/zfs-2.1.15.ebuild
+++ b/sys-fs/zfs/zfs-2.1.15.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${P%_rc?}"
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/
commit: dc0d648fa7cc1a50e785bc0fdeb566d8be138958
Author: Sam James gentoo org>
AuthorDate: Sat May 11 02:02:23 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat May 11 02:02:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc0d648f
sys-fs/zfs: Stabilize 2.2.3 amd64, #931699
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.2.3.ebuild b/sys-fs/zfs/zfs-2.2.3.ebuild
index 71e2889ab794..7ac9e93eacae 100644
--- a/sys-fs/zfs/zfs-2.2.3.ebuild
+++ b/sys-fs/zfs/zfs-2.2.3.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${MY_P}"
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/
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/
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/
commit: 2cdca5cc4f1c4594af0795d690ff6c1c8818a4ac
Author: Sam James gentoo org>
AuthorDate: Sat May 11 02:02:15 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat May 11 02:02:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cdca5cc
sys-fs/zfs: Stabilize 2.1.15 arm64, #931698
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.1.15.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.1.15.ebuild b/sys-fs/zfs/zfs-2.1.15.ebuild
index e41512c47772..8a7a037a39d1 100644
--- a/sys-fs/zfs/zfs-2.1.15.ebuild
+++ b/sys-fs/zfs/zfs-2.1.15.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${P%_rc?}"
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/
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/
commit: b750a778a30e398da4a1379a109f0c24fd864739
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=b750a778
sys-fs/zfs: Stabilize 2.1.15 amd64, #931698
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.1.15.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.1.15.ebuild b/sys-fs/zfs/zfs-2.1.15.ebuild
index 606c4bf649fd..e41512c47772 100644
--- a/sys-fs/zfs/zfs-2.1.15.ebuild
+++ b/sys-fs/zfs/zfs-2.1.15.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${P%_rc?}"
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/
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/
commit: 54cd669fae4c965242510044481ac5df0beaaba0
Author: Sam James gentoo org>
AuthorDate: Fri May 3 04:49:50 2024 +
Commit: Sam James gentoo org>
CommitDate: Fri May 3 04:53:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54cd669f
sys-fs/zfs: 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/Manifest | 2 +
sys-fs/zfs/zfs-2.2.4.ebuild | 308
2 files changed, 310 insertions(+)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index b1d0e6ec325b..6e4c6cbd42b2 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/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/zfs-2.2.4.ebuild b/sys-fs/zfs/zfs-2.2.4.ebuild
new file mode 100644
index ..71e2889ab794
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.2.4.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+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=/usr/share/openpgp-keys/openzfs.asc
+ inherit verify-sig
+
+ MY_P="${P/_rc/-rc}"
+
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
+ SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+ S="${WORKDIR}/${MY_P}"
+
+ if [[ ${PV} != *_rc* ]]; then
+ KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+ fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/5"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
+
+DEPEND="
+ dev-libs/openssl:=
+ net-libs/libtirpc:=
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libudev:=
+ !minimal? ( ${PYTHON_DEPS} )
+ pam? ( sys-libs/pam )
+ python? (
+ $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
+ )
+"
+
+BDEPEND="
+ app-alternatives/awk
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ python? (
+ ${DISTUTILS_DEPS}
+ || (
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/distlib[${PYTHON_USEDEP}]
+ )
+ )
+"
+
+if [[ ${PV} != "" ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="
+ ${DEPEND}
+ !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
+ !prefix? ( virtua
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
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/
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/
commit: 6bd56dde8002e18af51a6240c589c47275c2672d
Author: Sam James gentoo org>
AuthorDate: Thu Feb 29 08:22:44 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Feb 29 08:22:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bd56dde
sys-fs/zfs: add 2.1.15
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/Manifest | 2 +
sys-fs/zfs/zfs-2.1.15.ebuild | 311 +++
2 files changed, 313 insertions(+)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 15f09f09fd54..b1d0e6ec325b 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/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/zfs-2.1.15.ebuild b/sys-fs/zfs/zfs-2.1.15.ebuild
new file mode 100644
index ..606c4bf649fd
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.1.15.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+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=/usr/share/openpgp-keys/openzfs.asc
+ inherit verify-sig
+
+ MY_P="${P/_rc/-rc}"
+
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
+ SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+ S="${WORKDIR}/${P%_rc?}"
+
+ if [[ ${PV} != *_rc* ]]; then
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+ fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/5"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
+
+DEPEND="
+ net-libs/libtirpc:=
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libudev:=
+ dev-libs/openssl:0=
+ !minimal? ( ${PYTHON_DEPS} )
+ pam? ( sys-libs/pam )
+ python? (
+ $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
+ )
+"
+
+BDEPEND="app-alternatives/awk
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ python? (
+ ${DISTUTILS_DEPS}
+ || (
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
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/files/
commit: e2a9a0b1afbd30bbcb23339e9cd870ea435678d5 Author: Sam James gentoo org> AuthorDate: Fri Feb 23 06:41:30 2024 + Commit: Sam James gentoo org> CommitDate: Fri Feb 23 06:41:37 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a9a0b1 sys-fs/zfs: update musl patch Bug: https://bugs.gentoo.org/925281 Signed-off-by: Sam James gentoo.org> sys-fs/zfs/files/2.2.3-musl.patch | 41 +-- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/sys-fs/zfs/files/2.2.3-musl.patch b/sys-fs/zfs/files/2.2.3-musl.patch index 41ce14633667..01433490e82f 100644 --- a/sys-fs/zfs/files/2.2.3-musl.patch +++ b/sys-fs/zfs/files/2.2.3-musl.patch @@ -1,23 +1,50 @@ https://github.com/openzfs/zfs/pull/15925 -From 3fa84afb3f4334b6609f0dcb141e5d10095e585b Mon Sep 17 00:00:00 2001 +From 68419c70dc7235a4954d6c0c09d60f9ebe694a3c Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 23 Feb 2024 05:12:09 + -Subject: [PATCH] tests: use instead of +Subject: [PATCH] Use instead of When building on musl, we get: ``` In file included from tests/zfs-tests/cmd/getversion.c:22: /usr/include/sys/fcntl.h:1:2: error: #warning redirecting incorrect #include to [-Werror=cpp] 1 | #warning redirecting incorrect #include to - | ^~~ -``` -There's some other use of in the codebase, but they're on the -module side, where libspl seems to handle it all, so not touching that. +In file included from module/os/linux/zfs/vdev_file.c:36: +/usr/include/sys/fcntl.h:1:2: error: #warning redirecting incorrect #include to [-Werror=cpp] +1 | #warning redirecting incorrect #include to +``` Bug: https://bugs.gentoo.org/925235 Signed-off-by: Sam James +--- + module/os/linux/zfs/vdev_file.c | 2 +- + tests/zfs-tests/cmd/getversion.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/module/os/linux/zfs/vdev_file.c b/module/os/linux/zfs/vdev_file.c +index 5abc0426d1..68e3042a97 100644 +--- a/module/os/linux/zfs/vdev_file.c b/module/os/linux/zfs/vdev_file.c +@@ -23,6 +23,7 @@ + * Copyright (c) 2011, 2020 by Delphix. All rights reserved. + */ + ++#include + #include + #include + #include +@@ -33,7 +34,6 @@ + #include + #include + #include +-#include + #include + #include + #ifdef _KERNEL +diff --git a/tests/zfs-tests/cmd/getversion.c b/tests/zfs-tests/cmd/getversion.c +index 62c1c5b6ab..1e026b92d1 100644 --- a/tests/zfs-tests/cmd/getversion.c +++ b/tests/zfs-tests/cmd/getversion.c @@ -19,9 +19,9 @@ @@ -31,4 +58,6 @@ Signed-off-by: Sam James #include #include #include +-- +2.43.2
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
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/, sys-fs/zfs/files/
commit: bda8ae7ff2bba3e341c010c67009aa403985656d
Author: Sam James gentoo org>
AuthorDate: Fri Feb 23 05:04:44 2024 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 23 06:33:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bda8ae7f
sys-fs/zfs: add 2.2.3
Bug: https://bugs.gentoo.org/925290
Closes: https://bugs.gentoo.org/925281
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/Manifest | 2 ++
sys-fs/zfs/files/2.2.3-musl.patch| 34
sys-fs/zfs/{zfs-.ebuild => zfs-2.2.3.ebuild} | 4 ++-
sys-fs/zfs/zfs-.ebuild | 2 +-
4 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 4591d964e4e4..15f09f09fd54 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/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/files/2.2.3-musl.patch
b/sys-fs/zfs/files/2.2.3-musl.patch
new file mode 100644
index ..41ce14633667
--- /dev/null
+++ b/sys-fs/zfs/files/2.2.3-musl.patch
@@ -0,0 +1,34 @@
+https://github.com/openzfs/zfs/pull/15925
+
+From 3fa84afb3f4334b6609f0dcb141e5d10095e585b Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Fri, 23 Feb 2024 05:12:09 +
+Subject: [PATCH] tests: use instead of
+
+When building on musl, we get:
+```
+In file included from tests/zfs-tests/cmd/getversion.c:22:
+/usr/include/sys/fcntl.h:1:2: error: #warning redirecting incorrect #include
to [-Werror=cpp]
+1 | #warning redirecting incorrect #include to
+ | ^~~
+```
+
+There's some other use of in the codebase, but they're on the
+module side, where libspl seems to handle it all, so not touching that.
+
+Bug: https://bugs.gentoo.org/925235
+Signed-off-by: Sam James
+--- a/tests/zfs-tests/cmd/getversion.c
b/tests/zfs-tests/cmd/getversion.c
+@@ -19,9 +19,9 @@
+ */
+
+ #include
+-#include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+
diff --git a/sys-fs/zfs/zfs-.ebuild b/sys-fs/zfs/zfs-2.2.3.ebuild
similarity index 98%
copy from sys-fs/zfs/zfs-.ebuild
copy to sys-fs/zfs/zfs-2.2.3.ebuild
index 3f4ecf0f9b94..71e2889ab794 100644
--- a/sys-fs/zfs/zfs-.ebuild
+++ b/sys-fs/zfs/zfs-2.2.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_OPTIONAL=1
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
@@ -105,6 +105,8 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
+ "${FILESDIR}"/2.2.2-no-USER_NS.patch
+ "${FILESDIR}"/2.2.3-musl.patch
)
pkg_pretend() {
diff --git a/sys-fs/zfs/zfs-.ebuild b/sys-fs/zfs/zfs-.ebuild
index 3f4ecf0f9b94..7b38a676beca 100644
--- a/sys-fs/zfs/zfs-.ebuild
+++ b/sys-fs/zfs/zfs-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_OPTIONAL=1
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-auto-snapshot/
commit: ff5d3f8e3d33746503c5c868d8654793e650bc0a Author: Marc Schiffbauer gentoo org> AuthorDate: Fri Feb 16 12:59:33 2024 + Commit: Marc Schiffbauer gentoo org> CommitDate: Fri Feb 16 12:59:52 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff5d3f8e sys-fs/zfs-auto-snapshot: add myself as a maintainer Signed-off-by: Marc Schiffbauer gentoo.org> sys-fs/zfs-auto-snapshot/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys-fs/zfs-auto-snapshot/metadata.xml b/sys-fs/zfs-auto-snapshot/metadata.xml index e90679bbaa7c..927b1d188871 100644 --- a/sys-fs/zfs-auto-snapshot/metadata.xml +++ b/sys-fs/zfs-auto-snapshot/metadata.xml @@ -1,7 +1,10 @@ https://www.gentoo.org/dtd/metadata.dtd";> - + + msch...@gentoo.org + Marc Schiffbauer + An alternative implementation of the zfs-auto-snapshot service for Linux that is compatible with zfs-linux and zfs-fuse.
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-auto-snapshot/
commit: cf5f510a0b807c4c7908014ac2de018ca9a94068
Author: Matoro Mahri matoro tk>
AuthorDate: Fri Feb 9 16:45:33 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Feb 10 06:48:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf5f510a
sys-fs/zfs-auto-snapshot: Stabilize 1.2.4-r3 ppc64, #907395
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild
b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild
index 35cb47ad29d0..18c1884aaa53 100644
--- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild
+++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ]]; then
else
MY_P="${PN}-upstream-${PV}"
SRC_URI="https://github.com/zfsonlinux/${PN}/archive/upstream/${PV}.tar.gz ->
${MY_P}.tar.gz"
- KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
+ KEYWORDS="amd64 arm64 ppc64 ~riscv"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/, sys-fs/zfs-kmod/files/
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(&vd->vdev_autotrim_kick_cv, &vd->vdev_autotrim_lock);
++ cv_wait_idle(&vd->vdev_autotrim_kick_cv,
++ &vd->vdev_autotrim_lock);
+ }
+ boolean_t exit_wanted = vd->vdev_autotrim_exit_wanted;
+ mutex_exit(&vd->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/
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/
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
+++ b/sy
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-auto-snapshot/
commit: 7d6a0305d6bb8d307e54375e10efdd746d1e2780
Author: Matoro Mahri matoro tk>
AuthorDate: Thu Jan 25 00:23:33 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Jan 25 00:52:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d6a0305
sys-fs/zfs-auto-snapshot: Stabilize 1.2.4-r3 arm64, #907395
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild
b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild
index 8338ae98ab90..35cb47ad29d0 100644
--- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild
+++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.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
@@ -11,7 +11,7 @@ if [[ ${PV} == ]]; then
else
MY_P="${PN}-upstream-${PV}"
SRC_URI="https://github.com/zfsonlinux/${PN}/archive/upstream/${PV}.tar.gz ->
${MY_P}.tar.gz"
- KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
+ KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
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/
commit: b430d39e7c0b2a295a7db1d1ce925b73420c603e
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=b430d39e
sys-fs/zfs: Stabilize 2.2.2-r1 amd64, #921701
Signed-off-by: Arthur Zamarin gentoo.org>
sys-fs/zfs/zfs-2.2.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.2.2-r1.ebuild b/sys-fs/zfs/zfs-2.2.2-r1.ebuild
index 5d676afae4d7..70ea6579abcc 100644
--- a/sys-fs/zfs/zfs-2.2.2-r1.ebuild
+++ b/sys-fs/zfs/zfs-2.2.2-r1.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${MY_P}"
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/
commit: baecd65319f7a3e02fc46d12213013e60268370f
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=baecd653
sys-fs/zfs: Stabilize 2.2.2-r1 ppc64, #921701
Signed-off-by: Arthur Zamarin gentoo.org>
sys-fs/zfs/zfs-2.2.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.2.2-r1.ebuild b/sys-fs/zfs/zfs-2.2.2-r1.ebuild
index 5a2426b6148c..80914d259c33 100644
--- a/sys-fs/zfs/zfs-2.2.2-r1.ebuild
+++ b/sys-fs/zfs/zfs-2.2.2-r1.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${MY_P}"
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/
commit: c6f160aae0cd52f58e018b0c9d7757062c2b3f06
Author: Arthur Zamarin gentoo org>
AuthorDate: Mon Jan 22 17:28:22 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Jan 22 17:28:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f160aa
sys-fs/zfs: Stabilize 2.2.2-r1 arm64, #921701
Signed-off-by: Arthur Zamarin gentoo.org>
sys-fs/zfs/zfs-2.2.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.2.2-r1.ebuild b/sys-fs/zfs/zfs-2.2.2-r1.ebuild
index 70ea6579abcc..5a2426b6148c 100644
--- a/sys-fs/zfs/zfs-2.2.2-r1.ebuild
+++ b/sys-fs/zfs/zfs-2.2.2-r1.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${MY_P}"
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/
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/
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/
commit: f5d25df5432b6a3be82ea25fbca8e887106a4a3e
Author: Sam James gentoo org>
AuthorDate: Mon Jan 8 09:40:29 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Jan 8 09:42:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d25df5
sys-fs/zfs: sys-devel/bc -> app-alternatives/bc
All of these will be using app-alternatives/bc anyway as they're not calling
bc-reference, so make the dep reflect reality.
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.1.14.ebuild | 4 ++--
sys-fs/zfs/zfs-2.2.2-r1.ebuild | 4 ++--
sys-fs/zfs/zfs-.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys-fs/zfs/zfs-2.1.14.ebuild b/sys-fs/zfs/zfs-2.1.14.ebuild
index 3a00ad47b497..2f4604c01924 100644
--- a/sys-fs/zfs/zfs-2.1.14.ebuild
+++ b/sys-fs/zfs/zfs-2.1.14.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
@@ -81,7 +81,7 @@ RDEPEND="${DEPEND}
app-shells/ksh
sys-apps/kmod[tools]
sys-apps/util-linux
- sys-devel/bc
+ app-alternatives/bc
sys-block/parted
sys-fs/lsscsi
sys-fs/mdadm
diff --git a/sys-fs/zfs/zfs-2.2.2-r1.ebuild b/sys-fs/zfs/zfs-2.2.2-r1.ebuild
index 517a099dce8c..01eb1c79f508 100644
--- a/sys-fs/zfs/zfs-2.2.2-r1.ebuild
+++ b/sys-fs/zfs/zfs-2.2.2-r1.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
@@ -83,7 +83,7 @@ RDEPEND="
app-shells/ksh
sys-apps/kmod[tools]
sys-apps/util-linux
- sys-devel/bc
+ app-alternatives/bc
sys-block/parted
sys-fs/lsscsi
sys-fs/mdadm
diff --git a/sys-fs/zfs/zfs-.ebuild b/sys-fs/zfs/zfs-.ebuild
index 0ae53ecba862..49eafadd4d8d 100644
--- a/sys-fs/zfs/zfs-.ebuild
+++ b/sys-fs/zfs/zfs-.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
@@ -83,7 +83,7 @@ RDEPEND="
app-shells/ksh
sys-apps/kmod[tools]
sys-apps/util-linux
- sys-devel/bc
+ app-alternatives/bc
sys-block/parted
sys-fs/lsscsi
sys-fs/mdadm
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
commit: ab4c82408c58e8243d510ea7fb9c36e03e3a3fb6
Author: Sam James gentoo org>
AuthorDate: Thu Dec 28 03:40:24 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Dec 28 03:40:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab4c8240
sys-fs/zfs: drop 2.2.1, 2.2.2
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/Manifest | 2 -
sys-fs/zfs/zfs-2.2.1.ebuild | 306
sys-fs/zfs/zfs-2.2.2.ebuild | 306
3 files changed, 614 deletions(-)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 8c893b1a1e3f..4591d964e4e4 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/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/zfs-2.2.1.ebuild b/sys-fs/zfs/zfs-2.2.1.ebuild
deleted file mode 100644
index 5f41c0934171..
--- a/sys-fs/zfs/zfs-2.2.1.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-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=/usr/share/openpgp-keys/openzfs.asc
- inherit verify-sig
-
- MY_P="${P/_rc/-rc}"
-
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
- SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
- S="${WORKDIR}/${MY_P}"
-
- if [[ ${PV} != *_rc* ]]; then
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
- fi
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-# just libzfs soname major for now.
-# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
-# see libsoversion_check() below as well
-SLOT="0/5"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
-
-DEPEND="
- dev-libs/openssl:=
- net-libs/libtirpc:=
- sys-apps/util-linux
- sys-libs/zlib
- virtual/libudev:=
- !minimal? ( ${PYTHON_DEPS} )
- pam? ( sys-libs/pam )
- python? (
- $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
- )
-"
-
-BDEPEND="
- app-alternatives/awk
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- python? (
- ${DISTUTILS_DEPS}
- || (
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/distlib[${PYTHON_USEDEP}]
- )
- )
-"
-
-if [[ ${PV} != "" ]] ; then
- BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
-fi
-
-# awk is used for some scripts, completions, and the
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
commit: 2c8e63d9a0517f206cf04cc0738c09e319c4c9a1
Author: Sam James gentoo org>
AuthorDate: Thu Dec 28 03:40:10 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Dec 28 03:40:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c8e63d9
sys-fs/zfs: drop 2.1.12, 2.1.13
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/Manifest | 4 -
sys-fs/zfs/zfs-2.1.12.ebuild | 311 ---
sys-fs/zfs/zfs-2.1.13.ebuild | 311 ---
3 files changed, 626 deletions(-)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 1701e00a2c16..8c893b1a1e3f 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/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/zfs-2.1.12.ebuild b/sys-fs/zfs/zfs-2.1.12.ebuild
deleted file mode 100644
index 3a00ad47b497..
--- a/sys-fs/zfs/zfs-2.1.12.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-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=/usr/share/openpgp-keys/openzfs.asc
- inherit verify-sig
-
- MY_P="${P/_rc/-rc}"
-
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
- SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
- S="${WORKDIR}/${P%_rc?}"
-
- if [[ ${PV} != *_rc* ]]; then
- KEYWORDS="amd64 arm64 ppc64 ~riscv ~sparc"
- fi
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-# just libzfs soname major for now.
-# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
-# see libsoversion_check() below as well
-SLOT="0/5"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
-
-DEPEND="
- net-libs/libtirpc:=
- sys-apps/util-linux
- sys-libs/zlib
- virtual/libudev:=
- dev-libs/openssl:0=
- !minimal? ( ${PYTHON_DEPS} )
- pam? ( sys-libs/pam )
- python? (
- $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
- )
-"
-
-BDEPEND="app-alternatives/awk
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- python? (
- ${DISTUTILS_DEPS}
- || (
-
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/, sys-fs/zfs-kmod/files/
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 100644
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/, sys-fs/zfs-kmod/
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 thi
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
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/
commit: b8a09b5e3ed6a73e7547965680b45fb890d5684b
Author: WANG Xuerui gentoo org>
AuthorDate: Wed Dec 27 06:42:27 2023 +
Commit: WANG Xuerui gentoo org>
CommitDate: Wed Dec 27 06:42:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a09b5e
sys-fs/zfs: forward ~loong
Signed-off-by: WANG Xuerui gentoo.org>
sys-fs/zfs/zfs-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-.ebuild b/sys-fs/zfs/zfs-.ebuild
index 5f41c0934171..0ae53ecba862 100644
--- a/sys-fs/zfs/zfs-.ebuild
+++ b/sys-fs/zfs/zfs-.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${MY_P}"
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/
commit: d567454a46b697a45b63e99a0e3e964598cccbce
Author: WANG Xuerui gentoo org>
AuthorDate: Wed Dec 27 06:42:22 2023 +
Commit: WANG Xuerui gentoo org>
CommitDate: Wed Dec 27 06:42:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d567454a
sys-fs/zfs: keyword 2.2.2-r1 for ~loong
Signed-off-by: WANG Xuerui gentoo.org>
sys-fs/zfs/zfs-2.2.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.2.2-r1.ebuild b/sys-fs/zfs/zfs-2.2.2-r1.ebuild
index 086ac897e35e..517a099dce8c 100644
--- a/sys-fs/zfs/zfs-2.2.2-r1.ebuild
+++ b/sys-fs/zfs/zfs-2.2.2-r1.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${MY_P}"
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/
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/
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/, sys-fs/zfs/files/
commit: 1558e62d2db5a3c783628fcca2c4cd9cd3cb4144
Author: Sam James gentoo org>
AuthorDate: Sat Dec 16 10:05:32 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Dec 16 10:06:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1558e62d
sys-fs/zfs: fix runtime breakage w/o CONFIG_USER_NS
Prompted by https://forums.gentoo.org/viewtopic-p-8810010.html.
Bug: https://github.com/openzfs/zfs/issues/15241
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/files/2.2.2-no-USER_NS.patch | 39
sys-fs/zfs/zfs-2.2.2-r1.ebuild | 307
2 files changed, 346 insertions(+)
diff --git a/sys-fs/zfs/files/2.2.2-no-USER_NS.patch
b/sys-fs/zfs/files/2.2.2-no-USER_NS.patch
new file mode 100644
index ..b132db9d4bf6
--- /dev/null
+++ b/sys-fs/zfs/files/2.2.2-no-USER_NS.patch
@@ -0,0 +1,39 @@
+https://github.com/openzfs/zfs/issues/15241
+https://github.com/openzfs/zfs/pull/15560
+
+From e0a7ec29d91b79adfd81073f229241351ed0ae21 Mon Sep 17 00:00:00 2001
+From: Ilkka Sovanto
+Date: Wed, 22 Nov 2023 20:24:47 +0200
+Subject: [PATCH] Fix zoneid when USER_NS is disabled
+
+getzoneid() should return GLOBAL_ZONEID instead of 0 when USER_NS is disabled.
+
+Signed-off-by: Ilkka Sovanto
+--- a/lib/libspl/os/linux/zone.c
b/lib/libspl/os/linux/zone.c
+@@ -42,20 +42,20 @@ getzoneid(void)
+ int c = snprintf(path, sizeof (path), "/proc/self/ns/user");
+ /* This API doesn't have any error checking... */
+ if (c < 0 || c >= sizeof (path))
+- return (0);
++ return (GLOBAL_ZONEID);
+
+ ssize_t r = readlink(path, buf, sizeof (buf) - 1);
+ if (r < 0)
+- return (0);
++ return (GLOBAL_ZONEID);
+
+ cp = strchr(buf, '[');
+ if (cp == NULL)
+- return (0);
++ return (GLOBAL_ZONEID);
+ cp++;
+
+ unsigned long n = strtoul(cp, NULL, 10);
+ if (n == ULONG_MAX && errno == ERANGE)
+- return (0);
++ return (GLOBAL_ZONEID);
+ zoneid_t z = (zoneid_t)n;
+
+ return (z);
+
diff --git a/sys-fs/zfs/zfs-2.2.2-r1.ebuild b/sys-fs/zfs/zfs-2.2.2-r1.ebuild
new file mode 100644
index ..086ac897e35e
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.2.2-r1.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+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=/usr/share/openpgp-keys/openzfs.asc
+ inherit verify-sig
+
+ MY_P="${P/_rc/-rc}"
+
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
+ SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+ S="${WORKDIR}/${MY_P}"
+
+ if [[ ${PV} != *_rc* ]]; then
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+ fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/5"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
+
+DEPEND="
+ dev-libs/openssl:=
+ net-libs/libtirpc:=
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libudev:=
+ !minimal? ( ${PYTHON_DEPS} )
+ pam? ( sys-libs/pam )
+ python? (
+ $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
+ )
+"
+
+BDEPEND="
+ app-alternatives/awk
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ python? (
+ ${DISTUTILS_DEPS}
+ || (
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/distlib[${PYTHON_USEDEP}]
+ )
+ )
+"
+
+if [[ ${PV} != "" ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="
+ ${DEPEND}
+ !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
+ !prefix? ( virtual/udev )
+ app-alternatives/awk
+ sys-fs/udev-init-scripts
+ dist-kernel? ( virtual/dist-kernel:= )
+ rootfs? (
+ app-arch/cpio
+ app-misc/pax-utils
+ )
+ selinux? ( sec-policy/selinux-zfs )
+ test-suite? (
+ app-shells/ksh
+ sys-apps/km
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
commit: 29516bcac59a3ead4940d0ee4027e980f738d123
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=29516bca
sys-fs/zfs: Stabilize 2.1.14 amd64, #919746
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.1.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.1.14.ebuild b/sys-fs/zfs/zfs-2.1.14.ebuild
index bc031e7c7f9a..f7b2fb79ed17 100644
--- a/sys-fs/zfs/zfs-2.1.14.ebuild
+++ b/sys-fs/zfs/zfs-2.1.14.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${P%_rc?}"
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/
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/
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/
commit: 9db042349f33093cc77dde10621aa98b7cdc7f89
Author: Sam James gentoo org>
AuthorDate: Tue Dec 12 03:56:14 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 12 03:56:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9db04234
sys-fs/zfs: Stabilize 2.1.14 ppc64, #919746
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.1.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.1.14.ebuild b/sys-fs/zfs/zfs-2.1.14.ebuild
index f7b2fb79ed17..bc121e2e090b 100644
--- a/sys-fs/zfs/zfs-2.1.14.ebuild
+++ b/sys-fs/zfs/zfs-2.1.14.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${P%_rc?}"
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/
commit: 551eb4516b16fb0cf9bacd46741836be9128daa9
Author: Sam James gentoo org>
AuthorDate: Tue Dec 12 03:56:18 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 12 03:56:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=551eb451
sys-fs/zfs: Stabilize 2.1.14 arm64, #919746
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.1.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.1.14.ebuild b/sys-fs/zfs/zfs-2.1.14.ebuild
index bc121e2e090b..3a00ad47b497 100644
--- a/sys-fs/zfs/zfs-2.1.14.ebuild
+++ b/sys-fs/zfs/zfs-2.1.14.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${P%_rc?}"
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/
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/
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/
commit: f514cb6977d2532915365753e4be976b994acc4c
Author: Sam James gentoo org>
AuthorDate: Fri Dec 1 03:24:49 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 1 03:24:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f514cb69
sys-fs/zfs: add 2.2.2
Bug: https://bugs.gentoo.org/917224
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/Manifest | 2 +
sys-fs/zfs/zfs-2.2.2.ebuild | 306
2 files changed, 308 insertions(+)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 60487ce02dbe..1701e00a2c16 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/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/zfs-2.2.2.ebuild b/sys-fs/zfs/zfs-2.2.2.ebuild
new file mode 100644
index ..5f41c0934171
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.2.2.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+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=/usr/share/openpgp-keys/openzfs.asc
+ inherit verify-sig
+
+ MY_P="${P/_rc/-rc}"
+
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
+ SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+ S="${WORKDIR}/${MY_P}"
+
+ if [[ ${PV} != *_rc* ]]; then
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+ fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/5"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
+
+DEPEND="
+ dev-libs/openssl:=
+ net-libs/libtirpc:=
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libudev:=
+ !minimal? ( ${PYTHON_DEPS} )
+ pam? ( sys-libs/pam )
+ python? (
+ $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
+ )
+"
+
+BDEPEND="
+ app-alternatives/awk
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ python? (
+ ${DISTUTILS_DEPS}
+ || (
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/distlib[${PYTHON_USEDEP}]
+ )
+ )
+"
+
+if [[ ${PV} != "" ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="
+ ${DEPEND}
+ !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
+ !prefix? ( virtual/udev )
+ app-alternatives/awk
+ sys-fs/udev-init-scripts
+ dist-kernel? ( virtual/dist-kernel:= )
+ rootfs? (
+ app-arc
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
commit: 44de969fbb5705ebb658700ee0d5cc2da361a107
Author: Sam James gentoo org>
AuthorDate: Fri Dec 1 03:21:52 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 1 03:21:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44de969f
sys-fs/zfs: add 2.1.14
Bug: https://bugs.gentoo.org/917224
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/Manifest | 2 +
sys-fs/zfs/zfs-2.1.14.ebuild | 311 +++
2 files changed, 313 insertions(+)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 4b19d24cad35..60487ce02dbe 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/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/zfs-2.1.14.ebuild b/sys-fs/zfs/zfs-2.1.14.ebuild
new file mode 100644
index ..bc031e7c7f9a
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.1.14.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+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=/usr/share/openpgp-keys/openzfs.asc
+ inherit verify-sig
+
+ MY_P="${P/_rc/-rc}"
+
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
+ SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+ S="${WORKDIR}/${P%_rc?}"
+
+ if [[ ${PV} != *_rc* ]]; then
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+ fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/5"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
+
+DEPEND="
+ net-libs/libtirpc:=
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libudev:=
+ dev-libs/openssl:0=
+ !minimal? ( ${PYTHON_DEPS} )
+ pam? ( sys-libs/pam )
+ python? (
+ $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
+ )
+"
+
+BDEPEND="app-alternatives/awk
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ python? (
+ ${DISTUTILS_DEPS}
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
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/
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/
commit: a858fdbec905c61e497ff6710805a58847b03f20
Author: Sam James gentoo org>
AuthorDate: Mon Nov 27 00:22:17 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Nov 27 00:22:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a858fdbe
sys-fs/zfs: 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/Manifest | 2 -
sys-fs/zfs/zfs-2.2.0.ebuild | 306
2 files changed, 308 deletions(-)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 08acc4fbbfa4..4b19d24cad35 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/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/zfs-2.2.0.ebuild b/sys-fs/zfs/zfs-2.2.0.ebuild
deleted file mode 100644
index 5f41c0934171..
--- a/sys-fs/zfs/zfs-2.2.0.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-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=/usr/share/openpgp-keys/openzfs.asc
- inherit verify-sig
-
- MY_P="${P/_rc/-rc}"
-
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
- SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
- S="${WORKDIR}/${MY_P}"
-
- if [[ ${PV} != *_rc* ]]; then
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
- fi
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-# just libzfs soname major for now.
-# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
-# see libsoversion_check() below as well
-SLOT="0/5"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
-
-DEPEND="
- dev-libs/openssl:=
- net-libs/libtirpc:=
- sys-apps/util-linux
- sys-libs/zlib
- virtual/libudev:=
- !minimal? ( ${PYTHON_DEPS} )
- pam? ( sys-libs/pam )
- python? (
- $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
- )
-"
-
-BDEPEND="
- app
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
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/
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 @@ Allo
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
commit: a6c49ddd0067b6e4a272a9b9c1f9ade21da535d9
Author: Sam James gentoo org>
AuthorDate: Wed Nov 22 10:42:26 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Nov 22 10:43:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6c49ddd
sys-fs/zfs: 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/Manifest | 2 +
sys-fs/zfs/zfs-2.2.1.ebuild | 306
2 files changed, 308 insertions(+)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 957012433003..08acc4fbbfa4 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/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/zfs-2.2.1.ebuild b/sys-fs/zfs/zfs-2.2.1.ebuild
new file mode 100644
index ..5f41c0934171
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.2.1.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+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=/usr/share/openpgp-keys/openzfs.asc
+ inherit verify-sig
+
+ MY_P="${P/_rc/-rc}"
+
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
+ SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+ S="${WORKDIR}/${MY_P}"
+
+ if [[ ${PV} != *_rc* ]]; then
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+ fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/5"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
+
+DEPEND="
+ dev-libs/openssl:=
+ net-libs/libtirpc:=
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libudev:=
+ !minimal? ( ${PYTHON_DEPS} )
+ pam? ( sys-libs/pam )
+ python? (
+ $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
+ )
+"
+
+BDEPEND="
+ app-alternatives/awk
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ python? (
+ ${DISTUTILS_DEPS}
+ || (
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/distlib[${PYTHON_USEDEP}]
+ )
+ )
+"
+
+if [[ ${PV} != "" ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="
+ ${DEPEND}
+ !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
+ !prefix? ( virtual/udev )
+ app-alternatives/awk
+ sys-fs/udev-init-scripts
+
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
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/
commit: 921de324d89b9b5a1cc3c77c683b986ebadbea7c
Author: Sam James gentoo org>
AuthorDate: Wed Oct 25 02:30:55 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Oct 25 02:30:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=921de324
sys-fs/zfs: Stabilize 2.1.13 arm64, #915701
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.1.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.1.13.ebuild b/sys-fs/zfs/zfs-2.1.13.ebuild
index 3e69b3e15709..dbf4c4a58bda 100644
--- a/sys-fs/zfs/zfs-2.1.13.ebuild
+++ b/sys-fs/zfs/zfs-2.1.13.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${P%_rc?}"
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/
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/
commit: 4e8121a938a30d48d535ead40be9e1f297975800
Author: Sam James gentoo org>
AuthorDate: Wed Oct 25 02:30:48 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Oct 25 02:30:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e8121a9
sys-fs/zfs: Stabilize 2.1.13 amd64, #915701
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.1.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.1.13.ebuild b/sys-fs/zfs/zfs-2.1.13.ebuild
index 6a174c5d6407..3e69b3e15709 100644
--- a/sys-fs/zfs/zfs-2.1.13.ebuild
+++ b/sys-fs/zfs/zfs-2.1.13.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${P%_rc?}"
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/
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/
commit: d4e17ad8ad6d5d0d8af44c5f113740febd368595
Author: Sam James gentoo org>
AuthorDate: Wed Oct 25 02:31:03 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Oct 25 02:31:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e17ad8
sys-fs/zfs: Stabilize 2.1.13 ppc64, #915701
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.1.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-2.1.13.ebuild b/sys-fs/zfs/zfs-2.1.13.ebuild
index dbf4c4a58bda..848ca610b210 100644
--- a/sys-fs/zfs/zfs-2.1.13.ebuild
+++ b/sys-fs/zfs/zfs-2.1.13.ebuild
@@ -25,7 +25,7 @@ else
S="${WORKDIR}/${P%_rc?}"
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/
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/
commit: 5589cc7bc6c4f18f75c40725a550b8d76e7f5ca1
Author: Sam James gentoo org>
AuthorDate: Tue Oct 17 08:07:18 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 17 08:07:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5589cc7b
sys-fs/zfs: fix patches for live
Closes: https://bugs.gentoo.org/915879
Closes: https://github.com/gentoo/gentoo/pull/33327
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys-fs/zfs/zfs-.ebuild b/sys-fs/zfs/zfs-.ebuild
index 28557faa6f92..ce763553b647 100644
--- a/sys-fs/zfs/zfs-.ebuild
+++ b/sys-fs/zfs/zfs-.ebuild
@@ -105,7 +105,6 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
- "${FILESDIR}"/2.2.0_rc5-bash-completion-path.patch
)
pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
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? (
https://github.com/op
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/, sys-fs/zfs/
commit: ea4f0c53501a6c1e2fd912c23690b70a003f006f Author: Sam James gentoo org> AuthorDate: Sat Oct 14 01:50:53 2023 + Commit: Sam James gentoo org> CommitDate: Sat Oct 14 01:50:53 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea4f0c53 sys-fs/zfs: drop 2.2.0_rc3, 2.2.0_rc4, 2.2.0_rc5 Signed-off-by: Sam James gentoo.org> sys-fs/zfs/Manifest| 6 - .../zfs/files/2.2.0_rc5-bash-completion-path.patch | 24 -- sys-fs/zfs/zfs-2.2.0_rc3.ebuild| 306 sys-fs/zfs/zfs-2.2.0_rc4.ebuild| 306 sys-fs/zfs/zfs-2.2.0_rc5.ebuild| 307 - 5 files changed, 949 deletions(-) diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index 737c2dcab6a1..954ebd1511f4 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/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/files/2.2.0_rc5-bash-completion-path.patch b/sys-fs/zfs/files/2.2.0_rc5-bash-completion-path.patch deleted file mode 100644 index abfc80e07ff8.. --- a/sys-fs/zfs/files/2.2.0_rc5-bash-completion-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/openzfs/zfs/pull/15372 - -From bb6ce273b2e04b609cc3d75d60afc3105251bc1f Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sun, 8 Oct 2023 02:00:29 +0100 -Subject: [PATCH] config/zfs-build.m4: add Gentoo's bash-completion path - -Followup e69ade32e116e72d03068c03799924c3f1a15c95 by
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
commit: 010e14fa86369e51ae940023f181f68da9f72725
Author: Sam James gentoo org>
AuthorDate: Sat Oct 14 01:51:32 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 14 01:51:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=010e14fa
sys-fs/zfs: drop 2.1.9, 2.1.11
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/Manifest | 4 -
sys-fs/zfs/zfs-2.1.11.ebuild | 316 ---
sys-fs/zfs/zfs-2.1.9.ebuild | 316 ---
3 files changed, 636 deletions(-)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 954ebd1511f4..957012433003 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/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/zfs-2.1.11.ebuild b/sys-fs/zfs/zfs-2.1.11.ebuild
deleted file mode 100644
index aaa2fab6efed..
--- a/sys-fs/zfs/zfs-2.1.11.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-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_P="${P/_rc/-rc}"
-
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
- SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
- S="${WORKDIR}/${P%_rc?}"
-
- if [[ ${PV} != *_rc* ]]; then
-
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
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/
commit: dfe143b90c19b533e2600205d13b18b8c7aae1d9
Author: Sam James gentoo org>
AuthorDate: Sat Oct 14 01:50:04 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 14 01:50:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfe143b9
sys-fs/zfs: add 2.2.0
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/Manifest | 2 +
sys-fs/zfs/zfs-2.2.0.ebuild | 306
2 files changed, 308 insertions(+)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index c032b3e43f79..737c2dcab6a1 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/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/zfs-2.2.0.ebuild b/sys-fs/zfs/zfs-2.2.0.ebuild
new file mode 100644
index ..ce763553b647
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.2.0.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+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_P="${P/_rc/-rc}"
+
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
+ SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+ S="${WORKDIR}/${MY_P}"
+
+ if [[ ${PV} != *_rc* ]]; then
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+ fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/5"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
+
+DEPEND="
+ dev-libs/openssl:=
+ net-libs/libtirpc:=
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libudev:=
+ !minimal? ( ${PYTHON_DEPS} )
+ pam? ( sys-libs/pam )
+ python? (
+ $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
+ )
+"
+
+BDEPEND="
+ app-alternatives/awk
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ python? (
+ ${DISTUTILS_DEPS}
+ || (
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/distlib[${PYTHON_USEDEP}]
+ )
+ )
+"
+
+if [[ ${PV} != "" ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="
+ ${DEPEND}
+ !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
+ !prefix? ( virtual/udev )
+ app-alternatives/awk
+ sys-fs/udev-init-scripts
+ dist-kernel? ( virtual/dist-kernel:= )
+ rootfs? (
+ app-arch/cpio
+
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
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/files/, sys-fs/zfs/
commit: ac3b8bc87c1494bfdb18e40cd5fa876a5e8168b4
Author: Sam James gentoo org>
AuthorDate: Sun Oct 8 00:53:10 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 8 01:04:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac3b8bc8
sys-fs/zfs: add 2.2.0_rc5
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/Manifest| 2 ++
.../zfs/files/2.2.0_rc5-bash-completion-path.patch | 24 ++
.../zfs/{zfs-.ebuild => zfs-2.2.0_rc5.ebuild} | 1 +
sys-fs/zfs/zfs-.ebuild | 1 +
4 files changed, 28 insertions(+)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 8d72400873aa..c032b3e43f79 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/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/files/2.2.0_rc5-bash-completion-path.patch
b/sys-fs/zfs/files/2.2.0_rc5-bash-completion-path.patch
new file mode 100644
index ..abfc80e07ff8
--- /dev/null
+++ b/sys-fs/zfs/files/2.2.0_rc5-bash-completion-path.patch
@@ -0,0 +1,24 @@
+https://github.com/openzfs/zfs/pull/15372
+
+From bb6ce273b2e04b609cc3d75d60afc3105251bc1f Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Sun, 8 Oct 2023 02:00:29 +0100
+Subject: [PATCH] config/zfs-build.m4: add Gentoo's bash-completion path
+
+Followup e69ade32e116e72d03068c03799924c3f1a15c95 by adding Gentoo's
+bash completion path.
+
+We should probably consider using/honouring the standard
--with-bashcompletiondir
+autoconf option as well, but that's something to do later.
+
+Signed-off-by: Sam James
+--- a/config/zfs-build.m4
b/config/zfs-build.m4
+@@ -626,6 +626,7 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
+ ubuntu)
bashcompletiondir=/usr/share/bash-completion/completions ;;
+ debian)
bashcompletiondir=/usr/share/bash-completion/completions ;;
+ freebsd)bashcompletiondir=$sysconfdir/bash_completion.d;;
++ gentoo)
bashcompletiondir=/usr/share/bash-completion/completions ;;
+ *) bashcompletiondir=/etc/bash_completion.d ;;
+ esac
+ AC_MSG_RESULT([$bashcompletiondir])
diff --git a/sys-fs/zfs/zfs-.ebuild b/sys-fs/zfs/zfs-2.2.0_rc5.ebuild
similarity index 99%
copy from sys-fs/zfs/zfs-.ebuild
copy to sys-fs/zfs/zfs-2.2.0_rc5.ebuild
index ce763553b647..28557faa6f92 100644
--- a/sys-fs/zfs/zfs-.ebuild
+++ b/sys-fs/zfs/zfs-2.2.0_rc5.ebuild
@@ -105,6 +105,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
+ "${FILESDIR}"/2.2.0_rc5-bash-completion-path.patch
)
pkg_pretend() {
diff --git a/sys-fs/zfs/zfs-.ebuild b/sys-fs/zfs/zfs-.ebuild
index ce763553b647..28557faa6f92 100644
--- a/sys-fs/zfs/zfs-.ebuild
+++ b/sys-fs/zfs/zfs-.ebuild
@@ -105,6 +105,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
+ "${FILESDIR}"/2.2.0_rc5-bash-completion-path.patch
)
pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
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/
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/
commit: 02d1a663cf627b0a8efaf8c57c6509934a23b975
Author: Sam James gentoo org>
AuthorDate: Thu Sep 28 01:17:42 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Sep 28 01:17:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d1a663
sys-fs/zfs: add 2.1.13
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/Manifest | 2 +
sys-fs/zfs/zfs-2.1.13.ebuild | 311 +++
2 files changed, 313 insertions(+)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index fdb6fcb5ab21..8d72400873aa 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/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/zfs-2.1.13.ebuild b/sys-fs/zfs/zfs-2.1.13.ebuild
new file mode 100644
index ..6a174c5d6407
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.1.13.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+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_P="${P/_rc/-rc}"
+
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
+ SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+ S="${WORKDIR}/${P%_rc?}"
+
+ if [[ ${PV} != *_rc* ]]; then
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+ fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/5"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
+
+DEPEND="
+ net-libs/libtirpc:=
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libudev:=
+ dev-libs/openssl:0=
+ !minimal? ( ${PYTHON_DEPS} )
+ p
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
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/
commit: 531a39eaef3a1a0696b3e1f609db5734a230e3c3
Author: Sam James gentoo org>
AuthorDate: Sat Sep 9 01:57:46 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Sep 9 01:58:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=531a39ea
sys-fs/zfs: drop more linux-mod.eclass cruft
Followup to 71110f715fc46f148280b52b297121786504a325.
Closes: https://bugs.gentoo.org/908720
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/zfs-2.1.11.ebuild| 4
sys-fs/zfs/zfs-2.1.12.ebuild| 2 +-
sys-fs/zfs/zfs-2.1.9.ebuild | 12 +---
sys-fs/zfs/zfs-2.2.0_rc3.ebuild | 2 +-
sys-fs/zfs/zfs-2.2.0_rc4.ebuild | 2 +-
sys-fs/zfs/zfs-.ebuild | 2 +-
6 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/sys-fs/zfs/zfs-2.1.11.ebuild b/sys-fs/zfs/zfs-2.1.11.ebuild
index c67dc48476f6..aaa2fab6efed 100644
--- a/sys-fs/zfs/zfs-2.1.11.ebuild
+++ b/sys-fs/zfs/zfs-2.1.11.ebuild
@@ -313,8 +313,4 @@ pkg_postinst() {
pkg_postrm() {
udev_reload
-
- if ! use kernel-builtin && [[ ${PV} == "" ]]; then
- remove_moduledb
- fi
}
diff --git a/sys-fs/zfs/zfs-2.1.12.ebuild b/sys-fs/zfs/zfs-2.1.12.ebuild
index d03112013891..848ca610b210 100644
--- a/sys-fs/zfs/zfs-2.1.12.ebuild
+++ b/sys-fs/zfs/zfs-2.1.12.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Userland utilities for ZFS Linux kernel module"
HOMEPAGE="https://github.com/openzfs/zfs";
if [[ ${PV} == "" ]]; then
- inherit git-r3 linux-mod
+ 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
diff --git a/sys-fs/zfs/zfs-2.1.9.ebuild b/sys-fs/zfs/zfs-2.1.9.ebuild
index 29308460bcd7..aaa2fab6efed 100644
--- a/sys-fs/zfs/zfs-2.1.9.ebuild
+++ b/sys-fs/zfs/zfs-2.1.9.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Userland utilities for ZFS Linux kernel module"
HOMEPAGE="https://github.com/openzfs/zfs";
if [[ ${PV} == "" ]]; then
- inherit git-r3 linux-mod
+ 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
@@ -294,12 +294,6 @@ pkg_postinst() {
fi
fi
- if ! use kernel-builtin && [[ ${PV} == "" ]]; then
- einfo "Adding ${P} to the module database to ensure that the"
- einfo "kernel modules and userland utilities stay in sync."
- update_moduledb
- fi
-
if systemd_is_booted || has_version sys-apps/systemd; then
einfo "Please refer to
${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset"
einfo "for default zfs systemd service configuration"
@@ -319,8 +313,4 @@ pkg_postinst() {
pkg_postrm() {
udev_reload
-
- if ! use kernel-builtin && [[ ${PV} == "" ]]; then
- remove_moduledb
- fi
}
diff --git a/sys-fs/zfs/zfs-2.2.0_rc3.ebuild b/sys-fs/zfs/zfs-2.2.0_rc3.ebuild
index e9d67dd0d80e..ce763553b647 100644
--- a/sys-fs/zfs/zfs-2.2.0_rc3.ebuild
+++ b/sys-fs/zfs/zfs-2.2.0_rc3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Userland utilities for ZFS Linux kernel module"
HOMEPAGE="https://github.com/openzfs/zfs";
if [[ ${PV} == "" ]]; then
- inherit git-r3 linux-mod
+ 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
diff --git a/sys-fs/zfs/zfs-2.2.0_rc4.ebuild b/sys-fs/zfs/zfs-2.2.0_rc4.ebuild
index e9d67dd0d80e..ce763553b647 100644
--- a/sys-fs/zfs/zfs-2.2.0_rc4.ebuild
+++ b/sys-fs/zfs/zfs-2.2.0_rc4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Userland utilities for ZFS Linux kernel module"
HOMEPAGE="https://github.com/openzfs/zfs";
if [[ ${PV} == "" ]]; then
- inherit git-r3 linux-mod
+ 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
diff --git a/sys-fs/zfs/zfs-.ebuild b/sys-fs/zfs/zfs-.ebuild
index e9d67dd0d80e..ce763553b647 100644
--- a/sys-fs/zfs/zfs-.ebuild
+++ b/sys-fs/zfs/zfs-.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Userland utilities for ZFS Linux kernel module"
HOMEPAGE="https://github.com/openzfs/zfs";
if [[ ${PV} == "" ]]; then
- inherit git-r3 linux-mod
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
commit: e3cc6074f76387e969ff0664ad4bb0f5ea331c90
Author: Sam James gentoo org>
AuthorDate: Sat Sep 9 01:52:26 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Sep 9 01:52:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3cc6074
sys-fs/zfs: add 2.2.0_rc4
Signed-off-by: Sam James gentoo.org>
sys-fs/zfs/Manifest | 2 +
sys-fs/zfs/zfs-2.2.0_rc4.ebuild | 306
2 files changed, 308 insertions(+)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 34e7ed5dc0b4..fdb6fcb5ab21 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/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/zfs-2.2.0_rc4.ebuild b/sys-fs/zfs/zfs-2.2.0_rc4.ebuild
new file mode 100644
index ..e9d67dd0d80e
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.2.0_rc4.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1
flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://github.com/openzfs/zfs";
+
+if [[ ${PV} == "" ]]; then
+ inherit git-r3 linux-mod
+ 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_P="${P/_rc/-rc}"
+
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
+ SRC_URI+=" verify-sig? (
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+ S="${WORKDIR}/${MY_P}"
+
+ if [[ ${PV} != *_rc* ]]; then
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+ fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide
stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/5"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python
+rootfs selinux test-suite"
+
+DEPEND="
+ dev-libs/openssl:=
+ net-libs/libtirpc:=
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libudev:=
+ !minimal? ( ${PYTHON_DEPS} )
+ pam? ( sys-libs/pam )
+ python? (
+ $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
+ )
+"
+
+BDEPEND="
+ app-alternatives/awk
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ python? (
+ ${DISTUTILS_DEPS}
+ || (
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/distlib[${PYTHON_USEDEP}]
+ )
+ )
+"
+
+if [[ ${PV} != "" ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="
+ ${DEPEND}
+ !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
+ !prefix? ( virtual/udev )
+ app-alternatives/awk
+ sys-fs/udev-init-scripts
+ dist-kernel? ( virtual/dist-kernel:= )
+ rootfs? (
+
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
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? (
+
