Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
Date: Fri, 15 May 2020 03:50:35
Message-Id: 1589513472.8123e89e1389188c518b00a3ee0151e508455e9f.gyakovlev@gentoo
1 commit: 8123e89e1389188c518b00a3ee0151e508455e9f
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 15 03:31:12 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Fri May 15 03:31:12 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8123e89e
7
8 sys-fs/zfs-kmod: adjust minimum kernel version requirement
9
10 0.8.x incorrectly requires 3.10 minimum, fix that
11
12 Package-Manager: Portage-2.3.99, Repoman-2.3.22
13 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
14
15 sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild | 8 ++++++--
16 1 file changed, 6 insertions(+), 2 deletions(-)
17
18 diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
19 index ea8054e8f0d..8481dbb7381 100644
20 --- a/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
21 +++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
22 @@ -66,8 +66,6 @@ pkg_setup() {
23
24 kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
25
26 - kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
27 -
28 if [[ ${PV} != "9999" ]]; then
29 local kv_major_max kv_minor_max zcompat
30 zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
31 @@ -76,6 +74,12 @@ pkg_setup() {
32 kv_minor_max="${zcompat%%.*}"
33 kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
34 "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
35 +
36 + # 0.8.x requires at least 2.6.32
37 + kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
38 + else
39 + # git master requires at least 3.10
40 + kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
41 fi
42
43 linux-mod_pkg_setup