From ef0fedb39c21a343a3f316726f272bad9005b22c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 12 Mar 2025 01:49:51 +0000 Subject: gentoo auto-resync : 12:03:2025 - 01:49:51 --- sys-fs/Manifest.gz | Bin 22233 -> 22234 bytes sys-fs/mdadm/Manifest | 2 +- sys-fs/mdadm/mdadm-4.4.ebuild | 2 +- sys-fs/zfs-kmod/Manifest | 3 + sys-fs/zfs-kmod/zfs-kmod-2.3.1.ebuild | 207 +++++++++++++++++++++++ sys-fs/zfs/Manifest | 3 + sys-fs/zfs/zfs-2.3.1.ebuild | 308 ++++++++++++++++++++++++++++++++++ 7 files changed, 523 insertions(+), 2 deletions(-) create mode 100644 sys-fs/zfs-kmod/zfs-kmod-2.3.1.ebuild create mode 100644 sys-fs/zfs/zfs-2.3.1.ebuild (limited to 'sys-fs') diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz index d4b90505ad80..343329721bd9 100644 Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest index e7e7c7686d71..b54e49b11f8f 100644 --- a/sys-fs/mdadm/Manifest +++ b/sys-fs/mdadm/Manifest @@ -23,5 +23,5 @@ DIST mdadm_4.4-3.debian.tar.xz 88948 BLAKE2B 48d2af9477b420f1bbaffebbeaf2389038f EBUILD mdadm-4.2-r3.ebuild 2755 BLAKE2B 357a4ce0b9984794d58d3166ac86a5bbf12bb6023bca09bf9110679ed98fd2e77023abb958669539248a0cadbedabe24b5df70cd8249163af5775ecb4eb8b337 SHA512 fbd1eee99aabf7f10a8c9487a0e6752bf2c461d48b9ee358b9bd91374a7f3527a1fa14925bcddde68c8ecc644d340246abd6a9e27941feb6f75c1f3b98895d5d EBUILD mdadm-4.3-r1.ebuild 3590 BLAKE2B 8fe3ce7f49fb40c2c784aa4ceb46e087bbee9e8fc70cc4bdd19e3270c0e36f05f0caea363450bac61e5ed9f81fdb88b0ed59ac8897c446737b8cd66d49b54e51 SHA512 9e6c8e8c5d9b0fa3925463abdd2fb8394be7ab8fc6b01b11f1227062840ea5d1a89aa3ca7495a374b95fe44cdf039f2e457d8a03954d0235dedefc894dfe0179 EBUILD mdadm-4.3.ebuild 3468 BLAKE2B 74e6729c7e8206417186705de2ea9bd948f9976522a8329aff54cc4575d62f66b32720b6624f4ca1319400fe899a7a49621f2896a83ca1f8dc715c06edf1363d SHA512 6f09c484979142d741e3175b667fdf8512bb4109f9ee0499e71fa61aeec47d5d759ff1a969e71be789c47b87f96ea8f162048576a8da5757ef6636e8c27072b0 -EBUILD mdadm-4.4.ebuild 2885 BLAKE2B 1989695d19c0c5fcb125ae24644b3541a887fb64985a91e1fba174bbe1e7e915b4ce5f6d4d8f7159152c55a110de04e76b70ae5e4e9289a7e00ea028376fdf93 SHA512 0a20c7c4d0d99091a665646e30969be53723de99d0f26e89fe23d967bde841ee5f6227b5a2e5fa1dff0f42f9f3de1d2dfa726e7e8775186629a54f66f5e2ba2d +EBUILD mdadm-4.4.ebuild 2878 BLAKE2B 3707f209fe8234fb618bd72d7bcb7e59a6be069451f90708512fe5f9104ca9ed247c1296ca611a9e8ae7c8c60860be09bd0c5b9895fe980ec2d236d9623abacc SHA512 f933bbc954b22bcfe434984f6966a06c21ce7c0b05c206c72ea797bf8a20043fc2c63b548b861d04ba95f18ad47b6373d6b27cad404ecb1cbd88cee7e1cee505 MISC metadata.xml 480 BLAKE2B 95eb128ef37a0fbd10b2f424b85b9e0c6c13bb6986788f98c0b0e7b9229bc6bff086c8fe379ec0706dd75a213b9d863f1faaffe29f0866cc6284048fd9befb84 SHA512 54f7d349c492e492a67a5de8606e4635eaabc80ec3a1d45b7db705181b70fd3d1e7a79d4be13d94a76604e1cbcba9502d09e852049a73cc6b29fc8fa1fbb4948 diff --git a/sys-fs/mdadm/mdadm-4.4.ebuild b/sys-fs/mdadm/mdadm-4.4.ebuild index 5c84dc344eee..6a3605a30efe 100644 --- a/sys-fs/mdadm/mdadm-4.4.ebuild +++ b/sys-fs/mdadm/mdadm-4.4.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" mirror://debian/pool/main/m/mdadm/${PN}_${DEB_PF}.debian.tar.xz" LICENSE="GPL-2" SLOT="0" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86" fi IUSE="static systemd +udev corosync" REQUIRED_USE="static? ( !udev )" diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 00c82565d357..b21b2d708f2b 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -9,10 +9,13 @@ 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.3.0.tar.gz 34029599 BLAKE2B b9fb7913f95dd0c8aec703961ecc0413aa51df889f15b1541ff8fcd7146ba485947fab83deb062bdffcdeab17a2465b7551c7eba3ec55c62c21aba58846c0da5 SHA512 f0bb1c6e28b325765be809dbc5d38ba294daa38b54eafd7d129cf6081fb209b200580437019faeed3614bbb0687d6583698a9282f3275905a1f5a8314a66cf0b DIST zfs-2.3.0.tar.gz.asc 836 BLAKE2B 9d1bd03dc6e5699236bca4c2b20a0a8b46e88d90ea58f7171d087c555da85d6af88acc5990f828ba455f9fbe24c90800c1edf74cd3f865b528730ffef8a931b8 SHA512 ba9a8e8b248de7383c8d33b84b0d70de026b8f3e6a1c82557b74ac274b28e559435541fbdfe816f6b80ce5098b3cac34af69cd53877f1f50fa6a846fa92a5dd0 +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 EBUILD zfs-kmod-2.1.16.ebuild 4188 BLAKE2B 2a626296f33ba306bad8527697e1f421e46d660a8a65020c4d73d99dc6a717e72141ad1c3e01bfed6b9dceed0aaa10e5970d9fd7ab373260ee842f4a4ae6d6ae SHA512 3797d5425ec7b524857fbd2c4aaa34e2209d403807a3e7ee3a821d2c0174d780963ac48cc46f358b09a26fcc47c4dfc930c4c2171cca75f2c78155e5204aac6c EBUILD zfs-kmod-2.2.5.ebuild 5523 BLAKE2B bb672c18784633c6d1605eb0d46018a015f73853e217a92922043b1183c36ebacc0292708f361b3379b19668f74ebaa6b63019faf9f78bb9e967754d1d0732cd SHA512 198f84fc9946a0f580c8b5b8176ef15aaa7fd6c1c04aff4f75f24a0f1851c1d8ba98b6fa343c6b8c62d96832b4d17b2ece2e20e6dff46803846f605e2cf03885 EBUILD zfs-kmod-2.2.6.ebuild 5524 BLAKE2B ed0c31e914a16da3bc691ec4658dad79b0b17148fb73cf6a1720c55c4ef74b167fdcb18201588f9b39d0c662d58d8f752f57ef6cc2ffdc60d96df3e9889ddd9a SHA512 5d1b24d46505e9d4964b7665351f96b1953ccceadb8d76c32f8efe7ea565aa880e9d4920928f40ebe5d58d10ea10b9656a89934c04ceaca012ab924d5a46741a EBUILD zfs-kmod-2.2.7.ebuild 5524 BLAKE2B b63e851aa6bb3d0857df2b1f5ea487f840060ea0235f741228e721bd9f8f06ec9e123b64da43b4ba6f0053d336f884ee8dc723dee1e14e3f1f4f0d660f5b037e SHA512 6ebd9dc0ed1710820f44cee845baa917ccc30e8d00644a7d8ed92b2074137fbb570ebd5384587ad5664b7fea91a834a810be37d47da4cc466289ee68f043a030 EBUILD zfs-kmod-2.3.0.ebuild 5527 BLAKE2B 423d19cfc293a587245f0ae0e171fc2c6adb49a53c505635fc3658903eaf2f34eabcb44f3273642d2b240cc9308f8a1dd487302f0493d4d16a9f9d016e11fc86 SHA512 ac0b46c176a8ab94b8d642ae1d21052299f09a29dd6d6640e97ac5275c16232a491451686f14a1a3cb3ee66b4cf019c5938ce227f64d889f5c0f2785794c215c +EBUILD zfs-kmod-2.3.1.ebuild 5527 BLAKE2B a724114a1412036906bdb61ec67fbe5ce674d4be9139dcac1d95293720e562ebc513459b4f65a03a347c567fd9512c653dd22e854ce8caa3c67ad6337e9d5e0c SHA512 b5f7b7092586f03f30ce06db6b520506dae81951e70eca5f16584570192db7f85fd73e3ee490250f8d384f297e95152175ec7f1fba5127ca95b9f7b2d2f3aaa1 EBUILD zfs-kmod-9999.ebuild 5527 BLAKE2B 6c05385c4a5201b4c26acbc9019c33a446922e677f5ff1e071e4f5dda9f76656b22f267b8d98c92cf745ac9c389929b9f0b6364a7614d4d902969b2b89c764f9 SHA512 6a46a6769f03c98426f6f147e519fa21ab9fab1b25e78c322a00a03f7aa414ac327b605ad2c49a290aba070db26dd8be4d688e5f0bd5768cc0d0573e975b46a4 MISC metadata.xml 664 BLAKE2B 50e33d5791fd756ae4566052ecd6d8b1b395f8390b4cbc10c3b32bfc12f0a414f4080bf4102091f0920369f7999f2f94022fd526703ee8e73dc948c1f9d28432 SHA512 dca8e09500fe0e20f11b10df22a61ca36c99b6b3a08c465ea011d921b25f5891be3abaa5e6dbda1a52dbbfad69d1c8bf9fc69f71b3ef73cac428015641aa52d2 diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.3.1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.3.1.ebuild new file mode 100644 index 000000000000..d8c897facd58 --- /dev/null +++ b/sys-fs/zfs-kmod/zfs-kmod-2.3.1.ebuild @@ -0,0 +1,207 @@ +# 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? ( + " + 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 + + 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" + --enable-shared + --enable-sysvinit + --localstatedir="${EPREFIX}/var" + --sbindir="${EPREFIX}/sbin" + --with-config=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}") + ) + + econf "${myconf[@]}" +} + +src_compile() { + default + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi +} + +src_install() { + default + + 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" +} + +pkg_postinst() { + udev_reload + + # we always need userspace utils in sync with zfs-kmod + # so force initrd update for userspace as well, to avoid + # situation when zfs-kmod trigger initrd rebuild before + # userspace component is rebuilt + # KV_* variables are provided by linux-info.eclass + if [[ -z ${ROOT} ]] && use dist-kernel; then + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + 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 ${EROOT}/$(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 +} -- cgit v1.2.3