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

[Georgy Yakovlev]

commit:     8123e89e1389188c518b00a3ee0151e508455e9f
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri May 15 03:31:12 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri May 15 03:31:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8123e89e

sys-fs/zfs-kmod: adjust minimum kernel version requirement

0.8.x incorrectly requires 3.10 minimum, fix that

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

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

diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
index ea8054e8f0d..8481dbb7381 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
@@ -66,8 +66,6 @@ pkg_setup() {
 
        kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
 
-       kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
-
        if [[ ${PV} != "9999" ]]; then
                local kv_major_max kv_minor_max zcompat
                zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
@@ -76,6 +74,12 @@ pkg_setup() {
                kv_minor_max="${zcompat%%.*}"
                kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
                        "Linux ${kv_major_max}.${kv_minor_max} is the latest 
supported version"
+               
+               # 0.8.x requires at least 2.6.32
+               kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+       else
+               # git master requires at least 3.10
+               kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
        fi
 
        linux-mod_pkg_setup