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

[Georgy Yakovlev]

commit:     e37692c66c4ab28bf13d9c5d12fcda7e80c95b4f
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  7 23:10:04 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Nov  7 23:57:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e37692c6

sys-fs/zfs-kmod: backport dist-kernel limiter to 2.0.6 and 0.8.6

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild |  5 +++++
 sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
index e5b3df641c9..3d63f3f393b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
@@ -16,6 +16,10 @@ else
        KEYWORDS="amd64 arm64 ppc64"
        S="${WORKDIR}/zfs-${PV}"
        ZFS_KERNEL_COMPAT="5.9"
+
+       # increments minor eg 5.14 -> 5.15, and still supports override.
+       ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+       ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 fi
 
 LICENSE="CDDL debug? ( GPL-2+ )"
@@ -31,6 +35,7 @@ RDEPEND="${DEPEND}
 BDEPEND="
        dev-lang/perl
        virtual/awk
+       dist-kernel? ( <virtual/dist-kernel-${ZFS_KERNEL_DEP}:= )
 "
 
 # PDEPEND in this form is needed to trick portage suggest

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild
index 5c445cce099..d12b2a43490 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild
@@ -21,6 +21,10 @@ else
        S="${WORKDIR}/zfs-${PV%_rc?}"
        ZFS_KERNEL_COMPAT="5.14"
 
+       #  increments minor eg 5.14 -> 5.15, and still supports override.
+       ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+       ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
+
        if [[ ${PV} != *_rc* ]]; then
                KEYWORDS="amd64 arm64 ppc64"
        fi
@@ -39,8 +43,15 @@ BDEPEND="
        virtual/awk
 "
 
+# we want dist-kernel block in BDEPEND because of portage resolver.
+# since linux-mod.eclass already sets version-unbounded dep, portage
+# will pull new versions. So we set it in BDEPEND which takes priority.
+# and we don't need in in git ebuild.
 if [[ ${PV} != "9999" ]] ; then
-       BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
+       BDEPEND+="
+               verify-sig? ( app-crypt/openpgp-keys-openzfs )
+               dist-kernel? ( <virtual/dist-kernel-${ZFS_KERNEL_DEP}:= )
+       "
 fi
 
 # PDEPEND in this form is needed to trick portage suggest