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