commit:     f85678c530981662da161dfba3c49f1ee16cf5d6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 28 01:23:49 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 28 01:26:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f85678c5

sys-fs/zfs: add 2.2.0_rc3

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

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

diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index c01ce1f71997..36404e8fd024 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -8,3 +8,5 @@ DIST zfs-2.2.0-rc1.tar.gz 33656024 BLAKE2B 
1157db51d2736905b787a2627e599d7ac527b
 DIST zfs-2.2.0-rc1.tar.gz.asc 195 BLAKE2B 
8df7d05729716ca75e8c975df92f8a1976b7712a3c98e3479582550e60bd97af77f80e9b72be094b57650948136ad8a9276e7d4ea0a1d0473a5d56988058bcc8
 SHA512 
de6ee565f864080dfcf69ecdf832cebdabaa29d9f3dac1ad5f5928e664352aa3da4ed0ba5f2e634e3629f10eedbae9d1613ac3d3a13285fef846f7beabfa2f79
 DIST zfs-2.2.0-rc2.tar.gz 33657059 BLAKE2B 
efcac0a74ba3a0168eed868457cbc5c38572e4ed5653979d874d5c61ff9ee1ea474b4f7d8ef0df7e05e0e45e0802f2ad46fe54414af8d53375fb968fe6927757
 SHA512 
c509b8078907fb644c7a88b9ff386c16b6b72a1ee3156011887b98d93b57fe6bb73575c6de173ce7897d31c425c8f87ff3450091e3687ee5a8e1bebc15ecdd80
 DIST zfs-2.2.0-rc2.tar.gz.asc 195 BLAKE2B 
45ab6dbe068845643fef92f539f4fb1b312b41684768276a849806adb26a6a30a7f635c8050f9cd435aa5374c5fda229b2688f33b9171b63f5bb1d3028d5b955
 SHA512 
8d300fb013e495bb631f170606003154d6f3eaf630d7598e1ec83d0031e83c3de0166682522fbb287a7e860967e6b9e439ad81e115c1f6d4a27680ca90cf6dfd
+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

diff --git a/sys-fs/zfs/zfs-2.2.0_rc3.ebuild b/sys-fs/zfs/zfs-2.2.0_rc3.ebuild
new file mode 100644
index 000000000000..e9d67dd0d80e
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.2.0_rc3.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