diff options
| -rw-r--r-- | sys-fs/zfs-utils/Manifest | 2 | ||||
| -rw-r--r-- | sys-fs/zfs-utils/files/0.8.3-fno-common.patch | 83 | ||||
| -rw-r--r-- | sys-fs/zfs-utils/files/0.8.3-zfs-functions.patch | 51 | ||||
| -rw-r--r-- | sys-fs/zfs-utils/zfs-utils-0.8.4.ebuild (renamed from sys-fs/zfs-utils/zfs-utils-0.8.3-r1.ebuild) | 6 | ||||
| -rw-r--r-- | sys-fs/zfs/zfs-0.8.4.ebuild (renamed from sys-fs/zfs/zfs-0.8.3.ebuild) | 0 | ||||
| -rw-r--r-- | sys-kernel/zfs-dkms/Manifest | 2 | ||||
| -rw-r--r-- | sys-kernel/zfs-dkms/files/dkms.conf | 2 | ||||
| -rw-r--r-- | sys-kernel/zfs-dkms/files/kernel-5.5.patch | 35 | ||||
| -rw-r--r-- | sys-kernel/zfs-dkms/zfs-dkms-0.8.4.ebuild (renamed from sys-kernel/zfs-dkms/zfs-dkms-0.8.3-r1.ebuild) | 2 |
9 files changed, 4 insertions, 179 deletions
diff --git a/sys-fs/zfs-utils/Manifest b/sys-fs/zfs-utils/Manifest index 9e5ed996..f9de9cf7 100644 --- a/sys-fs/zfs-utils/Manifest +++ b/sys-fs/zfs-utils/Manifest @@ -1 +1 @@ -DIST zfs-0.8.3.tar.gz 8779385 BLAKE2B 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958 SHA512 aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010 +DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1 diff --git a/sys-fs/zfs-utils/files/0.8.3-fno-common.patch b/sys-fs/zfs-utils/files/0.8.3-fno-common.patch deleted file mode 100644 index 3b09d8bb..00000000 --- a/sys-fs/zfs-utils/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 <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-utils/files/0.8.3-zfs-functions.patch b/sys-fs/zfs-utils/files/0.8.3-zfs-functions.patch deleted file mode 100644 index 9cce3e1c..00000000 --- a/sys-fs/zfs-utils/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 <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-utils/zfs-utils-0.8.3-r1.ebuild b/sys-fs/zfs-utils/zfs-utils-0.8.4.ebuild index 49726dce..09d1e43e 100644 --- a/sys-fs/zfs-utils/zfs-utils-0.8.3-r1.ebuild +++ b/sys-fs/zfs-utils/zfs-utils-0.8.4.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python{2_7,3_{6,7,8}} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit bash-completion-r1 flag-o-matic distutils-r1 toolchain-funcs udev @@ -40,8 +40,6 @@ BDEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !sys-fs/zfs-fuse !prefix? ( virtual/udev ) sys-fs/udev-init-scripts test-suite? ( @@ -63,8 +61,6 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" - "${FILESDIR}/${PV}-fno-common.patch" - "${FILESDIR}/${PV}-zfs-functions.patch" ) src_prepare() { diff --git a/sys-fs/zfs/zfs-0.8.3.ebuild b/sys-fs/zfs/zfs-0.8.4.ebuild index c91d103c..c91d103c 100644 --- a/sys-fs/zfs/zfs-0.8.3.ebuild +++ b/sys-fs/zfs/zfs-0.8.4.ebuild diff --git a/sys-kernel/zfs-dkms/Manifest b/sys-kernel/zfs-dkms/Manifest index 9e5ed996..f9de9cf7 100644 --- a/sys-kernel/zfs-dkms/Manifest +++ b/sys-kernel/zfs-dkms/Manifest @@ -1 +1 @@ -DIST zfs-0.8.3.tar.gz 8779385 BLAKE2B 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958 SHA512 aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010 +DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1 diff --git a/sys-kernel/zfs-dkms/files/dkms.conf b/sys-kernel/zfs-dkms/files/dkms.conf index 31227a82..b40695b3 100644 --- a/sys-kernel/zfs-dkms/files/dkms.conf +++ b/sys-kernel/zfs-dkms/files/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="zfs-dkms" -PACKAGE_VERSION="0.8.3" +PACKAGE_VERSION="0.8.4" PACKAGE_CONFIG="/etc/sysconfig/zfs" PRE_BUILD="configure --prefix=/usr diff --git a/sys-kernel/zfs-dkms/files/kernel-5.5.patch b/sys-kernel/zfs-dkms/files/kernel-5.5.patch deleted file mode 100644 index 8d2a950f..00000000 --- a/sys-kernel/zfs-dkms/files/kernel-5.5.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c -index 4ffc41cca34..cbe9e18316e 100644 ---- a/module/zfs/vdev_disk.c -+++ b/module/zfs/vdev_disk.c -@@ -473,6 +473,30 @@ - - #ifdef HAVE_BIO_SET_DEV - #if defined(CONFIG_BLK_CGROUP) && defined(HAVE_BIO_SET_DEV_GPL_ONLY) -+static inline bool vdev_percpu_ref_tryget(struct percpu_ref *ref) -+{ -+ unsigned long __percpu *percpu_count; -+ bool ret; -+ -+ rcu_read_lock_sched(); -+ -+ if (__ref_is_percpu(ref, &percpu_count)) { -+ this_cpu_inc(*percpu_count); -+ ret = true; -+ } else { -+ ret = atomic_long_inc_not_zero(&ref->count); -+ } -+ -+ rcu_read_unlock_sched(); -+ -+ return ret; -+} -+#define percpu_ref_tryget vdev_percpu_ref_tryget -+static inline bool vdev_blkg_tryget(struct blkcg_gq *blkg) -+{ -+ return blkg && vdev_percpu_ref_tryget(&blkg->refcnt); -+} -+#define blkg_tryget vdev_blkg_tryget - /* - * The Linux 5.0 kernel updated the bio_set_dev() macro so it calls the - * GPL-only bio_associate_blkg() symbol thus inadvertently converting diff --git a/sys-kernel/zfs-dkms/zfs-dkms-0.8.3-r1.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-0.8.4.ebuild index 7cd225f8..7e448719 100644 --- a/sys-kernel/zfs-dkms/zfs-dkms-0.8.3-r1.ebuild +++ b/sys-kernel/zfs-dkms/zfs-dkms-0.8.4.ebuild @@ -20,8 +20,6 @@ IUSE="" DEPEND="sys-kernel/dkms" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}"/kernel-5.5.patch ) - S="${WORKDIR}/${MY_P}" src_configure() { |