commit:     6bd56dde8002e18af51a6240c589c47275c2672d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 29 08:22:44 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 29 08:22:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bd56dde

sys-fs/zfs: add 2.1.15

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

 sys-fs/zfs/Manifest          |   2 +
 sys-fs/zfs/zfs-2.1.15.ebuild | 311 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 313 insertions(+)

diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 15f09f09fd54..b1d0e6ec325b 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,5 +1,7 @@
 DIST zfs-2.1.14.tar.gz 35167471 BLAKE2B 
a7b22eaf05e4fbf416ebe4d7b884c515942fc9375c1dd322cefa00c19c550b9318a4192d6a909d49d58523c8f1a6eaf00189dd58e6543fae17cf8cc35042f469
 SHA512 
4a65c8b7d5576fa2dcc14e7ccaa93191c1d3791479cf89bd02c2bd04434ff5e93709b328796d4f9ba93da19f12772e359df373f40919350a3e1e4c52758b47c8
 DIST zfs-2.1.14.tar.gz.asc 836 BLAKE2B 
f01bc58bf6c3d367c494ed4ea9f3fb1141f3aafdbf4f913b9e0d60d31557076d5ae0e25ca93b013f5fd85e21ba5ae9f61e1a03af54bb0c743869c0ce3d5519df
 SHA512 
be0f386cce952b4047dc2448e356078668e8d4392802dd3bb1a426741f15f4d9fb689cd1cb09972bdbc9fe2e4e782ec4b4754fe811c5657bc1f5308bd38e3926
+DIST zfs-2.1.15.tar.gz 35209038 BLAKE2B 
61f9e14c54d43d1c51269917bb3ffde0530166126ea0467103ff1171dffc537315fd21c270d12f73d677e121b8094af39dd0a1fe3f80986bb42dc16d627dff52
 SHA512 
24096f2a6ecb3cc51f3d2f11cc69ad134d6fc33667007277c50cf798be2b19b6ddfa9be6923ca53d8b09f0bebae14c44d74811ec776e5aaf4ea0e810844c1f3d
+DIST zfs-2.1.15.tar.gz.asc 836 BLAKE2B 
897c05a8870cd0418493b42fe854ef5b28f9a31513ac262a25631089defa59190808b51bd31e43412b01171bcac0dff0608d417dfdacfeee0b0f067e0627d48f
 SHA512 
a6c5a9d214070a220716075455eb1cb85a53fb20b5fe4319f112cde0653a25f87b66d0f0bcf0ca641e3ac38239759cb9df6ed7f4700056a2732cc8c1ccd9ce05
 DIST zfs-2.2.2.tar.gz 33816541 BLAKE2B 
f0619ae42d898d18077096217d0a9ddd7c7378424707aa51d3645661b2889a1459bc4a5e9fe42b6860b2d26e4600da35765b0e741725dafacc2ead2370cad866
 SHA512 
bba252cbf7986f2cce154dd18a34aa478cf98f70106337188dc894de2446d60a58fa643706927757d1787506b44d4ff404897a2d0e16aacb0a7bf27765703332
 DIST zfs-2.2.2.tar.gz.asc 836 BLAKE2B 
bdc86492b2bf45d329e34e89ea7796f5cbf518d32ab114c909321b1d0d8040b9ce4e25b3b85fcbc5ea62ee10a2d716b5b27e37c2c005b307c0b593815c49d625
 SHA512 
110be1aa90f4749106717165a3cb5116379e2d170146a2b3d2601f04212450da9327e028d6e1e5de7f8a46c6bb7a15e2bcdd09e3e760590fbc695f9562f1440b
 DIST zfs-2.2.3.tar.gz 33854765 BLAKE2B 
f83439aa929609191a048dd326b2a15e0f57c72d2901cbfb205b81a29aa42dab49b42eb61647ca3eaed17518b8c907e81343364bfecf83ed441271648f8efd4b
 SHA512 
e6c3df531a33f4bd198429e61b7630f1e965a03fd60d1b847bdf0d55c6d2af3abc38b5e8a63aa9ef9f969cc7eca36cb24a7641f6fb8c41ef2fa024d76cd28f3d

diff --git a/sys-fs/zfs/zfs-2.1.15.ebuild b/sys-fs/zfs/zfs-2.1.15.ebuild
new file mode 100644
index 000000000000..606c4bf649fd
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.1.15.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 
flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://github.com/openzfs/zfs";
+
+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}/${P%_rc?}"
+
+       if [[ ${PV} != *_rc* ]]; then
+               KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+       fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# 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/5"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python 
+rootfs selinux test-suite"
+
+DEPEND="
+       net-libs/libtirpc:=
+       sys-apps/util-linux
+       sys-libs/zlib
+       virtual/libudev:=
+       dev-libs/openssl:0=
+       !minimal? ( ${PYTHON_DEPS} )
+       pam? ( sys-libs/pam )
+       python? (
+               $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 
'python*')
+       )
+"
+
+BDEPEND="app-alternatives/awk
+       virtual/pkgconfig
+       nls? ( sys-devel/gettext )
+       python? (
+               ${DISTUTILS_DEPS}
+               || (
+                       dev-python/packaging[${PYTHON_USEDEP}]
+                       dev-python/distlib[${PYTHON_USEDEP}]
+               )
+       )
+"
+
+if [[ ${PV} != "9999" ]] ; then
+       BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="${DEPEND}
+       !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
+       !prefix? ( virtual/udev )
+       sys-fs/udev-init-scripts
+       app-alternatives/awk
+       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
+       )
+"
+
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set, without suggesting to 
disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
+
+REQUIRED_USE="
+       !minimal? ( ${PYTHON_REQUIRED_USE} )
+       python? ( !minimal )
+       test-suite? ( !minimal )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+       # bug #854333
+       "${FILESDIR}"/2.1.5-r2-dracut-non-root.patch
+
+       "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
+)
+
+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() {
+       if use kernel_linux; then
+               linux-info_pkg_setup
+
+               if ! linux_config_exists; then
+                       ewarn "Cannot check the linux kernel configuration."
+               else
+                       if use test-suite; then
+                               if linux_chkconfig_present BLK_DEV_LOOP; then
+                                       eerror "The ZFS test suite requires 
loop device support enabled."
+                                       eerror "Please enable it:"
+                                       eerror "    CONFIG_BLK_DEV_LOOP=y"
+                                       eerror "in /usr/src/linux/.config or"
+                                       eerror "    Device Drivers --->"
+                                       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
+
+       # 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
+
+       # All the same issue:
+       # Segfaults w/ GCC 12 and 'zfs send'
+       # bug #856373
+       # https://github.com/openzfs/zfs/issues/13620
+       # https://github.com/openzfs/zfs/issues/13605
+       append-flags -fno-tree-vectorize
+
+       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)
+               --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
+}

Reply via email to