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 26BAE158003 for ; Sun, 7 Nov 2021 23:59:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C34F2BC099; Sun, 7 Nov 2021 23:59:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 D78D82BC099 for ; Sun, 7 Nov 2021 23:59:22 +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 6EE9B342E8A for ; Sun, 7 Nov 2021 23:59:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B20E6175 for ; Sun, 7 Nov 2021 23:59:18 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1636329459.e37692c66c4ab28bf13d9c5d12fcda7e80c95b4f.gyakovlev@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-0.8.6.ebuild sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild X-VCS-Directories: sys-fs/zfs-kmod/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: e37692c66c4ab28bf13d9c5d12fcda7e80c95b4f X-VCS-Branch: master Date: Sun, 7 Nov 2021 23:59:18 +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: 23490ef3-0fef-4842-a96a-7427c41e3d42 X-Archives-Hash: 3f6b327d8f1b21faf8b6ce7375c7cf47 commit: e37692c66c4ab28bf13d9c5d12fcda7e80c95b4f Author: Georgy Yakovlev gentoo org> AuthorDate: Sun Nov 7 23:10:04 2021 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Sun Nov 7 23:57:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e37692c6 sys-fs/zfs-kmod: backport dist-kernel limiter to 2.0.6 and 0.8.6 Signed-off-by: Georgy Yakovlev gentoo.org> sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild | 5 +++++ sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild index e5b3df641c9..3d63f3f393b 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild @@ -16,6 +16,10 @@ else KEYWORDS="amd64 arm64 ppc64" S="${WORKDIR}/zfs-${PV}" ZFS_KERNEL_COMPAT="5.9" + + # 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))" fi LICENSE="CDDL debug? ( GPL-2+ )" @@ -31,6 +35,7 @@ RDEPEND="${DEPEND} BDEPEND=" dev-lang/perl virtual/awk + 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" fi @@ -39,8 +43,15 @@ BDEPEND=" virtual/awk " +# we want dist-kernel block in BDEPEND because of portage resolver. +# since linux-mod.eclass already sets version-unbounded dep, portage +# will pull new versions. So we set it in BDEPEND which takes priority. +# and we don't need in in git ebuild. if [[ ${PV} != "9999" ]] ; then - BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )" + BDEPEND+=" + verify-sig? ( app-crypt/openpgp-keys-openzfs ) + dist-kernel? (