commit:     db66755043c51e685bdf22a043f7795539e9ad0d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 20 05:21:44 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 20 05:21:44 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db667550

sys-fs/zfs-kmod: drop 2.3.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/zfs-kmod/Manifest              |   2 -
 sys-fs/zfs-kmod/zfs-kmod-2.3.1.ebuild | 207 ----------------------------------
 2 files changed, 209 deletions(-)

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 5095539062e8..41f18f08a70f 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -4,8 +4,6 @@ DIST zfs-2.2.7.tar.gz 33852602 BLAKE2B 
31a066d5d543e3328d1afd065a8da4f9b4c52433d
 DIST zfs-2.2.7.tar.gz.asc 836 BLAKE2B 
e8fc5e04f5b37a22c741bda46b4573e0cebe85da051c73cf3c5fc267de3c313399b235fc346ca06f4c22d37d2500044a26adb3ea241a65fbcf8760d0ef880039
 SHA512 
8d22a64c920c2a983429688a340f4ae281decdd30e465591e6b40af9f3016b8f168f4e8ea460600c832a2f46b383ff307986649a645585fb25c34fdfda75ad6e
 DIST zfs-2.2.8.tar.gz 33852494 BLAKE2B 
9e338544488d00a57594d638138896635ea62b80341ad9289b9faad7b899012206fef22e5742e1f5681c58d61d264127ed1e2dfe5aa9b2e9aac2243421c60b11
 SHA512 
95c203a97032b8ae46cc84e0e6fd68d61e42fb6c6fde7102b04ac85291579c18b1d52b3e93e345a3bc5491bef8bf07b8e7edcbf69cb6222c5d8454a3c83adb11
 DIST zfs-2.2.8.tar.gz.asc 224 BLAKE2B 
c3a06953c22d1b485fbd030c93ad0e744c50a91e51bbed5bef56090a1da57b02ec580499a419201f365c99ade53af5d6f545876e6d0da25ee7870fc86786288b
 SHA512 
fcd6fe2412b5a2e83ad2609d56993ed4ad61e10c4f77f1e94a66403adf66ac90604fb567e7cde6420fe0b6a604abfd817a63e744f7c4fe8452b862c1d8cc4df3
-DIST zfs-2.3.1.tar.gz 34048716 BLAKE2B 
7f22826c3359a015a87aafd119d882d8196dca59dadd85674a48c42ed502937f2880e98a387e9986be2c14fc48f46a288aed5fd8635f13db2585e3fc95e57726
 SHA512 
235023dbe97b3f7c5273e2a6fa34957cc37967256845d4ed9faa2e2a6da29ea6fdcba4167658cf03129afbb0aa11311a760d3d0b5ea5aecc64a4c7ee22ad2d31
-DIST zfs-2.3.1.tar.gz.asc 836 BLAKE2B 
5d1f84f5803f1b0553ad75b12020a57537f6a6e3c3781ab8a21f0d7de9ad6be0be7618bb42e51bbddd5fc48cabb05f6d79ea2f5eebc63d67383b29c44d69f7f6
 SHA512 
619aac22d80b8100f28ca3e4a984b2e0387b272131d2a8c104a278955a811e2280ecf3bfa3b7d54ed73572ed7cd45121cd724b52afd3503c30c1e41400d27674
 DIST zfs-2.3.2.tar.gz 34344259 BLAKE2B 
8a89c62cbbeaf410db4011821cdd9959abef1782be7427b81ac47565407384fa3a381bef041dae73e97c2b2cefca62933180851901b3b1b86974ed33ad178a61
 SHA512 
94311f2eca1488be83aa0cb802b4a4541bbbd061a3e8e5cbda62cabbb0c8f9a705372ad192cb77703b3d7642c43be7f604f3c363b243cf03a6aceae2d7e5db81
 DIST zfs-2.3.2.tar.gz.asc 836 BLAKE2B 
e9f7f6e5966f395f3cf48cbb63c76872edf50970f053aaaf0f254035e9aa7728be036a5a4dc24cff32d37cdb61ffa4bc1af7e03c8bc1ac9abc9abcfea7f98b95
 SHA512 
50f1ce4d07febd08a5098bb42516d52ff3227b2b36463a07eca558bfc630628244cd910ea385aa44fb126cd0542d9048a501af8b391a56cafd7307b9db3083c4
 DIST zfs-2.3.3.tar.gz 34360540 BLAKE2B 
4861ddfc91b941448d13d43bb2a023273917064b29880f87d91dbe6424b3f1fc7b0409e13a514d5b3f18f70a383c5d1c462ec5d7b8a7c82b2b076ecd363cecdd
 SHA512 
0a18615da052989c19e889758972f14173e790710a2615fc186212d02f9909f0bf62debc19d85ff5c58411d8ef82aa85aff20804c3fbe2446913cd293a18b80d

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.3.1.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.3.1.ebuild
deleted file mode 100644
index 18703b2b7001..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-2.3.1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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";
-
-MODULES_KERNEL_MAX=6.13
-MODULES_KERNEL_MIN=4.18
-
-if [[ ${PV} == 9999 ]] ; then
-       EGIT_REPO_URI="https://github.com/openzfs/zfs.git";
-       inherit git-r3
-       unset MODULES_KERNEL_MAX
-else
-       VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
-       inherit verify-sig
-
-       MY_PV=${PV/_rc/-rc}
-       
SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz";
-       SRC_URI+=" verify-sig? ( 
https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc
 )"
