From d01a4f8adcbfbcd514d6670ddca4948e2b61745d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Sun, 23 Aug 2026 17:12:43 +0200 Subject: [PATCH] [sys-fs/zfs] drop old --- sys-fs/zfs/Manifest | 2 - sys-fs/zfs/files/zfs-2.1.11-gentoo.patch | 24 -- sys-fs/zfs/metadata.xml | 43 --- sys-fs/zfs/zfs-2.4.3.ebuild | 441 ----------------------- 4 files changed, 510 deletions(-) delete mode 100644 sys-fs/zfs/Manifest delete mode 100644 sys-fs/zfs/files/zfs-2.1.11-gentoo.patch delete mode 100644 sys-fs/zfs/metadata.xml delete mode 100644 sys-fs/zfs/zfs-2.4.3.ebuild diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest deleted file mode 100644 index 499ec69..0000000 --- a/sys-fs/zfs/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST zfs-2.4.3.tar.gz 34545847 BLAKE2B 9f9c58c31a99bc50cfa93a8a924c09a278e96706986afe09bd1fd02e3ce82fa6bee5d4b27542db76134e014ee09ce7c2c723eda5c98c7c6dab5f63aedb83ed47 SHA512 343fbb19c0ca5f91254d216b6113fb8a7b028bdafc976ba9cb1ff6b7d3442a6a0fbf2cc4bde4f2fcc7cb7293cc17a1914664a943e5c798d261d00b22a0e56989 -DIST zfs-2.4.3.tar.gz.asc 858 BLAKE2B 4163ff53218a3c5b146135cdffebea94b4e02f1a44c42a7990e86d7deeb119b05cd47e86663d0f3b6362ee2cb3334e822a0c90b70e6688b232dbe0fea18dce87 SHA512 c429fcaa2ef7a31f22734fb4282ede274a79017ab5b9a76553d61c6090fbf36e5ff7b37f7945a08aea98fb7bdc618343801747a7c07f1abc1fb1cab8ac9490d8 diff --git a/sys-fs/zfs/files/zfs-2.1.11-gentoo.patch b/sys-fs/zfs/files/zfs-2.1.11-gentoo.patch deleted file mode 100644 index 53c5f27..0000000 --- a/sys-fs/zfs/files/zfs-2.1.11-gentoo.patch +++ /dev/null @@ -1,24 +0,0 @@ -Hack to pass the full linux-mod-r1 toolchain to make during ./configure. -Not needed at build time given can pass it normally then. - -Eclass has workarounds, compiler/version matching, and its own set of -user variables which creates disparity between ebuilds if not used. - -For the (normal) alternative: KERNEL_{CC,LD} alone is insufficient, -but combining with KERNEL_LLVM=1 when CC_IS_CLANG will allow it -to work for *most* people (will likely still need KERNEL_LD from -linux-mod-r1, or ThinLTO kernels may fail with sandbox violations). - -Note KERNEL_* also cause failure if they contain spaces. - -https://bugs.gentoo.org/865157 ---- a/config/kernel.m4 -+++ b/config/kernel.m4 -@@ -646,6 +646,5 @@ - AC_TRY_COMMAND([ - KBUILD_MODPOST_NOFINAL="$5" KBUILD_MODPOST_WARN="$6" -- make modules -k -j$TEST_JOBS ${KERNEL_CC:+CC=$KERNEL_CC} -- ${KERNEL_LD:+LD=$KERNEL_LD} ${KERNEL_LLVM:+LLVM=$KERNEL_LLVM} -+ make modules -k -j$TEST_JOBS '${GENTOO_MAKEARGS_EVAL}' - CONFIG_MODULES=y CFLAGS_MODULE=-DCONFIG_MODULES - -C $LINUX_OBJ $ARCH_UM M=$PWD/$1 >$1/build.log 2>&1]) diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml deleted file mode 100644 index a59aaf8..0000000 --- a/sys-fs/zfs/metadata.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - gentoo@alexmoch.com - Alexander Moch - - - mschiff@gentoo.org - Marc Schiffbauer - - - Prevents upgrading to an unsupported kernel version when combined with USE=dist-kernel - Disable dependency on sys-fs/zfs-kmod under the assumption that ZFS is part of the kernel source tree - Don't install python scripts (arcstat, dbufstat etc) and avoid dependency on dev-lang/python - Install zfs_key pam module, for automatically loading zfs encryption keys for home datasets - Enable dependencies required for booting off a pool containing a rootfs - Install regression test suite - - - https://github.com/openzfs/zfs/issues - https://openzfs.github.io/openzfs-docs/ - openzfs/zfs - - - OpenZFS is an advanced file system and volume manager which was originally developed - for Solaris and is now maintained by the OpenZFS community - - It includes the functionality of both traditional file systems and volume manager. - It has many advanced features including: - * Protection against data corruption. Integrity checking for both data and metadata. - * Continuous integrity verification and automatic “self-healing” repair - * Data redundancy with mirroring, RAID-Z1/2/3 [and DRAID] - * Support for high storage capacities — up to 256 trillion yobibytes (2^128 bytes) - * Space-saving with transparent compression using LZ4, GZIP or ZSTD - * Hardware-accelerated native encryption - * Efficient storage with snapshots and copy-on-write clones - * Efficient local or remote replication — send only changed blocks with ZFS send and receive - - The OpenZFS project brings together developers from the Linux, FreeBSD, illumos, MacOS, and Windows platforms. - OpenZFS is supported by a wide range of companies. - - diff --git a/sys-fs/zfs/zfs-2.4.3.ebuild b/sys-fs/zfs/zfs-2.4.3.ebuild deleted file mode 100644 index c8147c4..0000000 --- a/sys-fs/zfs/zfs-2.4.3.ebuild +++ /dev/null @@ -1,441 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Maintainers should consider lurking in the ZFS IRC channels (there's several) -# and regularly checking ZFS GitHub issues and PRs. Look out for the 'zfs-*' -# stable backport PRs when they're opened and subscribe to them for any important -# cherry-picks that may be needed in advance. - -DISTUTILS_OPTIONAL=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{12..15} ) - -MODULES_INITRAMFS_IUSE=+initramfs -MODULES_OPTIONAL_IUSE=+modules - -inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info -inherit linux-mod-r1 multiprocessing pam systemd udev usr-ldscript - -DESCRIPTION="Linux kernel module and userland utilities for ZFS" -HOMEPAGE="https://github.com/openzfs/zfs" - -MODULES_KERNEL_MAX=7.1 -MODULES_KERNEL_MIN=4.18 - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/openzfs/zfs.git" -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc - inherit verify-sig - - MY_P="${P/_rc/-rc}" - SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" - SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )" - S="${WORKDIR}/${MY_P}" - - 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="BSD-2 CDDL MIT modules? ( debug? ( GPL-2+ ) )" -# just libzfs soname major for now. -# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. -# see libsoversion_check() below as well -SLOT="0/7" -IUSE="custom-cflags debug dist-kernel minimal nls pam python +rootfs selinux test-suite unwind" - -DEPEND=" - dev-libs/openssl:= - net-libs/libtirpc:= - sys-apps/util-linux - virtual/zlib:= - virtual/libudev:= - !minimal? ( ${PYTHON_DEPS} ) - pam? ( sys-libs/pam ) - python? ( - $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*') - ) - unwind? ( sys-libs/libunwind:= ) -" - -BDEPEND=" - app-alternatives/awk - virtual/pkgconfig - modules? ( dev-lang/perl ) - nls? ( sys-devel/gettext ) - python? ( - ${DISTUTILS_DEPS} - || ( - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/distlib[${PYTHON_USEDEP}] - ) - ) -" - -# awk is used for some scripts, completions, and the Dracut module -RDEPEND=" - ${DEPEND} - !prefix? ( virtual/udev ) - app-alternatives/awk - sys-fs/udev-init-scripts - dist-kernel? ( virtual/dist-kernel:= ) - rootfs? ( - app-alternatives/cpio - app-misc/pax-utils - ) - selinux? ( sec-policy/selinux-zfs ) - test-suite? ( - app-shells/ksh - sys-apps/kmod[tools] - sys-apps/util-linux - app-alternatives/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - ) - !" - eerror " Block devices --->" - eerror " [X] Loopback device support" - fi - fi - fi - fi -} - -libsoversion_check() { - local bugurl libzfs_sover - bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages" - - libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \ - | grep -Eo '[0-9]+:[0-9]+:[0-9]+')" - libzfs_sover="${libzfs_sover%%:*}" - - if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then - echo - eerror "BUG BUG BUG BUG BUG BUG BUG BUG" - eerror "ebuild subslot does not match libzfs soversion!" - eerror "libzfs soversion: ${libzfs_sover}" - eerror "ebuild value: $(ver_cut 2 ${SLOT})" - eerror "This is a bug in the ebuild, please use the following URL to report it" - eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot" - echo - # we want to abort for releases, but just print a warning for live ebuild - # to keep package installable - [[ ${PV} == "9999" ]] || die - fi -} - -src_prepare() { - default - libsoversion_check - - # Run unconditionally (bug #792627) - eautoreconf - - # strip forced -Werror, #904378 - sed -i '/BUILD_FREEBSD_TRUE/s/-Werror //g' Makefile.in || die - - if [[ ${PV} != "9999" ]]; then - # Set revision number - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" - fi - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_prepare - popd >/dev/null || die - fi - - # Tries to use /etc/conf.d which we reserve for OpenRC - sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die - - # prevent errors showing up on zfs-mount stop, #647688 - # openrc will unmount all filesystems anyway. - sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die -} - -src_configure() { - use custom-cflags || strip-flags - use minimal || python_setup - - local myconf=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --enable-shared - --enable-sysvinit - --localstatedir="${EPREFIX}/var" - --sbindir="${EPREFIX}/sbin" - --with-config="$(usex modules all user)" - --with-dracutdir="${EPREFIX}/usr/lib/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-pamconfigsdir="${EPREFIX}/unwanted_files" - --with-pammoduledir="$(getpam_mod_dir)" - --with-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="$(systemd_get_systempresetdir)" - --with-vendor=gentoo - # Building zfs-mount-generator.c on musl breaks as strndupa - # isn't available. But systemd doesn't support musl anyway, so - # just disable building it. - # UPDATE: it has been fixed since, - # https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a - # but we still leave it as this for now. - $(use_enable !elibc_musl systemd) - $(use_enable debug) - $(use_enable nls) - $(use_enable pam) - $(use_enable python pyzfs) - $(use_with unwind libunwind) - --disable-static - $(usex minimal --without-python --with-python="${EPYTHON}") - --enable-linux-experimental - - # See gentoo.patch - GENTOO_MAKEARGS_EVAL="${MODULES_MAKEARGS[*]@Q}" - TEST_JOBS="$(makeopts_jobs)" - ) - - econf "${myconf[@]}" -} - -src_compile() { - if use modules; then - emake "${MODULES_MAKEARGS[@]}" - else - default - fi - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_install() { - DOCS=( AUTHORS COPYRIGHT META README.md ) - - if use modules; then - emake "${MODULES_MAKEARGS[@]}" DESTDIR="${ED}" install - modules_post_process - einstalldocs - else - default - fi - # distutils-r1_src_install tries to run einstalldocs as well - # bug #965156 - unset DOCS - - gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool - - use pam && { rm -rv "${ED}/unwanted_files" || die ; } - - use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; } - - find "${ED}" -name '*.la' -delete || die - - dobashcomp contrib/bash_completion.d/zfs - bashcomp_alias zfs zpool - - # strip executable bit from conf.d file - fperms 0644 /etc/conf.d/zfs - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi - - # enforce best available python implementation - use minimal || python_fix_shebang "${ED}/bin" -} - -_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() { - udev_reload - - if use modules; then - # 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 - fi - - if use rootfs; then - if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then - elog "Root on zfs requires an initramfs to boot" - elog "The following packages provide one and are tested on a regular basis:" - elog " sys-kernel/dracut ( preferred, module maintained by zfs developers )" - elog " sys-kernel/genkernel" - fi - fi - - if systemd_is_booted || has_version sys-apps/systemd; then - einfo "Please refer to $(systemd_get_systempresetdir)/50-zfs.preset" - einfo "for default zfs systemd service configuration" - else - [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ - einfo "You should add zfs-import to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \ - einfo "You should add zfs-load-key to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ - einfo "You should add zfs-mount to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ - einfo "You should add zfs-share to the default runlevel." - [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ - einfo "You should add zfs-zed to the default runlevel." - fi -} - -pkg_postrm() { - udev_reload -}