summaryrefslogtreecommitdiff
path: root/sys-fs/zfs
diff options
context:
space:
mode:
Diffstat (limited to 'sys-fs/zfs')
-rw-r--r--sys-fs/zfs/Manifest12
-rw-r--r--sys-fs/zfs/files/0.8.3-fno-common.patch83
-rw-r--r--sys-fs/zfs/files/0.8.3-zfs-functions.patch51
-rw-r--r--sys-fs/zfs/zfs-0.7.13-r1.ebuild2
-rw-r--r--sys-fs/zfs/zfs-0.7.13-r2.ebuild2
-rw-r--r--sys-fs/zfs/zfs-0.8.2-r2.ebuild2
-rw-r--r--sys-fs/zfs/zfs-0.8.3-r1.ebuild (renamed from sys-fs/zfs/zfs-0.8.3.ebuild)19
-rw-r--r--sys-fs/zfs/zfs-9999.ebuild6
8 files changed, 159 insertions, 18 deletions
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 9170d048f8ad..e92d1d9d29ce 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,5 +1,7 @@
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
AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
AUX zfs-init.sh.in 582 BLAKE2B 27e5c1aff398c42178b3d7c005e91a1f8f3afa303a22e49c93a2cd7134016a8d07d68483126d60e46ed4ff5cbaeb87f050e9c9fb5bff5352d5dc32b4d94db7b4 SHA512 bed7eae5f902f13489241782d3d560b53a5a3258de492763b7b25783ca9417975afb9000f68f58be5c2057e1db50a569374ed0ff572140aa65e401e20e646461
@@ -7,9 +9,9 @@ AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b
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 6282 BLAKE2B 9fae8590e1d6f723bea164f90b6b8a5ce1a96d8dc2d10b514f0d50a2c24c70ede7fd3dc1888efc4c3746e72d4970d5c2ed501072a21f08a46a188cd288a9743b SHA512 b50d3835a65153143ea4b9236e8084a495565397d570b64f4b622e4b501432a55b8b604dc7f276502e97e0b500302b74ae53fc8ba12c087f9e43ba84a4891ceb
-EBUILD zfs-0.7.13-r2.ebuild 6346 BLAKE2B f317a17063a320a92c13b1546507dc37b75c48ae5c19871d8ed0113590dd84687bd5b331f168a5d68e8d0aef0c135519e5abd9a8c91c858ab6bae53c5236496b SHA512 4c24e183caf67d52b14047add79947d0331eb1590a0754486ca5a03c2ab9f7cade308973164924855e8293d7c0d905bae1d4295f7cb5efbafe9dea8a4d1b9125
-EBUILD zfs-0.8.2-r2.ebuild 5701 BLAKE2B b7c845e5342023bbdc210f306c64f6cef3383bfe6c9f445a77f05a2117dfe22e6a792d2d55b61108638926225791bc6c45335410d65adf67e00cc7b6faea430e SHA512 f5e09062ed0496bf51257f1b89f7e21e0f727d222a25ef22745727d6d7ca56d136222fd149cf8f6a6a8d87054427d30aaa451b7ae0360b29b99da095bb1e8135
-EBUILD zfs-0.8.3.ebuild 5567 BLAKE2B 8b0768a1d6a36f16598aee0039417e08818dfd115f93682c9e255ba3d49c5dd5fe93e54c953bf9978594c69b1b817c8739647a708e90073885accdc29458f97d SHA512 16ecd59b2911eb8dde31032e950c150c68bc9c3a904daa8be32fb594e85185e858790c71b3589fdaf5cc8cc801e10bbfe5b6192a3a99f848277086367717c734
-EBUILD zfs-9999.ebuild 5430 BLAKE2B 681134f5d63ec4b0d88a2029ef600d2ed76fa843924db5abf949a7ee33d75711564988d4559badbb367023b112f9d2495cb943662b770a3ca6996ed01b0a9ace SHA512 a55a3d4cae07ec07d4f4a5b196c06653bc774389c3e772b8a262528237081bf38eb624c0c3d7080d8f3bb9b42dcc0c80e3b351af1ed967c94ef294407ab35105
+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
MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/files/0.8.3-fno-common.patch b/sys-fs/zfs/files/0.8.3-fno-common.patch
new file mode 100644
index 000000000000..3b09d8bbc597
--- /dev/null
+++ b/sys-fs/zfs/files/0.8.3-fno-common.patch
@@ -0,0 +1,83 @@
+From af09c050e95bebbaeca52156218f3f91e8c9951a Mon Sep 17 00:00:00 2001
+From: Romain Dolbeau <romain.dolbeau@european-processor-initiative.eu>
+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 <behlendorf1@llnl.gov>
+Signed-off-by: Romain Dolbeau <romain.dolbeau@european-processor-initiative.eu>
+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
new file mode 100644
index 000000000000..9cce3e1c1a7d
--- /dev/null
+++ b/sys-fs/zfs/files/0.8.3-zfs-functions.patch
@@ -0,0 +1,51 @@
+From 00478e1b5141f8b6ceaf14c173382d1aa11878b9 Mon Sep 17 00:00:00 2001
+From: Tony Hutter <hutter2@llnl.gov>
+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 <hutter2@llnl.gov>
+---
+ 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/zfs-0.7.13-r1.ebuild b/sys-fs/zfs/zfs-0.7.13-r1.ebuild
index 7bfb7393b91a..e7978fd5d927 100644
--- a/sys-fs/zfs/zfs-0.7.13-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.7.13-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
if [ ${PV} == "9999" ] ; then
inherit git-r3 linux-mod
diff --git a/sys-fs/zfs/zfs-0.7.13-r2.ebuild b/sys-fs/zfs/zfs-0.7.13-r2.ebuild
index 2b547fcde15c..2362e5ccec08 100644
--- a/sys-fs/zfs/zfs-0.7.13-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.7.13-r2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
if [ ${PV} == "9999" ] ; then
inherit git-r3 linux-mod
diff --git a/sys-fs/zfs/zfs-0.8.2-r2.ebuild b/sys-fs/zfs/zfs-0.8.2-r2.ebuild
index 341a978b2793..c744e615de44 100644
--- a/sys-fs/zfs/zfs-0.8.2-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.8.2-r2.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev usr-ldscript
diff --git a/sys-fs/zfs/zfs-0.8.3.ebuild b/sys-fs/zfs/zfs-0.8.3-r1.ebuild
index 9ac492e30ce3..df59d685573c 100644
--- a/sys-fs/zfs/zfs-0.8.3.ebuild
+++ b/sys-fs/zfs/zfs-0.8.3-r1.ebuild
@@ -4,15 +4,15 @@
EAPI=7
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev usr-ldscript
+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
+ 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"
@@ -68,7 +68,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="test"
-PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
+PATCHES=(
+ "${FILESDIR}/bash-completion-sudo.patch"
+ "${FILESDIR}/${PV}-fno-common.patch"
+ "${FILESDIR}/${PV}-zfs-functions.patch"
+)
pkg_setup() {
if use kernel_linux && use test-suite; then
@@ -111,6 +115,10 @@ 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
+
+ # needed to get files regenerated
+ # https://github.com/zfsonlinux/zfs/issues/9443
+ rm -v etc/init.d/zfs{,-functions} || die
}
src_configure() {
@@ -138,9 +146,6 @@ src_configure() {
)
econf "${myconf[@]}"
-
- # temp hack for https://github.com/zfsonlinux/zfs/issues/9443
- sed -i "s@/usr/local/@"${EPREFIX}/"@g" etc/init.d/zfs-functions || die
}
src_compile() {
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 1c02c0298585..f40bd0bca2a7 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -4,15 +4,15 @@
EAPI=7
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev usr-ldscript
+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
+ 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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 22:01:31 +0000