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 B06091581D3 for ; Fri, 17 May 2024 12:07:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48E66E2ADC; Fri, 17 May 2024 12:07:33 +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 2E2E1E2ADC for ; Fri, 17 May 2024 12:07:33 +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 54F1333C1C1 for ; Fri, 17 May 2024 12:07:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DBEA41AD2 for ; Fri, 17 May 2024 12:07:30 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1715947603.0ef34366cbc67e4796f07dbc8b7433d20af8fc22.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild sys-fs/zfs-kmod/zfs-kmod-2.1.15.ebuild sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild sys-fs/zfs-kmod/zfs-kmod-9999.ebuild X-VCS-Directories: sys-fs/zfs-kmod/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 0ef34366cbc67e4796f07dbc8b7433d20af8fc22 X-VCS-Branch: master Date: Fri, 17 May 2024 12:07:30 +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: 22bf8dce-3af7-4f3d-ba00-9dee15ec8392 X-Archives-Hash: a72e99b4cd1b52df774a97b134fb1ac2 commit: 0ef34366cbc67e4796f07dbc8b7433d20af8fc22 Author: Andrew Ammerlaan gentoo org> AuthorDate: Wed May 8 06:05:49 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Fri May 17 12:06:43 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef34366 sys-fs/zfs-kmod: add USE=initramfs, and enable by default Signed-off-by: Andrew Ammerlaan 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 dd1431d2a81b..e449fc9b7e0a 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 9053d8c85332..903e8e571c0f 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."