Signed-off-by: Andrew Ammerlaan <andrewammerl...@gentoo.org> --- sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild | 16 +++------------- sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild | 14 ++------------ sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild | 14 ++------------ sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild | 14 ++------------ sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild | 14 ++------------ sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild | 14 ++------------ sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 14 ++------------ 7 files changed, 15 insertions(+), 85 deletions(-)
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild index c698d195b168..5b5d9f647ee9 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools dist-kernel-utils flag-o-matic linux-mod-r1 multiprocessing +MODULES_INITRAMFS_IUSE=+initramfs +inherit autotools flag-o-matic linux-mod-r1 multiprocessing DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" HOMEPAGE="https://github.com/openzfs/zfs"; @@ -64,13 +65,6 @@ PATCHES=( pkg_pretend() { use rootfs || return 0 - - if has_version virtual/dist-kernel && ! use dist-kernel; then - ewarn "You have virtual/dist-kernel installed, but" - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" - ewarn "It's recommended to globally enable dist-kernel USE flag" - ewarn "to auto-trigger initrd rebuilds with kernel updates" - fi } pkg_setup() { @@ -152,10 +146,6 @@ src_install() { pkg_postinst() { linux-mod-r1_pkg_postinst - if [[ -z ${ROOT} ]] && use dist-kernel ; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" - fi - if use x86 || use arm ; then ewarn "32-bit kernels will likely require increasing vmalloc to" ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild index 91038f073b54..b5ce1e2929b3 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit autotools dist-kernel-utils flag-o-matic linux-mod-r1 multiprocessing +MODULES_INITRAMFS_IUSE=+initramfs +inherit autotools flag-o-matic linux-mod-r1 multiprocessing DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" HOMEPAGE="https://github.com/openzfs/zfs"; @@ -64,13 +65,6 @@ PATCHES=( pkg_pretend() { use rootfs || return 0 - - if has_version virtual/dist-kernel && ! use dist-kernel; then - ewarn "You have virtual/dist-kernel installed, but" - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" - ewarn "It's recommended to globally enable dist-kernel USE flag" - ewarn "to auto-trigger initrd rebuilds with kernel updates" - fi } pkg_setup() { @@ -152,10 +146,6 @@ src_install() { pkg_postinst() { linux-mod-r1_pkg_postinst - if [[ -z ${ROOT} ]] && use dist-kernel ; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" - fi - if use x86 || use arm ; then ewarn "32-bit kernels will likely require increasing vmalloc to" ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild index 7b28bf3a94ab..6f4cf5107e3f 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit autotools dist-kernel-utils flag-o-matic linux-mod-r1 multiprocessing +MODULES_INITRAMFS_IUSE=+initramfs +inherit autotools flag-o-matic linux-mod-r1 multiprocessing DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" HOMEPAGE="https://github.com/openzfs/zfs"; @@ -66,13 +67,6 @@ PATCHES=( pkg_pretend() { use rootfs || return 0 - - if has_version virtual/dist-kernel && ! use dist-kernel; then - ewarn "You have virtual/dist-kernel installed, but" - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" - ewarn "It's recommended to globally enable dist-kernel USE flag" - ewarn "to auto-trigger initrd rebuilds with kernel updates" - fi } pkg_setup() { @@ -194,10 +188,6 @@ pkg_postinst() { linux-mod-r1_pkg_postinst - if [[ -z ${ROOT} ]] && use dist-kernel ; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" - fi - if use x86 || use arm ; then ewarn "32-bit kernels will likely require increasing vmalloc to" ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild index 944c90fac889..b46dea36c184 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit autotools dist-kernel-utils flag-o-matic linux-mod-r1 multiprocessing +MODULES_INITRAMFS_IUSE=+initramfs +inherit autotools flag-o-matic linux-mod-r1 multiprocessing DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" HOMEPAGE="https://github.com/openzfs/zfs"; @@ -65,13 +66,6 @@ PATCHES=( pkg_pretend() { use rootfs || return 0 - - if has_version virtual/dist-kernel && ! use dist-kernel; then - ewarn "You have virtual/dist-kernel installed, but" - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" - ewarn "It's recommended to globally enable dist-kernel USE flag" - ewarn "to auto-trigger initrd rebuilds with kernel updates" - fi } pkg_setup() { @@ -193,10 +187,6 @@ pkg_postinst() { linux-mod-r1_pkg_postinst - if [[ -z ${ROOT} ]] && use dist-kernel ; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" - fi - if use x86 || use arm ; then ewarn "32-bit kernels will likely require increasing vmalloc to" ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild index e2c8f5dfec1b..5e595114c70a 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit autotools dist-kernel-utils flag-o-matic linux-mod-r1 multiprocessing +MODULES_INITRAMFS_IUSE=+initramfs +inherit autotools flag-o-matic linux-mod-r1 multiprocessing DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" HOMEPAGE="https://github.com/openzfs/zfs"; @@ -64,13 +65,6 @@ PATCHES=( pkg_pretend() { use rootfs || return 0 - - if has_version virtual/dist-kernel && ! use dist-kernel; then - ewarn "You have virtual/dist-kernel installed, but" - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" - ewarn "It's recommended to globally enable dist-kernel USE flag" - ewarn "to auto-trigger initrd rebuilds with kernel updates" - fi } pkg_setup() { @@ -192,10 +186,6 @@ pkg_postinst() { linux-mod-r1_pkg_postinst - if [[ -z ${ROOT} ]] && use dist-kernel ; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" - fi - if use x86 || use arm ; then ewarn "32-bit kernels will likely require increasing vmalloc to" ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild index fe2cc8b18efb..79b2c443b06d 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit autotools dist-kernel-utils flag-o-matic linux-mod-r1 multiprocessing +MODULES_INITRAMFS_IUSE=+initramfs +inherit autotools flag-o-matic linux-mod-r1 multiprocessing DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" HOMEPAGE="https://github.com/openzfs/zfs"; @@ -64,13 +65,6 @@ PATCHES=( pkg_pretend() { use rootfs || return 0 - - if has_version virtual/dist-kernel && ! use dist-kernel; then - ewarn "You have virtual/dist-kernel installed, but" - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" - ewarn "It's recommended to globally enable dist-kernel USE flag" - ewarn "to auto-trigger initrd rebuilds with kernel updates" - fi } pkg_setup() { @@ -192,10 +186,6 @@ pkg_postinst() { linux-mod-r1_pkg_postinst - if [[ -z ${ROOT} ]] && use dist-kernel ; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" - fi - if use x86 || use arm ; then ewarn "32-bit kernels will likely require increasing vmalloc to" ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index fe2cc8b18efb..79b2c443b06d 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit autotools dist-kernel-utils flag-o-matic linux-mod-r1 multiprocessing +MODULES_INITRAMFS_IUSE=+initramfs +inherit autotools flag-o-matic linux-mod-r1 multiprocessing DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" HOMEPAGE="https://github.com/openzfs/zfs"; @@ -64,13 +65,6 @@ PATCHES=( pkg_pretend() { use rootfs || return 0 - - if has_version virtual/dist-kernel && ! use dist-kernel; then - ewarn "You have virtual/dist-kernel installed, but" - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" - ewarn "It's recommended to globally enable dist-kernel USE flag" - ewarn "to auto-trigger initrd rebuilds with kernel updates" - fi } pkg_setup() { @@ -192,10 +186,6 @@ pkg_postinst() { linux-mod-r1_pkg_postinst - if [[ -z ${ROOT} ]] && use dist-kernel ; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" - fi - if use x86 || use arm ; then ewarn "32-bit kernels will likely require increasing vmalloc to" ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." -- 2.45.0