-       S="${WORKDIR}/zfs-${MY_PV}"
-
-       ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}"
-       # Increments minor eg 5.14 -> 5.15, and still supports override.
-       ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-       ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
-
-       if [[ ${PV} != *_rc* ]] ; then
-               KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc"
-       fi
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0/${PVR}"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="test"
-
-BDEPEND="
-       app-alternatives/awk
-       dev-lang/perl
-"
-
-if [[ ${PV} != 9999 ]] ; then
-       BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
-
-       IUSE+=" +dist-kernel-cap"
-       RDEPEND="
-               dist-kernel-cap? ( dist-kernel? (
-                       <virtual/dist-kernel-${ZFS_KERNEL_DEP}
-               ) )
-       "
-fi
-
-# Used to suggest matching USE, but without suggesting to disable
-PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-2.1.11-gentoo.patch
-)
-
-pkg_pretend() {
-       use rootfs || return 0
-}
-
-pkg_setup() {
-       local CONFIG_CHECK="
-               EFI_PARTITION
-               ZLIB_DEFLATE
-               ZLIB_INFLATE
-               !DEBUG_LOCK_ALLOC
-               !PAX_KERNEXEC_PLUGIN_METHOD_OR
-       "
-       use debug && CONFIG_CHECK+="
-               DEBUG_INFO
-               FRAME_POINTER
-               !DEBUG_INFO_REDUCED
-       "
-       use rootfs && CONFIG_CHECK+="
-               BLK_DEV_INITRD
-               DEVTMPFS
-       "
-
-       kernel_is -lt 5 && CONFIG_CHECK+=" IOSCHED_NOOP"
-
-       if [[ ${PV} != 9999 ]] ; then
-               local kv_major_max kv_minor_max zcompat
-               zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-               kv_major_max="${zcompat%%.*}"
-               zcompat="${zcompat#*.}"
-               kv_minor_max="${zcompat%%.*}"
-               kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
-                       "Linux ${kv_major_max}.${kv_minor_max} is the latest 
supported version"
-       fi
-
-       linux-mod-r1_pkg_setup
-}
-
-src_prepare() {
-       default
-
-       # Run unconditionally (bug #792627)
-       eautoreconf
-
-       if [[ ${PV} != 9999 ]] ; then
-               # Set module revision number
-               sed -Ei "s/(Release:.*)1/\1${PR}-gentoo/" META || die
-       fi
-}
-
-src_configure() {
-       use custom-cflags || strip-flags
-       filter-ldflags -Wl,*
-
-       local myconf=(
-               --bindir="${EPREFIX}"/bin
-               --sbindir="${EPREFIX}"/sbin
-               --with-config=kernel
-               --with-linux="${KV_DIR}"
-               --with-linux-obj="${KV_OUT_DIR}"
-               $(use_enable debug)
-
-               # See gentoo.patch
-               GENTOO_MAKEARGS_EVAL="${MODULES_MAKEARGS[*]@Q}"
-               TEST_JOBS="$(makeopts_jobs)"
-       )
-
-       econf "${myconf[@]}"
-}
-
-src_compile() {
-       emake "${MODULES_MAKEARGS[@]}"
-}
-
-src_install() {
-       emake "${MODULES_MAKEARGS[@]}" DESTDIR="${ED}" install
-       modules_post_process
-
-       dodoc AUTHORS COPYRIGHT META README.md
-}
-
-_old_layout_cleanup() {
-       # new files are just extra/{spl,zfs}.ko with no subdirs.
-       local olddir=(
-               avl/zavl
-               icp/icp
-               lua/zlua
-               nvpair/znvpair
-               spl/spl
-               unicode/zunicode
-               zcommon/zcommon
-               zfs/zfs
-               zstd/zzstd
-       )
-
-       # kernel/module/Kconfig contains possible compressed extentions.
-       local kext kextfiles
-               for kext in .ko{,.{gz,xz,zst}}; do
-               kextfiles+=( "${olddir[@]/%/${kext}}" )
-       done
-
-       local oldfile oldpath
-       for oldfile in "${kextfiles[@]}"; do
-               oldpath="${EROOT}/lib/modules/${KV_FULL}/extra/${oldfile}"
-               if [[ -f "${oldpath}" ]]; then
-                       ewarn "Found obsolete zfs module ${oldfile} for current 
kernel ${KV_FULL}, removing."
-                       rm -rv "${oldpath}" || die
-                       # we do not remove non-empty directories just for 
safety in case there's something else.
-                       # also it may fail if there are both compressed and 
uncompressed modules installed.
-                       rmdir -v --ignore-fail-on-non-empty "${oldpath%/*.*}" 
|| die
-               fi
-       done
-}
-
-pkg_postinst() {
-       # Check for old module layout before doing anything else.
-       # only attempt layout cleanup if new .ko location is used.
-       local newko=( "${EROOT}/lib/modules/${KV_FULL}/extra"/{zfs,spl}.ko* )
-       # We check first array member, if glob above did not exand, it will be 
"zfs.ko*" and -f will return false.
-       # if glob expanded -f will do correct file precense check.
-       [[ -f ${newko[0]} ]] && _old_layout_cleanup
-
-       linux-mod-r1_pkg_postinst
-
-       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."
-       fi
-
-       if has_version sys-boot/grub ; then
-               ewarn "This version of OpenZFS includes support for new feature 
flags"
-               ewarn "that are incompatible with previous versions. GRUB2 
support for"
-               ewarn "/boot with the new feature flags is not yet available."
-               ewarn "Do *NOT* upgrade root pools to use the new feature 
flags."
-               ewarn "Any new pools will be created with the new feature flags 
by default"
-               ewarn "and will not be compatible with older versions of 
OpenZFS. To"
-               ewarn "create a new pool that is backward compatible wih GRUB2, 
use "
-               ewarn
-               ewarn "zpool create -o compatibility=grub2 ..."
-               ewarn
-               ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list 
of features."
-       fi
-}

Reply via email to