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 980C01581D3 for ; Tue, 14 May 2024 12:00:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93958E2A09; Tue, 14 May 2024 11:59:40 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0993CE2A06 for ; Tue, 14 May 2024 11:59:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 48B5D33D9AD; Tue, 14 May 2024 11:59:39 +0000 (UTC) X-Virus-Scanned: by amavisd-new using ClamAV at gentoo.org X-Spam-Flag: NO X-Spam-Score: -1.119 X-Spam-Level: X-Spam-Status: No, score=-1.119 tagged_above=-9999 required=3.5 tests=[AWL=0.000, BAYES_00=-1.9, KHOP_HELO_FCRDNS=0.001, SPF_HELO_FAIL=0.001, SPF_NEUTRAL=0.779] autolearn=no autolearn_force=no Received: from smtp.gentoo.org ([127.0.0.1]) by localhost (smtp.gentoo.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cgrryS5wHYK1; Tue, 14 May 2024 11:59:33 +0000 (UTC) Received: from andrew-gentoo-laptop.science.ru.nl (n036122.science.ru.nl [131.174.36.122]) (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 3E3C434067D; Tue, 14 May 2024 11:59:33 +0000 (UTC) From: Andrew Ammerlaan To: gentoo-dev@lists.gentoo.org Cc: Andrew Ammerlaan Subject: [gentoo-dev] [PATCH 3/7] sys-fs/zfs-kmod: add USE=initramfs, and enable by default Date: Tue, 14 May 2024 13:59:08 +0200 Message-ID: <20240514115924.29167-3-andrewammerlaan@gentoo.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514115924.29167-1-andrewammerlaan@gentoo.org> References: <20240514115924.29167-1-andrewammerlaan@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 8eb6f028-482d-433d-adee-af4bcfb46ea1 X-Archives-Hash: 4d81f22e53c885cac3cd63bc810495ae Signed-off-by: Andrew Ammerlaan --- 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