From 441510fa20665b7920b149994e72b3a1cd62a813 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 31 May 2023 09:23:01 +0100 Subject: gentoo auto-resync : 31:05:2023 - 09:23:01 --- sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'sys-fs/zfs-kmod/zfs-kmod-9999.ebuild') diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index 82ac6d7c464a..5727676398f5 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -12,18 +12,22 @@ MODULES_KERNEL_MAX=6.2 MODULES_KERNEL_MIN=3.10 if [[ ${PV} == 9999 ]] ; then - inherit git-r3 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?}" - VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc + + 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" @@ -46,7 +50,7 @@ if [[ ${PV} != 9999 ]] ; then IUSE+=" +dist-kernel-cap" RDEPEND=" dist-kernel-cap? ( dist-kernel? ( -