commit:     e3cc6074f76387e969ff0664ad4bb0f5ea331c90
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  9 01:52:26 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep  9 01:52:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3cc6074

sys-fs/zfs: add 2.2.0_rc4

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

 sys-fs/zfs/Manifest             |   2 +
 sys-fs/zfs/zfs-2.2.0_rc4.ebuild | 306 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 308 insertions(+)

diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 34e7ed5dc0b4..fdb6fcb5ab21 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -6,3 +6,5 @@ DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B 
d7553cc162687531b254089e29e2e15e2eb6b362c
 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 
1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486
 SHA512 
35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0
 DIST zfs-2.2.0-rc3.tar.gz 33666688 BLAKE2B 
37c47bcbf34d9238f42bbc80e2b0712a9e64a48196a390e30cfc02a510e0a8c28da5aa52eb3963a2363d2d23881628cadad13e2121cf54a0582cfc7d55685313
 SHA512 
d82991e6ff63910b38aa0d9b79fce19d1deb79a214adca4bec3fd468077674ef1de264b6f5b0acf9dc0418ce1ed4c9e98d1ad4596274a1769061ae20e017fb92
 DIST zfs-2.2.0-rc3.tar.gz.asc 195 BLAKE2B 
cbbced9255a3b6a5ec0190806b73e62533600975dad073b82532fb1e488bf81b8d056c7a4f59b9e212a9825ec4900d6f2e2c0141b3d4d58577fe36d9bc3c15b9
 SHA512 
45424815e39b33107805da737ecfcb95c761ab774143e72449dacfe98a851ddf52c7cb08a587548159305b4c4fe51a0fb9cfbf30fdadf093518eb4c8ce49e12c
+DIST zfs-2.2.0-rc4.tar.gz 33660298 BLAKE2B 
c8179cf7a8caaa07e6898d9169fa3f825d070d1e7f26552797ebaeb4a6cdddd122072903f93113b4bf817acc47911d6c32b4f4801f09382b7a6376369086f329
 SHA512 
ae389b24616d1800cff2df1e06b22d0fc507ccd573cda47cd84c7aa3271a5e3b78668a135224e8d0747eb63104544fc284d814073e4061908553faf3d2b0f075
+DIST zfs-2.2.0-rc4.tar.gz.asc 195 BLAKE2B 
496f5163235f743e64da3862245a8dfabd95d06071183514ab11f7dd7792b32823b73864888d7a2fbf2dee16ca374772b07139287a1e66416dbd82e062b25ba9
 SHA512 
6a0ce528e0b15b4c1b8f02db9aaa9ce61bdf9a7c1c88336b91042802535618fd95aa4f59211bef0d1d79f833d8ae2030c4be8ee5a2244b13ec3f684aa1cdee4e

diff --git a/sys-fs/zfs/zfs-2.2.0_rc4.ebuild b/sys-fs/zfs/zfs-2.2.0_rc4.ebuild
new file mode 100644
index 000000000000..e9d67dd0d80e
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.2.0_rc4.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2023 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 linux-mod
+       EGIT_REPO_URI="https://github.com/openzfs/zfs.git";
+else
+       VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/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}"
+
+       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="
+       dev-libs/openssl:=
+       net-libs/libtirpc:=
+       sys-apps/util-linux
+       sys-libs/zlib
+       virtual/libudev:=
+       !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 )
+       app-alternatives/awk
+       sys-fs/udev-init-scripts
+       dist-kernel? ( virtual/dist-kernel:= )
+       rootfs? (
+               app-arch/cpio
+               app-misc/pax-utils
+       )
+       selinux? ( sec-policy/selinux-zfs )
+       test-suite? (
+               app-shells/ksh
+               sys-apps/kmod[tools]
+               sys-apps/util-linux
+               sys-devel/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=(
+       "${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
+
+       # 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)
+               --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