commit: 20207419457c676f156e212bf03cf27982eea494 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Tue May 26 23:56:58 2020 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Tue May 26 23:57:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20207419
sys-fs/zfs: revbump 0.8.4, fix not loading /etc/conf.d/zfs Upstream issue: https://github.com/openzfs/zfs/issues/10375 Upstream issue: https://github.com/openzfs/zfs/issues/10341 Bug: https://bugs.gentoo.org/647688 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> sys-fs/zfs/files/0.8.4-initconfdir.patch | 35 ++++++++++++++++++++++ .../zfs/{zfs-0.8.4.ebuild => zfs-0.8.4-r1.ebuild} | 5 +++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/sys-fs/zfs/files/0.8.4-initconfdir.patch b/sys-fs/zfs/files/0.8.4-initconfdir.patch new file mode 100644 index 00000000000..aac40896f39 --- /dev/null +++ b/sys-fs/zfs/files/0.8.4-initconfdir.patch @@ -0,0 +1,35 @@ +From 5dbe98184278878746a5f548fead1d2ef1e98dbe Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <[email protected]> +Date: Tue, 26 May 2020 16:44:54 -0700 +Subject: [PATCH] 0.8.4 initconfdir + +fix for https://github.com/openzfs/zfs/issues/10375 + +--- + etc/zfs/Makefile.am | 1 + + etc/zfs/Makefile.in | 9 +++++---- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/etc/zfs/Makefile.am b/openzfs/etc/zfs/Makefile.am +index 81567a4..5370f41 100644 +--- a/etc/zfs/Makefile.am ++++ b/etc/zfs/Makefile.am +@@ -1,4 +1,5 @@ + pkgsysconfdir = $(sysconfdir)/zfs ++initconfdir = $(DEFAULT_INITCONF_DIR) + + pkgsysconf_DATA = \ + vdev_id.conf.alias.example \ +diff --git a/etc/zfs/Makefile.in b/etc/zfs/Makefile.in +index fb02811..795d3b1 100644 +@@ -571,6 +571,7 @@ udevdir = @udevdir@ + udevruledir = @udevruledir@ + zfsexecdir = @zfsexecdir@ + pkgsysconfdir = $(sysconfdir)/zfs ++initconfdir = $(DEFAULT_INITCONF_DIR) + pkgsysconf_DATA = \ + vdev_id.conf.alias.example \ + vdev_id.conf.sas_direct.example \ +-- +2.26.2 + diff --git a/sys-fs/zfs/zfs-0.8.4.ebuild b/sys-fs/zfs/zfs-0.8.4-r1.ebuild similarity index 98% rename from sys-fs/zfs/zfs-0.8.4.ebuild rename to sys-fs/zfs/zfs-0.8.4-r1.ebuild index c7cc180b9ea..5f7c23109c0 100644 --- a/sys-fs/zfs/zfs-0.8.4.ebuild +++ b/sys-fs/zfs/zfs-0.8.4-r1.ebuild @@ -68,7 +68,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" -PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" ) +PATCHES=( + "${FILESDIR}/bash-completion-sudo.patch" + "${FILESDIR}/${PV}-initconfdir.patch" +) pkg_setup() { if use kernel_linux && use test-suite; then
