From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2020 10:39:22 +0100 Subject: gentoo resync : 13.06.2020 --- sys-fs/zfs/Manifest | 12 +- .../0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch | 70 ------- sys-fs/zfs/files/0.8.3-fno-common.patch | 83 -------- sys-fs/zfs/files/0.8.3-zfs-functions.patch | 51 ----- sys-fs/zfs/files/zfs-init.sh.in | 29 --- sys-fs/zfs/files/zfs.service.in | 16 -- sys-fs/zfs/zfs-0.7.13-r1.ebuild | 218 -------------------- sys-fs/zfs/zfs-0.7.13-r2.ebuild | 220 -------------------- sys-fs/zfs/zfs-0.8.3-r1.ebuild | 224 --------------------- sys-fs/zfs/zfs-0.8.4-r1.ebuild | 4 +- 10 files changed, 3 insertions(+), 924 deletions(-) delete mode 100644 sys-fs/zfs/files/0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch delete mode 100644 sys-fs/zfs/files/0.8.3-fno-common.patch delete mode 100644 sys-fs/zfs/files/0.8.3-zfs-functions.patch delete mode 100644 sys-fs/zfs/files/zfs-init.sh.in delete mode 100644 sys-fs/zfs/files/zfs.service.in delete mode 100644 sys-fs/zfs/zfs-0.7.13-r1.ebuild delete mode 100644 sys-fs/zfs/zfs-0.7.13-r2.ebuild delete mode 100644 sys-fs/zfs/zfs-0.8.3-r1.ebuild (limited to 'sys-fs/zfs') diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index adfb32ca0c27..27ca4bd95f3c 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -1,17 +1,7 @@ -AUX 0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch 1945 BLAKE2B db5d094bcac52a3b53bae9df4b0444f656858dd83f21994cbefe4900554a2579c67b5058d149d226ca354bd45d9e24c12244186da3232064233b74ec590187dc SHA512 71a009336fdcac8e5813001fd6741f4310c3e792b20650ebad73ba0049730acb5188587dc8e706846e886bf9ac241d2163b9558150eb389c99d7910a730542d0 -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 0.8.4-initconfdir.patch 1004 BLAKE2B fd4186b5f378f562098040a8e13a12e6fd7f0f37f3b981a8d46e0e3bc943eb8dd5fa474e6c65cefd8c03fc3c45a119f6a141d42753ce4729e3a234e7f57dc4b8 SHA512 c18e9cd03d537a3ad632e1aeb354b56f5db9a8ef51c30b2e728ea527b7e9017219b1a230374238ecdd24082d9f2c62510aea68b234df84961ada5dce2ed617cc AUX bash-completion-r1 11310 BLAKE2B f6c105fef1737d4be0e76967fdec62aa52fa7665bfc1e9aa4c944dd6442d64d7d31b8af54f92f5db25542f968ecf83da46db8c2a8f978577526bf9f90d8bccf3 SHA512 03be521e2c646196766d5fd049f241cb97f290abf0409881ea6ba709934984deda402c8513009e62a5787e0648023b55c040e5f99baef27709e81c3bc9c8f56e AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319 -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.3.tar.gz 8779385 BLAKE2B 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958 SHA512 aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010 DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1 -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.3-r1.ebuild 5631 BLAKE2B bddee093199db937dfb3803c959fcad9d7a582bdd662f73c03653a9a1024f72dc117204cf13939e130cc4c0580db7b5266b03f4561e96c2caed2cf349bfa766c SHA512 ec01abfbe7ca3661dcfe6b9acb7a7d6cce59bd81f9a8d14175cf196ee523c6f2dea315d6b4f22c77d4322f663b9087b4e5dac9ba52105e69447dba4dffc2eebb -EBUILD zfs-0.8.4-r1.ebuild 5197 BLAKE2B a26eda5c79de67dfb2b7873de472c976e5e2983972aaee347a2b39ed85239bf42b7125108c0d0452cba2f02330d5f2c7ff729b2c512a9f437c5ce4d5a1fc558e SHA512 579dbe8d0cc66cbb63a2641a10779aeb00a47be24955037767608c303b5223e4ba5cabeba7b5b567d258affa99c4e52c14542f779d33e187759a6937a4a2564f +EBUILD zfs-0.8.4-r1.ebuild 5195 BLAKE2B 501f1ba692e13c7c9b73017626687ef129e0db61a6492b326327dcc07a2f9ebccb426359531e004bb17c4d99c12105e93fd84c5f83494a58e5351a16f2ab76ca SHA512 57e3acbbffab3e38e5d3522f868ad8d32985a3983a449c7c0552e71b92f0dbd46c18e91ebbf3002b96212b68308cbbbc0b90b742eda3d8733844160606cd38dc EBUILD zfs-9999.ebuild 5156 BLAKE2B 9dbb83c08b6bc0338303d6572a152f423a4de615c664c268991341f4ec4b7112cc5839c504de9f105404055415a9d5574271593673dfcf6838d1d9722865c668 SHA512 b99a1a80d4a5677d2e2624475f7694f1f2467643574fdaed8af0e4f929103ecba3cb6865c6fdae55c8b6c8e75027f0af88e8a142525448158ad518d50bb9d055 MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295 diff --git a/sys-fs/zfs/files/0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch b/sys-fs/zfs/files/0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch deleted file mode 100644 index 922e5951bdf0..000000000000 --- a/sys-fs/zfs/files/0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a0767672aac01f41516550e3808ff72da893102f Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev -Date: Tue, 26 Nov 2019 12:07:36 -0800 -Subject: [PATCH] backport udev timeout patch - -https://github.com/zfsonlinux/zfs/commit/803884217f9b9b5fb235d7c5e78a809d271f6387 ---- - lib/libzfs/libzfs_import.c | 11 ++++++++++- - man/man8/zpool.8 | 6 ++++++ - 2 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c -index 9dbf207..cd08806 100644 ---- a/lib/libzfs/libzfs_import.c -+++ b/lib/libzfs/libzfs_import.c -@@ -53,6 +53,7 @@ - #endif - #include - #include -+#include - #include - #include - #include -@@ -1594,17 +1595,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 = zfs_alloc(hdl, sizeof (rdsk_node_t)); -diff --git a/man/man8/zpool.8 b/man/man8/zpool.8 -index 46e531e..10a19b5 100644 ---- a/man/man8/zpool.8 -+++ b/man/man8/zpool.8 -@@ -2291,6 +2291,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 --- -2.24.0 - diff --git a/sys-fs/zfs/files/0.8.3-fno-common.patch b/sys-fs/zfs/files/0.8.3-fno-common.patch deleted file mode 100644 index 3b09d8bbc597..000000000000 --- a/sys-fs/zfs/files/0.8.3-fno-common.patch +++ /dev/null @@ -1,83 +0,0 @@ -From af09c050e95bebbaeca52156218f3f91e8c9951a Mon Sep 17 00:00:00 2001 -From: Romain Dolbeau -Date: Thu, 6 Feb 2020 18:25:29 +0100 -Subject: [PATCH] Fix static data to link with -fno-common - --fno-common is the new default in GCC 10, replacing -fcommon in -GCC <= 9, so static data must only be allocated once. - -Reviewed-by: Brian Behlendorf -Signed-off-by: Romain Dolbeau -Closes #9943 ---- - cmd/zfs/zfs_util.h | 2 +- - cmd/zpool/zpool_main.c | 2 ++ - cmd/zpool/zpool_util.h | 2 +- - lib/libshare/smb.c | 2 ++ - lib/libshare/smb.h | 2 +- - 5 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/cmd/zfs/zfs_util.h b/cmd/zfs/zfs_util.h -index 3ddff9e22d7..a56af59adb1 100644 ---- a/cmd/zfs/zfs_util.h -+++ b/cmd/zfs/zfs_util.h -@@ -33,7 +33,7 @@ extern "C" { - - void * safe_malloc(size_t size); - void nomem(void); --libzfs_handle_t *g_zfs; -+extern libzfs_handle_t *g_zfs; - - #ifdef __cplusplus - } -diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c -index ae5e8a370fc..ff4f44d4652 100644 ---- a/cmd/zpool/zpool_main.c -+++ b/cmd/zpool/zpool_main.c -@@ -76,6 +76,8 @@ - - #include "statcommon.h" - -+libzfs_handle_t *g_zfs; -+ - static int zpool_do_create(int, char **); - static int zpool_do_destroy(int, char **); - -diff --git a/cmd/zpool/zpool_util.h b/cmd/zpool/zpool_util.h -index ce760df723c..1f23f61aaa4 100644 ---- a/cmd/zpool/zpool_util.h -+++ b/cmd/zpool/zpool_util.h -@@ -79,7 +79,7 @@ void pool_list_free(zpool_list_t *); - int pool_list_count(zpool_list_t *); - void pool_list_remove(zpool_list_t *, zpool_handle_t *); - --libzfs_handle_t *g_zfs; -+extern libzfs_handle_t *g_zfs; - - - typedef struct vdev_cmd_data -diff --git a/lib/libshare/smb.c b/lib/libshare/smb.c -index a95607ee032..f567f7c49d7 100644 ---- a/lib/libshare/smb.c -+++ b/lib/libshare/smb.c -@@ -65,6 +65,8 @@ static boolean_t smb_available(void); - - static sa_fstype_t *smb_fstype; - -+smb_share_t *smb_shares; -+ - /* - * Retrieve the list of SMB shares. - */ -diff --git a/lib/libshare/smb.h b/lib/libshare/smb.h -index 7a0c0fd162d..8ea44677f9a 100644 ---- a/lib/libshare/smb.h -+++ b/lib/libshare/smb.h -@@ -44,6 +44,6 @@ typedef struct smb_share_s { - struct smb_share_s *next; - } smb_share_t; - --smb_share_t *smb_shares; -+extern smb_share_t *smb_shares; - - void libshare_smb_init(void); diff --git a/sys-fs/zfs/files/0.8.3-zfs-functions.patch b/sys-fs/zfs/files/0.8.3-zfs-functions.patch deleted file mode 100644 index 9cce3e1c1a7d..000000000000 --- a/sys-fs/zfs/files/0.8.3-zfs-functions.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 00478e1b5141f8b6ceaf14c173382d1aa11878b9 Mon Sep 17 00:00:00 2001 -From: Tony Hutter -Date: Thu, 6 Feb 2020 09:28:20 -0800 -Subject: [PATCH] Fix zfs-functions packaging bug - -This fixes a bug where the generated zfs-functions was being included along -with original zfs-functions.in in the make dist tarball. This caused an -unfortunate series of events during build/packaging that resulted in the -RPM-installed /etc/zfs/zfs-functions listing the paths as: - -ZFS="/usr/local/sbin/zfs" -ZED="/usr/local/sbin/zed" -ZPOOL="/usr/local/sbin/zpool" - -When they should have been: - -ZFS="/sbin/zfs" -ZED="/sbin/zed" -ZPOOL="/sbin/zpool" - -This affects init.d (non-systemd) distros like CentOS 6. - -Fixes: #9443 - -Signed-off-by: Tony Hutter ---- - contrib/initramfs/Makefile.am | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am -index 52bdeb2afe5..4e52e8ea5e9 100644 ---- a/contrib/initramfs/Makefile.am -+++ b/contrib/initramfs/Makefile.am -@@ -6,15 +6,12 @@ initrd_SCRIPTS = \ - SUBDIRS = hooks scripts - - EXTRA_DIST = \ -- $(top_srcdir)/etc/init.d/zfs \ -- $(top_srcdir)/etc/init.d/zfs-functions \ -+ $(top_srcdir)/etc/init.d/zfs.in \ -+ $(top_srcdir)/etc/init.d/zfs-functions.in \ - $(top_srcdir)/contrib/initramfs/conf.d/zfs \ - $(top_srcdir)/contrib/initramfs/conf-hooks.d/zfs \ - $(top_srcdir)/contrib/initramfs/README.initramfs.markdown - --$(top_srcdir)/etc/init.d/zfs $(top_srcdir)/etc/init.d/zfs-functions: -- $(MAKE) -C $(top_srcdir)/etc/init.d zfs zfs-functions -- - install-initrdSCRIPTS: $(EXTRA_DIST) - for d in conf.d conf-hooks.d scripts/local-top; do \ - $(MKDIR_P) $(DESTDIR)$(initrddir)/$$d; \ diff --git a/sys-fs/zfs/files/zfs-init.sh.in b/sys-fs/zfs/files/zfs-init.sh.in deleted file mode 100644 index ed84585cd5f6..000000000000 --- a/sys-fs/zfs/files/zfs-init.sh.in +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -ZFS="@sbindir@/zfs" -ZPOOL="@sbindir@/zpool" -ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache" - -if [ -f "${ZPOOL_CACHE}" ]; then - "${ZPOOL}" import -c "${ZPOOL_CACHE}" -aN 2>/dev/null - if [ "${?}" != "0" ]; then - echo "Failed to import not-yet imported pools." >&2 - fi -fi - -echo "Mounting ZFS filesystems" -"${ZFS}" mount -a -if [ "${?}" != "0" ]; then - echo "Failed to mount ZFS filesystems." >&2 - exit 1 -fi - -echo "Exporting ZFS filesystems" -"${ZFS}" share -a -if [ "${?}" != "0" ]; then - echo "Failed to export ZFS filesystems." >&2 - exit 1 -fi - -exit 0 - diff --git a/sys-fs/zfs/files/zfs.service.in b/sys-fs/zfs/files/zfs.service.in deleted file mode 100644 index ae2eff170a72..000000000000 --- a/sys-fs/zfs/files/zfs.service.in +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=ZFS filesystems setup -Before=network.target -After=systemd-udev-settle.target local-fs.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStartPre=-/sbin/modprobe zfs -ExecStartPre=/usr/bin/test -c /dev/zfs -ExecStart=/usr/libexec/zfs-init.sh -ExecStop=@sbindir@/zfs umount -a - -[Install] -WantedBy=multi-user.target - diff --git a/sys-fs/zfs/zfs-0.7.13-r1.ebuild b/sys-fs/zfs/zfs-0.7.13-r1.ebuild deleted file mode 100644 index e7978fd5d927..000000000000 --- a/sys-fs/zfs/zfs-0.7.13-r1.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python3_6 ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS="amd64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-single-r1 systemd toolchain-funcs udev usr-ldscript - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="https://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs systemd test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - net-libs/libtirpc - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in || die - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --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-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" - $(use_enable debug) - $(use_enable systemd) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" - - # enforce selected python implementation - python_fix_shebang "${ED}/bin" -} - -pkg_postinst() { - 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 - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -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." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - - systemd_reenable zfs-zed.service - systemd_reenable zfs-import-cache.service - systemd_reenable zfs-import-scan.service - systemd_reenable zfs-mount.service - systemd_reenable zfs-share.service - systemd_reenable zfs-import.target - systemd_reenable zfs.target - systemd_reenable zfs.service -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.7.13-r2.ebuild b/sys-fs/zfs/zfs-0.7.13-r2.ebuild deleted file mode 100644 index 2362e5ccec08..000000000000 --- a/sys-fs/zfs/zfs-0.7.13-r2.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python3_6 ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS="" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-single-r1 systemd toolchain-funcs udev usr-ldscript - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="https://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs systemd test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - net-libs/libtirpc - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in || die - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --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-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" - $(use_enable debug) - $(use_enable systemd) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" - - # enforce selected python implementation - python_fix_shebang "${ED}/bin" -} - -pkg_postinst() { - 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 - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -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." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - - systemd_reenable zfs-zed.service - systemd_reenable zfs-import-cache.service - systemd_reenable zfs-import-scan.service - systemd_reenable zfs-mount.service - systemd_reenable zfs-share.service - systemd_reenable zfs-import.target - systemd_reenable zfs.target - systemd_reenable zfs.service -} - -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 deleted file mode 100644 index 4837bd8086cf..000000000000 --- a/sys-fs/zfs/zfs-0.8.3-r1.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 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 linux-mod - 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} - !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} ) - !prefix? ( virtual/udev ) - sys-fs/udev-init-scripts - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !" - 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 - - # needed to get files regenerated - # https://github.com/zfsonlinux/zfs/issues/9443 - rm -v etc/init.d/zfs{,-functions} || 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.4-r1.ebuild b/sys-fs/zfs/zfs-0.8.4-r1.ebuild index 5f7c23109c09..0f8aa28b0338 100644 --- a/sys-fs/zfs/zfs-0.8.4-r1.ebuild +++ b/sys-fs/zfs/zfs-0.8.4-r1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/openzfs/zfs.git" else SRC_URI="https://github.com/openzfs/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64" + KEYWORDS="amd64 ~arm64 ~ppc64" fi LICENSE="BSD-2 CDDL MIT" @@ -68,7 +68,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" -PATCHES=( +PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" "${FILESDIR}/${PV}-initconfdir.patch" ) -- cgit v1.2.3