summaryrefslogtreecommitdiff
path: root/sys-fs/zfs
diff options
context:
space:
mode:
Diffstat (limited to 'sys-fs/zfs')
-rw-r--r--sys-fs/zfs/Manifest7
-rw-r--r--sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch93
-rw-r--r--sys-fs/zfs/zfs-0.8.2-r2.ebuild224
-rw-r--r--sys-fs/zfs/zfs-0.8.3-r1.ebuild2
-rw-r--r--sys-fs/zfs/zfs-9999.ebuild2
5 files changed, 4 insertions, 324 deletions
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index e92d1d9d29ce..75f31722f339 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,5 +1,4 @@
AUX 0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch 1945 BLAKE2B db5d094bcac52a3b53bae9df4b0444f656858dd83f21994cbefe4900554a2579c67b5058d149d226ca354bd45d9e24c12244186da3232064233b74ec590187dc SHA512 71a009336fdcac8e5813001fd6741f4310c3e792b20650ebad73ba0049730acb5188587dc8e706846e886bf9ac241d2163b9558150eb389c99d7910a730542d0
-AUX 0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch 3386 BLAKE2B fd12c67ae3d481dda5a6bcf3c3815ac752f7f22834aadc02ee11a592b7114bccc7fc8b494763f80999428d90c9903cbf4df5e544443c2cec0bfc91a942f5c708 SHA512 739d1e050d8894e3d92a995500d1f70e128cf33de941eacdb0b3ad8e743fedf464a02ba4a5ac85f43e302d53302ce866d88ab836dd60b861914cb5b7a190f376
AUX 0.8.3-fno-common.patch 2377 BLAKE2B 61390e1c64b212b94060777154f5cf18942d4c22ba845f85ae91e81cdb6978e6d01cc9f90b1739bf3503bc40f26a98389659dbc0f83d3cedc954b802792b3b55 SHA512 7b2b066d0f4def5950c031ef87626ef68e0eccfe388f451dd6e5a36874674020ed2e4658bf24ab3977673b77aa7631822ef12318381f7785f310a0b24a61dfbc
AUX 0.8.3-zfs-functions.patch 1707 BLAKE2B 6ead7415be7dbeff6377b8d4074bb4e1cf6b154cf145e77b876e514c57d05cc041c5a66cfd6ab4c0bbb4931fa2553680c5749c4e06810ebd5658941088f9e7cf SHA512 cda47f5ef47ab86b2fda87e9ac2ab26d08431b2bd7420ecdd8ab9625a283c48278caa794b2aaa4c5f9341e08a2751b5b4a7b93a3b53491ccbdf2f085a0cb86ec
AUX bash-completion-r1 11310 BLAKE2B f6c105fef1737d4be0e76967fdec62aa52fa7665bfc1e9aa4c944dd6442d64d7d31b8af54f92f5db25542f968ecf83da46db8c2a8f978577526bf9f90d8bccf3 SHA512 03be521e2c646196766d5fd049f241cb97f290abf0409881ea6ba709934984deda402c8513009e62a5787e0648023b55c040e5f99baef27709e81c3bc9c8f56e
@@ -7,11 +6,9 @@ AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e069
AUX zfs-init.sh.in 582 BLAKE2B 27e5c1aff398c42178b3d7c005e91a1f8f3afa303a22e49c93a2cd7134016a8d07d68483126d60e46ed4ff5cbaeb87f050e9c9fb5bff5352d5dc32b4d94db7b4 SHA512 bed7eae5f902f13489241782d3d560b53a5a3258de492763b7b25783ca9417975afb9000f68f58be5c2057e1db50a569374ed0ff572140aa65e401e20e646461
AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b9243f111c6c882c3480eb6396e347eac91670e3a67d7f122953d6fa82ec61a6467163b788b31858 SHA512 7a167b389723e5f55fea6956e5546e46c89ebf3e2d1c25f6b56c357e6d3ffc765226549d78cdeb79b4dc90c798ec6326a13996215b40eb49179376e32c3c3287
DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e
-DIST zfs-0.8.2.tar.gz 8738111 BLAKE2B 5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e5203ff18612ce88473fee9af369354c442f3db7882d301cf17c805c9635b05bfd3460833ed8e5ff8004dd0 SHA512 1424b1a030b814f812b5da422100669db5b8c3ccae14c2fdd62a5e0df28e7255247fe5ca99c95a14f08c92cc1574c22dd132093e4a1dd81e38c95b10cc5e2496
DIST zfs-0.8.3.tar.gz 8779385 BLAKE2B 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958 SHA512 aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010
EBUILD zfs-0.7.13-r1.ebuild 6276 BLAKE2B b2aafe81b97e72249710bbed0282afe8e03aaf5029236d5b12d3089ef58458b9615f1f60f89b1473097321b8182704a5ba2964fb94b86f03a20d269029351264 SHA512 3547d9918e2b082299dbbaf39310ecaa780f44c2c7ece907b6149b3cff98ce68fc73846c303d579112453aaa6763bd029ccd24ab330c1578432a44da73a0d816
EBUILD zfs-0.7.13-r2.ebuild 6340 BLAKE2B a351568c54fecd31574471e164f41e1909fe6096ac68211664ef6a90435c59c4189a5ed9a1356867a81941a17874c8580b6a27ec0caef49976afdda655bb8571 SHA512 4a17ca33411e286f19ae8d4c6eaee42cad9a2db024a83b6355f0f33db0fcbd83ca138f3e4b88a2b14cc3fded942edf4bd22f4588afc6082e608e02ced2d59b10
-EBUILD zfs-0.8.2-r2.ebuild 5695 BLAKE2B 6e8096f02073a66e3c441ffe445efa13343d578b4da24b132cbd1336590c9fe6a260901acbb7db792d802f1f4838eaa86ed769c3acff670bcf2ab5d1b3f35ca6 SHA512 5ea68d75bee0c3fba23ed178c564f997a1e39ea3a036f3964e7badf0f8f31f359de184375f71060590aae86d18c222e36d9957639e7fd764f5ac4d824057282a
-EBUILD zfs-0.8.3-r1.ebuild 5632 BLAKE2B 4e3ad4d539fd8a3564506c2c81ae64d5e7384e42d0a016da9edd0b6ca27392c7c6bee5085944137e9ae7e7e010b07b1854ebfa931bcfff65cc7474429a074fef SHA512 6739e8a0b86c1e763e44ed454ed74bb8f680ca49a85ba12a3a877b9a5a41f83fdd501c6a411e9e79855139de9a034e6a77aa9773cc418dbee60b12bd0d782feb
-EBUILD zfs-9999.ebuild 5424 BLAKE2B fc1a9905e15e42717447c4f572e28e7834231da76a91bbb7072834e0e18a649c19a455de69c1f5ccc9f0afce590733c3aafa90f499723bc838b7f0200722e0b9 SHA512 9c4f99a617dfa274ad92e3b24671743724c8c4c54c6a2dcf92c452ecfd246d5a37e77f31fefd8992305ecfdc8821aa643df3d78125d685f206411071f5425aa5
+EBUILD zfs-0.8.3-r1.ebuild 5631 BLAKE2B bddee093199db937dfb3803c959fcad9d7a582bdd662f73c03653a9a1024f72dc117204cf13939e130cc4c0580db7b5266b03f4561e96c2caed2cf349bfa766c SHA512 ec01abfbe7ca3661dcfe6b9acb7a7d6cce59bd81f9a8d14175cf196ee523c6f2dea315d6b4f22c77d4322f663b9087b4e5dac9ba52105e69447dba4dffc2eebb
+EBUILD zfs-9999.ebuild 5425 BLAKE2B f7b093bfd03a6cf83d2941640cb80809238e85298131f38563823c2b32ab3db0157ec3264c625f5bea735fa379f01651739d6118c9ac0f5271910db5d7a0bd33 SHA512 3b3b4ba3bccd50beebc2b430460b2992486d2a8016141834ee4a948c76ece3252b8b9516de18665d749a08ee31d677ef9d0f85f8a754d7ea4644917f4f19751c
MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch b/sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch
deleted file mode 100644
index 00dda6de55c4..000000000000
--- a/sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 803884217f9b9b5fb235d7c5e78a809d271f6387 Mon Sep 17 00:00:00 2001
-From: Richard Yao <ryao@gentoo.org>
-Date: Wed, 9 Oct 2019 12:16:12 -0700
-Subject: [PATCH] Implement ZPOOL_IMPORT_UDEV_TIMEOUT_MS
-
-Since 0.7.0, zpool import would unconditionally block on udev for 30
-seconds. This introduced a regression in initramfs environments that
-lack udev (particularly mdev based environments), yet use a zfs userland
-tools intended for the system that had been built against udev. Gentoo's
-genkernel is the main example, although custom user initramfs
-environments would be similarly impacted unless special builds of the
-ZFS userland utilities were done for them. Such environments already
-have their own mechanisms for blocking until device nodes are ready
-(such as genkernel's scandelay parameter), so it is unnecessary for
-zpool import to block on a non-existent udev until a timeout is reached
-inside of them.
-
-Rather than trying to intelligently determine whether udev is available
-on the system to avoid unnecessarily blocking in such environments, it
-seems best to just allow the environment to override the timeout. I
-propose that we add an environment variable called
-ZPOOL_IMPORT_UDEV_TIMEOUT_MS. Setting it to 0 would restore the 0.6.x
-behavior that was more desirable in mdev based initramfs environments.
-This allows the system user land utilities to be reused when building
-mdev-based initramfs archives.
-
-Reviewed-by: Igor Kozhukhov <igor@dilos.org>
-Reviewed-by: Jorgen Lundman <lundman@lundman.net>
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Reviewed-by: Georgy Yakovlev <gyakovlev@gentoo.org>
-Signed-off-by: Richard Yao <ryao@gentoo.org>
-Closes #9436
----
- lib/libzutil/os/linux/zutil_import_os.c | 11 ++++++++++-
- man/man8/zpool.8 | 6 ++++++
- 2 files changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/lib/libzutil/zutil_import.c b/lib/libzutil/zutil_import.c
-index 811eae397c9..e51004edc68 100644
---- a/lib/libzutil/zutil_import.c
-+++ b/lib/libzutil/zutil_import.c
-@@ -53,6 +53,7 @@
- #include <libgen.h>
- #include <stddef.h>
- #include <stdlib.h>
-+#include <stdio.h>
- #include <string.h>
- #include <sys/stat.h>
- #include <unistd.h>
-@@ -181,17 +182,25 @@ zpool_open_func(void *arg)
- if (rn->rn_labelpaths) {
- char *path = NULL;
- char *devid = NULL;
-+ char *env = NULL;
- rdsk_node_t *slice;
- avl_index_t where;
-+ int timeout;
- int error;
-
- if (label_paths(rn->rn_hdl, rn->rn_config, &path, &devid))
- return;
-
-+ env = getenv("ZPOOL_IMPORT_UDEV_TIMEOUT_MS");
-+ if ((env == NULL) || sscanf(env, "%d", &timeout) != 1 ||
-+ timeout < 0) {
-+ timeout = DISK_LABEL_WAIT;
-+ }
-+
- /*
- * Allow devlinks to stabilize so all paths are available.
- */
-- zpool_label_disk_wait(rn->rn_name, DISK_LABEL_WAIT);
-+ zpool_label_disk_wait(rn->rn_name, timeout);
-
- if (path != NULL) {
- slice = zutil_alloc(hdl, sizeof (rdsk_node_t));
-diff --git a/man/man8/zpool.8 b/man/man8/zpool.8
-index 467d2411d40..df30b7ca05c 100644
---- a/man/man8/zpool.8
-+++ b/man/man8/zpool.8
-@@ -2813,6 +2813,12 @@ Similar to the
- option in
- .Nm zpool import .
- .El
-+.Bl -tag -width "ZPOOL_IMPORT_UDEV_TIMEOUT_MS"
-+.It Ev ZPOOL_IMPORT_UDEV_TIMEOUT_MS
-+The maximum time in milliseconds that
-+.Nm zpool import
-+will wait for an expected device to be available.
-+.El
- .Bl -tag -width "ZPOOL_VDEV_NAME_GUID"
- .It Ev ZPOOL_VDEV_NAME_GUID
- Cause
diff --git a/sys-fs/zfs/zfs-0.8.2-r2.ebuild b/sys-fs/zfs/zfs-0.8.2-r2.ebuild
deleted file mode 100644
index c744e615de44..000000000000
--- a/sys-fs/zfs/zfs-0.8.2-r2.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://zfsonlinux.org/"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-else
- SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64"
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="custom-cflags debug kernel-builtin libressl python +rootfs test-suite static-libs"
-
-DEPEND="
- ${PYTHON_DEPS}
- net-libs/libtirpc[static-libs?]
- sys-apps/util-linux[static-libs?]
- sys-libs/zlib[static-libs(+)?]
- virtual/awk
- virtual/libudev[static-libs(-)?]
- libressl? ( dev-libs/libressl:0=[static-libs?] )
- !libressl? ( dev-libs/openssl:0=[static-libs?] )
- python? (
- virtual/python-cffi[${PYTHON_USEDEP}]
- )
-"
-
-BDEPEND="virtual/awk
- virtual/pkgconfig
- python? (
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
-"
-
-RDEPEND="${DEPEND}
- !=sys-apps/grep-2.13*
- !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
- !sys-fs/zfs-fuse
- !prefix? ( virtual/udev )
- sys-fs/udev-init-scripts
- rootfs? (
- app-arch/cpio
- app-misc/pax-utils
- !<sys-boot/grub-2.00-r2:2
- !<sys-kernel/genkernel-3.5.1.1
- !<sys-kernel/genkernel-next-67
- !<sys-kernel/bliss-initramfs-7.1.0
- !<sys-kernel/dracut-044-r1
- )
- test-suite? (
- sys-apps/util-linux
- sys-devel/bc
- sys-block/parted
- sys-fs/lsscsi
- sys-fs/mdadm
- sys-process/procps
- virtual/modutils
- )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/bash-completion-sudo.patch"
- "${FILESDIR}/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch" # https://github.com/zfsonlinux/zfs/pull/9109
-)
-
-pkg_setup() {
- if use kernel_linux && use test-suite; 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
-}
-
-src_prepare() {
- default
-
- if [[ ${PV} == "9999" ]]; then
- eautoreconf
- else
- # 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/init.d/zfs.in || die
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- python_setup
-
- local myconf=(
- --bindir="${EPREFIX}/bin"
- --enable-shared
- --enable-systemd
- --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-python="${EPYTHON}"
- --with-systemdunitdir="$(systemd_get_systemunitdir)"
- --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
- $(use_enable debug)
- $(use_enable python pyzfs)
- $(use_enable static-libs static)
- )
-
- 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 uutil nvpair zpool zfs zfs_core
-
- use test-suite || rm -rf "${ED}/usr/share/zfs"
-
- if ! use static-libs; then
- find "${ED}/" -name '*.la' -delete || die
- fi
-
- 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
- python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
- if use rootfs; then
- if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
- elog "root on zfs requires initramfs to boot"
- elog "the following packages known to provide one and tested on regular basis:"
- elog " sys-kernel/dracut"
- elog " sys-kernel/genkernel"
- fi
-
- if has_version "<=sys-kernel/genkernel-3.5.3.3"; then
- einfo "genkernel version 3.5.3.3 and earlier does NOT support"
- einfo " unlocking pools with native zfs encryption enabled at boot"
- einfo " use dracut or >=genkernel-4 if you requre this functionality"
- fi
- fi
-
- if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
- einfo "Adding ${P} to the module database to ensure that the"
- einfo "kernel modules and userland utilities stay in sync."
- update_moduledb
- fi
-
- [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
- einfo "You should add zfs-import 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."
-}
-
-pkg_postrm() {
- if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
- remove_moduledb
- fi
-}
diff --git a/sys-fs/zfs/zfs-0.8.3-r1.ebuild b/sys-fs/zfs/zfs-0.8.3-r1.ebuild
index df59d685573c..4837bd8086cf 100644
--- a/sys-fs/zfs/zfs-0.8.3-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.8.3-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
else
SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64"
+ KEYWORDS="amd64 ~arm64 ~ppc64"
fi
LICENSE="BSD-2 CDDL MIT"
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index f40bd0bca2a7..cb8a4427800d 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -110,7 +110,7 @@ src_prepare() {
# prevent errors showing up on zfs-mount stop, #647688
# openrc will unmount all filesystems anyway.
- sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" etc/init.d/zfs.in || die
+ sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" etc/default/zfs.in || die
}
src_configure() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 22:45:25 +0000