From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DB97A15806E for ; Wed, 31 May 2023 02:57:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2665DE09E9; Wed, 31 May 2023 02:57:57 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0DC60E09E9 for ; Wed, 31 May 2023 02:57:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 154E5340F83 for ; Wed, 31 May 2023 02:57:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D85EA67 for ; Wed, 31 May 2023 02:57:54 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1685501750.6482def6b8a1bbfec5c3440eaa8cce628a9a5eb8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild sys-fs/zfs-kmod/zfs-kmod-9999.ebuild X-VCS-Directories: sys-fs/zfs-kmod/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6482def6b8a1bbfec5c3440eaa8cce628a9a5eb8 X-VCS-Branch: master Date: Wed, 31 May 2023 02:57:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 81788b84-db15-4db5-9d77-b59d2cc4b65c X-Archives-Hash: 48ecd1b58a284e1f6047227e81ef3dc1 commit: 6482def6b8a1bbfec5c3440eaa8cce628a9a5eb8 Author: Sam James gentoo org> AuthorDate: Wed May 31 02:55:43 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed May 31 02:55:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6482def6 sys-fs/zfs-kmod: restore die-hard if kernel exceeds supported maximum We ended up discussing the limit and gyakovlev feels strongly about keeping it, which is fine by me (was on the fence/unsure). So: * Put back the hard die for too-new kernels unless ZFS_KERNEL_COMPAT_OVERRIDE is set. * Keep dist-kernel-cap (at least for now?) to allow people who *do* override to get the nice convenient rebuilds. Signed-off-by: Sam James gentoo.org> sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild | 22 ++++++++++++++++++---- sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 22 ++++++++++++++++++---- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild index cd38e7bd2037..7bf3ebaec2e0 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.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? ( - 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? ( -