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 9EE7E15806E 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 D4215E09D6; Wed, 31 May 2023 02:57:56 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B758AE09D6 for ; Wed, 31 May 2023 02:57:56 +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 E2AE2340F42 for ; Wed, 31 May 2023 02:57:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78C66990 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: <1685501323.71110f715fc46f148280b52b297121786504a325.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs/zfs-2.1.11.ebuild sys-fs/zfs/zfs-9999.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 71110f715fc46f148280b52b297121786504a325 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: aacc6897-0714-4798-a221-14c3d92040e9 X-Archives-Hash: 4d3bde0a579d62072ce2ae2ed554e905 commit: 71110f715fc46f148280b52b297121786504a325 Author: Sam James gentoo org> AuthorDate: Wed May 31 02:48:43 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed May 31 02:48:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71110f71 sys-fs/zfs: remove ancient egypt update_moduledb/remove_moduledb calls It turns out that the moduledb stuff dates back to an ancient egypt 'module-rebuild' tool which was removed long ago from Portage (finally dropped in 2014, but obsolete a while before that). linux-mod-r1.eclass drops that entirely, but linux-mod.eclass retains hooks for it. Drop the calls given linux-mod.eclass will be @DEPRECATED soon and they serve no purpose nowadays. (Makes no difference at all to e.g. emerge's @module-rebuild or anything.) Signed-off-by: Sam James gentoo.org> sys-fs/zfs/zfs-2.1.11.ebuild | 8 +------- sys-fs/zfs/zfs-9999.ebuild | 10 ---------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/sys-fs/zfs/zfs-2.1.11.ebuild b/sys-fs/zfs/zfs-2.1.11.ebuild index 9f683b3d7c1c..bdc64e42deac 100644 --- a/sys-fs/zfs/zfs-2.1.11.ebuild +++ b/sys-fs/zfs/zfs-2.1.11.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Userland utilities for ZFS Linux kernel module" HOMEPAGE="https://github.com/openzfs/zfs" if [[ ${PV} == "9999" ]]; then - inherit git-r3 linux-mod + inherit git-r3 EGIT_REPO_URI="https://github.com/openzfs/zfs.git" else VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc @@ -294,12 +294,6 @@ pkg_postinst() { fi fi - if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - if systemd_is_booted || has_version sys-apps/systemd; then einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset" einfo "for default zfs systemd service configuration" diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 89a9dd904796..6777887fc25c 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -286,12 +286,6 @@ pkg_postinst() { fi fi - if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - if systemd_is_booted || has_version sys-apps/systemd; then einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset" einfo "for default zfs systemd service configuration" @@ -311,8 +305,4 @@ pkg_postinst() { pkg_postrm() { udev_reload - - if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then - remove_moduledb - fi }