[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/

["Sam James" <sam@gentoo.org>]

commit:     71110f715fc46f148280b52b297121786504a325
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 31 02:48:43 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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
 }