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 E2856158087 for ; Sat, 15 Jan 2022 22:22:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 315342BC006; Sat, 15 Jan 2022 22:22:06 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9FBFB2BC006 for ; Sat, 15 Jan 2022 22:22:05 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 913CE34304F for ; Sat, 15 Jan 2022 22:22:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4F6E246 for ; Sat, 15 Jan 2022 22:22:02 +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: <1642285303.5b02ae2fc1b05e3ed4f336cf758de3d9c8e9576e.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/coreutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/coreutils/coreutils-9.0-r1.ebuild sys-apps/coreutils/coreutils-9.0.ebuild X-VCS-Directories: sys-apps/coreutils/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 5b02ae2fc1b05e3ed4f336cf758de3d9c8e9576e X-VCS-Branch: master Date: Sat, 15 Jan 2022 22:22:02 +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: 8ef53fd3-394c-486c-9aea-da0020aebb1c X-Archives-Hash: 5eb78e51903599ecfbe01240123b2502 commit: 5b02ae2fc1b05e3ed4f336cf758de3d9c8e9576e Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Jan 15 22:20:19 2022 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Jan 15 22:21:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b02ae2f sys-apps/coreutils: remove zfs check it has served it's purpose and no longer needed coreutils-9 will go stable soon too Closes: https://bugs.gentoo.org/830830 Signed-off-by: Georgy Yakovlev gentoo.org> sys-apps/coreutils/coreutils-9.0-r1.ebuild | 42 +----------------------------- sys-apps/coreutils/coreutils-9.0.ebuild | 42 +----------------------------- 2 files changed, 2 insertions(+), 82 deletions(-) diff --git a/sys-apps/coreutils/coreutils-9.0-r1.ebuild b/sys-apps/coreutils/coreutils-9.0-r1.ebuild index f8036f5a79b2..6f7eccb90d52 100644 --- a/sys-apps/coreutils/coreutils-9.0-r1.ebuild +++ b/sys-apps/coreutils/coreutils-9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -58,46 +58,6 @@ RDEPEND+=" !/dev/null) ; then - einfo "Checking for running ZFS module version" - - local kmodv minver - kmodv="$(grep kmod <(zfs -V 2>/dev/null))" - # Convert zfs-kmod-2.1.1-r3-gentoo -> 2.1.1-r3 - kmodv="${kmodv//zfs-kmod-}" - kmodv="${kmodv%%-gentoo}" - - minver="$(ver_cut 2 ${kmodv})" - local diemsg=$(cat <<-EOF - Attempted installation of ${P} on unsupported version of zfs-kmod! - Please reboot to a newer version of zfs-kmod first: - zfs-kmod >=2.0.7 or zfs-kmod >=2.1.1-r3 - Using ${P} with running version of zfs-kmod of can - lead to data loss while using cp command on some configurations. - See https://github.com/openzfs/zfs/issues/11900 for details. - EOF - ) - - case "${minver}" in - # 2.0.x - 0) - ver_test "${kmodv}" -lt 2.0.7 && die "${diemsg}" - ;; - # 2.1.x - 1) - ver_test "${kmodv}" -lt 2.1.1-r3 && die "${diemsg}" - ;; - # 0.8.x/9999 - *) - # We can't really cover this case realistically - # 9999 is too hard to check and 0.8.x isn't being supported anymore. - ;; - esac - fi - -} - pkg_setup() { if use test ; then python-any-r1_pkg_setup diff --git a/sys-apps/coreutils/coreutils-9.0.ebuild b/sys-apps/coreutils/coreutils-9.0.ebuild index 231339807e73..ecfbcd3f4be6 100644 --- a/sys-apps/coreutils/coreutils-9.0.ebuild +++ b/sys-apps/coreutils/coreutils-9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -58,46 +58,6 @@ RDEPEND+=" ! 2.1.1-r3 - kmodv="${kmodv//zfs-kmod-}" - kmodv="${kmodv%%-gentoo}" - - minver="$(ver_cut 2 ${kmodv})" - local diemsg=$(cat <<-EOF - Attempted installation of ${P} on unsupported version of zfs-kmod! - Please reboot to a newer version of zfs-kmod first: - zfs-kmod >=2.0.7 or zfs-kmod >=2.1.1-r3 - Using ${P} with running version of zfs-kmod of can - lead to data loss while using cp command on some configurations. - See https://github.com/openzfs/zfs/issues/11900 for details. - EOF - ) - - case "${minver}" in - # 2.0.x - 0) - ver_test "${kmodv}" -lt 2.0.7 && die "${diemsg}" - ;; - # 2.1.x - 1) - ver_test "${kmodv}" -lt 2.1.1-r3 && die "${diemsg}" - ;; - # 0.8.x/9999 - *) - # We can't really cover this case realistically - # 9999 is too hard to check and 0.8.x isn't being supported anymore. - ;; - esac - fi - -} - pkg_setup() { if use test ; then python-any-r1_pkg_setup