1 |
commit: 20207419457c676f156e212bf03cf27982eea494 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 26 23:56:58 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 26 23:57:11 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20207419 |
7 |
|
8 |
sys-fs/zfs: revbump 0.8.4, fix not loading /etc/conf.d/zfs |
9 |
|
10 |
Upstream issue: https://github.com/openzfs/zfs/issues/10375 |
11 |
Upstream issue: https://github.com/openzfs/zfs/issues/10341 |
12 |
|
13 |
Bug: https://bugs.gentoo.org/647688 |
14 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
15 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
16 |
|
17 |
sys-fs/zfs/files/0.8.4-initconfdir.patch | 35 ++++++++++++++++++++++ |
18 |
.../zfs/{zfs-0.8.4.ebuild => zfs-0.8.4-r1.ebuild} | 5 +++- |
19 |
2 files changed, 39 insertions(+), 1 deletion(-) |
20 |
|
21 |
diff --git a/sys-fs/zfs/files/0.8.4-initconfdir.patch b/sys-fs/zfs/files/0.8.4-initconfdir.patch |
22 |
new file mode 100644 |
23 |
index 00000000000..aac40896f39 |
24 |
--- /dev/null |
25 |
+++ b/sys-fs/zfs/files/0.8.4-initconfdir.patch |
26 |
@@ -0,0 +1,35 @@ |
27 |
+From 5dbe98184278878746a5f548fead1d2ef1e98dbe Mon Sep 17 00:00:00 2001 |
28 |
+From: Georgy Yakovlev <gyakovlev@g.o> |
29 |
+Date: Tue, 26 May 2020 16:44:54 -0700 |
30 |
+Subject: [PATCH] 0.8.4 initconfdir |
31 |
+ |
32 |
+fix for https://github.com/openzfs/zfs/issues/10375 |
33 |
+ |
34 |
+--- |
35 |
+ etc/zfs/Makefile.am | 1 + |
36 |
+ etc/zfs/Makefile.in | 9 +++++---- |
37 |
+ 2 files changed, 6 insertions(+), 4 deletions(-) |
38 |
+ |
39 |
+diff --git a/etc/zfs/Makefile.am b/openzfs/etc/zfs/Makefile.am |
40 |
+index 81567a4..5370f41 100644 |
41 |
+--- a/etc/zfs/Makefile.am |
42 |
++++ b/etc/zfs/Makefile.am |
43 |
+@@ -1,4 +1,5 @@ |
44 |
+ pkgsysconfdir = $(sysconfdir)/zfs |
45 |
++initconfdir = $(DEFAULT_INITCONF_DIR) |
46 |
+ |
47 |
+ pkgsysconf_DATA = \ |
48 |
+ vdev_id.conf.alias.example \ |
49 |
+diff --git a/etc/zfs/Makefile.in b/etc/zfs/Makefile.in |
50 |
+index fb02811..795d3b1 100644 |
51 |
+@@ -571,6 +571,7 @@ udevdir = @udevdir@ |
52 |
+ udevruledir = @udevruledir@ |
53 |
+ zfsexecdir = @zfsexecdir@ |
54 |
+ pkgsysconfdir = $(sysconfdir)/zfs |
55 |
++initconfdir = $(DEFAULT_INITCONF_DIR) |
56 |
+ pkgsysconf_DATA = \ |
57 |
+ vdev_id.conf.alias.example \ |
58 |
+ vdev_id.conf.sas_direct.example \ |
59 |
+-- |
60 |
+2.26.2 |
61 |
+ |
62 |
|
63 |
diff --git a/sys-fs/zfs/zfs-0.8.4.ebuild b/sys-fs/zfs/zfs-0.8.4-r1.ebuild |
64 |
similarity index 98% |
65 |
rename from sys-fs/zfs/zfs-0.8.4.ebuild |
66 |
rename to sys-fs/zfs/zfs-0.8.4-r1.ebuild |
67 |
index c7cc180b9ea..5f7c23109c0 100644 |
68 |
--- a/sys-fs/zfs/zfs-0.8.4.ebuild |
69 |
+++ b/sys-fs/zfs/zfs-0.8.4-r1.ebuild |
70 |
@@ -68,7 +68,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
71 |
|
72 |
RESTRICT="test" |
73 |
|
74 |
-PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" ) |
75 |
+PATCHES=( |
76 |
+ "${FILESDIR}/bash-completion-sudo.patch" |
77 |
+ "${FILESDIR}/${PV}-initconfdir.patch" |
78 |
+) |
79 |
|
80 |
pkg_setup() { |
81 |
if use kernel_linux && use test-suite; then |