summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-09-09 02:57:46 +0100
committerSam James <sam@gentoo.org>2023-09-09 02:58:32 +0100
commit531a39eaef3a1a0696b3e1f609db5734a230e3c3 (patch)
tree77b5fb7e6400093e064b17616237ddcae89a5370 /sys-fs
parentsys-fs/zfs: add 2.2.0_rc4 (diff)
downloadgentoo-531a39eaef3a1a0696b3e1f609db5734a230e3c3.tar.gz
gentoo-531a39eaef3a1a0696b3e1f609db5734a230e3c3.tar.bz2
gentoo-531a39eaef3a1a0696b3e1f609db5734a230e3c3.zip
sys-fs/zfs: drop more linux-mod.eclass cruft
Followup to 71110f715fc46f148280b52b297121786504a325. Closes: https://bugs.gentoo.org/908720 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/zfs/zfs-2.1.11.ebuild4
-rw-r--r--sys-fs/zfs/zfs-2.1.12.ebuild2
-rw-r--r--sys-fs/zfs/zfs-2.1.9.ebuild12
-rw-r--r--sys-fs/zfs/zfs-2.2.0_rc3.ebuild2
-rw-r--r--sys-fs/zfs/zfs-2.2.0_rc4.ebuild2
-rw-r--r--sys-fs/zfs/zfs-9999.ebuild2
6 files changed, 5 insertions, 19 deletions
diff --git a/sys-fs/zfs/zfs-2.1.11.ebuild b/sys-fs/zfs/zfs-2.1.11.ebuild
index c67dc48476f6..aaa2fab6efed 100644
--- a/sys-fs/zfs/zfs-2.1.11.ebuild
+++ b/sys-fs/zfs/zfs-2.1.11.ebuild
@@ -313,8 +313,4 @@ pkg_postinst() {
pkg_postrm() {
udev_reload
-
- if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
- remove_moduledb
- fi
}
diff --git a/sys-fs/zfs/zfs-2.1.12.ebuild b/sys-fs/zfs/zfs-2.1.12.ebuild
index d03112013891..848ca610b210 100644
--- a/sys-fs/zfs/zfs-2.1.12.ebuild
+++ b/sys-fs/zfs/zfs-2.1.12.ebuild
@@ -13,7 +13,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
diff --git a/sys-fs/zfs/zfs-2.1.9.ebuild b/sys-fs/zfs/zfs-2.1.9.ebuild
index 29308460bcd7..aaa2fab6efed 100644
--- a/sys-fs/zfs/zfs-2.1.9.ebuild
+++ b/sys-fs/zfs/zfs-2.1.9.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"
@@ -319,8 +313,4 @@ pkg_postinst() {
pkg_postrm() {
udev_reload
-
- if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
- remove_moduledb
- fi
}
diff --git a/sys-fs/zfs/zfs-2.2.0_rc3.ebuild b/sys-fs/zfs/zfs-2.2.0_rc3.ebuild
index e9d67dd0d80e..ce763553b647 100644
--- a/sys-fs/zfs/zfs-2.2.0_rc3.ebuild
+++ b/sys-fs/zfs/zfs-2.2.0_rc3.ebuild
@@ -13,7 +13,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
diff --git a/sys-fs/zfs/zfs-2.2.0_rc4.ebuild b/sys-fs/zfs/zfs-2.2.0_rc4.ebuild
index e9d67dd0d80e..ce763553b647 100644
--- a/sys-fs/zfs/zfs-2.2.0_rc4.ebuild
+++ b/sys-fs/zfs/zfs-2.2.0_rc4.ebuild
@@ -13,7 +13,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
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index e9d67dd0d80e..ce763553b647 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -13,7 +13,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