1 |
commit: e68166f39e0c03b05b98cafc019b92b3e1a04807 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 31 01:33:43 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 31 01:37:11 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e68166f3 |
7 |
|
8 |
sys-cluster/glusterfs: consistently call tmpfiles_process in pkg_postinst |
9 |
|
10 |
We weren't always calling tmpfiles_process in pkg_postinst, |
11 |
nor we were always using the correct filename. |
12 |
|
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild | 12 +++++++----- |
16 |
sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild | 12 +++++++----- |
17 |
sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild | 12 +++++++----- |
18 |
sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild | 5 +++-- |
19 |
sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild | 12 +++++++----- |
20 |
sys-cluster/glusterfs/glusterfs-9.2-r1.ebuild | 4 ++-- |
21 |
6 files changed, 33 insertions(+), 24 deletions(-) |
22 |
|
23 |
diff --git a/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild b/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild |
24 |
index c06064e3dd8..8fe9cb9d3d7 100644 |
25 |
--- a/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild |
26 |
+++ b/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild |
27 |
@@ -104,7 +104,7 @@ src_configure() { |
28 |
$(use_enable xml xml-output) \ |
29 |
$(use libtirpc || echo --without-libtirpc) \ |
30 |
$(use ipv6 && echo --with-ipv6-default) \ |
31 |
- --with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \ |
32 |
+ --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ |
33 |
--localstatedir="${EPREFIX}"/var |
34 |
} |
35 |
|
36 |
@@ -113,6 +113,10 @@ src_compile() { |
37 |
use emacs && elisp-compile extras/glusterfs-mode.el |
38 |
} |
39 |
|
40 |
+src_test() { |
41 |
+ ./run-tests.sh || die |
42 |
+} |
43 |
+ |
44 |
src_install() { |
45 |
default |
46 |
|
47 |
@@ -171,11 +175,9 @@ src_install() { |
48 |
python_optimize "${ED}" |
49 |
} |
50 |
|
51 |
-src_test() { |
52 |
- ./run-tests.sh || die |
53 |
-} |
54 |
- |
55 |
pkg_postinst() { |
56 |
+ tmpfiles_process gluster.conf |
57 |
+ |
58 |
elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" |
59 |
elog "volumes dynamically. To do so, simply use the gluster CLI after running:" |
60 |
elog " /etc/init.d/glusterd start" |
61 |
|
62 |
diff --git a/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild |
63 |
index c6fc8ce35bc..79808b9e3ff 100644 |
64 |
--- a/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild |
65 |
+++ b/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild |
66 |
@@ -98,7 +98,7 @@ src_configure() { |
67 |
$(use_enable xml xml-output) \ |
68 |
$(use libtirpc || echo --without-libtirpc) \ |
69 |
$(use ipv6 && echo --with-ipv6-default) \ |
70 |
- --with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \ |
71 |
+ --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ |
72 |
--localstatedir="${EPREFIX}"/var |
73 |
} |
74 |
|
75 |
@@ -107,6 +107,10 @@ src_compile() { |
76 |
use emacs && elisp-compile extras/glusterfs-mode.el |
77 |
} |
78 |
|
79 |
+src_test() { |
80 |
+ ./run-tests.sh || die |
81 |
+} |
82 |
+ |
83 |
src_install() { |
84 |
default |
85 |
|
86 |
@@ -158,11 +162,9 @@ src_install() { |
87 |
python_optimize "${ED}" |
88 |
} |
89 |
|
90 |
-src_test() { |
91 |
- ./run-tests.sh || die |
92 |
-} |
93 |
- |
94 |
pkg_postinst() { |
95 |
+ tmpfiles_process gluster.conf |
96 |
+ |
97 |
elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" |
98 |
elog "volumes dynamically. To do so, simply use the gluster CLI after running:" |
99 |
elog " /etc/init.d/glusterd start" |
100 |
|
101 |
diff --git a/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild |
102 |
index c6fc8ce35bc..79808b9e3ff 100644 |
103 |
--- a/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild |
104 |
+++ b/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild |
105 |
@@ -98,7 +98,7 @@ src_configure() { |
106 |
$(use_enable xml xml-output) \ |
107 |
$(use libtirpc || echo --without-libtirpc) \ |
108 |
$(use ipv6 && echo --with-ipv6-default) \ |
109 |
- --with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \ |
110 |
+ --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ |
111 |
--localstatedir="${EPREFIX}"/var |
112 |
} |
113 |
|
114 |
@@ -107,6 +107,10 @@ src_compile() { |
115 |
use emacs && elisp-compile extras/glusterfs-mode.el |
116 |
} |
117 |
|
118 |
+src_test() { |
119 |
+ ./run-tests.sh || die |
120 |
+} |
121 |
+ |
122 |
src_install() { |
123 |
default |
124 |
|
125 |
@@ -158,11 +162,9 @@ src_install() { |
126 |
python_optimize "${ED}" |
127 |
} |
128 |
|
129 |
-src_test() { |
130 |
- ./run-tests.sh || die |
131 |
-} |
132 |
- |
133 |
pkg_postinst() { |
134 |
+ tmpfiles_process gluster.conf |
135 |
+ |
136 |
elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" |
137 |
elog "volumes dynamically. To do so, simply use the gluster CLI after running:" |
138 |
elog " /etc/init.d/glusterd start" |
139 |
|
140 |
diff --git a/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild |
141 |
index 147d9640734..18671f3fc19 100644 |
142 |
--- a/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild |
143 |
+++ b/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild |
144 |
@@ -163,6 +163,8 @@ src_install() { |
145 |
} |
146 |
|
147 |
pkg_postinst() { |
148 |
+ tmpfiles_process gluster.conf |
149 |
+ |
150 |
elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" |
151 |
elog "volumes dynamically. To do so, simply use the gluster CLI after running:" |
152 |
elog " /etc/init.d/glusterd start" |
153 |
@@ -184,9 +186,8 @@ pkg_postinst() { |
154 |
elog "If you are upgrading from a previous version of ${PN}, please read:" |
155 |
elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/" |
156 |
|
157 |
- tmpfiles_process glusterfs.conf |
158 |
- |
159 |
use emacs && elisp-site-regen |
160 |
+ |
161 |
} |
162 |
|
163 |
pkg_postrm() { |
164 |
|
165 |
diff --git a/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild b/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild |
166 |
index 8f52fcdca64..4b3b440fa71 100644 |
167 |
--- a/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild |
168 |
+++ b/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild |
169 |
@@ -99,7 +99,7 @@ src_configure() { |
170 |
$(use_enable xml xml-output) \ |
171 |
$(use libtirpc || echo --without-libtirpc) \ |
172 |
$(use ipv6 && echo --with-ipv6-default) \ |
173 |
- --with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \ |
174 |
+ --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ |
175 |
--localstatedir="${EPREFIX}"/var |
176 |
} |
177 |
|
178 |
@@ -108,6 +108,10 @@ src_compile() { |
179 |
use emacs && elisp-compile extras/glusterfs-mode.el |
180 |
} |
181 |
|
182 |
+src_test() { |
183 |
+ ./run-tests.sh || die |
184 |
+} |
185 |
+ |
186 |
src_install() { |
187 |
default |
188 |
|
189 |
@@ -159,11 +163,9 @@ src_install() { |
190 |
python_optimize "${ED}" |
191 |
} |
192 |
|
193 |
-src_test() { |
194 |
- ./run-tests.sh || die |
195 |
-} |
196 |
- |
197 |
pkg_postinst() { |
198 |
+ tmpfiles_process gluster.conf |
199 |
+ |
200 |
elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" |
201 |
elog "volumes dynamically. To do so, simply use the gluster CLI after running:" |
202 |
elog " /etc/init.d/glusterd start" |
203 |
|
204 |
diff --git a/sys-cluster/glusterfs/glusterfs-9.2-r1.ebuild b/sys-cluster/glusterfs/glusterfs-9.2-r1.ebuild |
205 |
index 0ce6675dcb7..8bc22e9cba2 100644 |
206 |
--- a/sys-cluster/glusterfs/glusterfs-9.2-r1.ebuild |
207 |
+++ b/sys-cluster/glusterfs/glusterfs-9.2-r1.ebuild |
208 |
@@ -164,6 +164,8 @@ src_install() { |
209 |
} |
210 |
|
211 |
pkg_postinst() { |
212 |
+ tmpfiles_process gluster.conf |
213 |
+ |
214 |
elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" |
215 |
elog "volumes dynamically. To do so, simply use the gluster CLI after running:" |
216 |
elog " /etc/init.d/glusterd start" |
217 |
@@ -185,8 +187,6 @@ pkg_postinst() { |
218 |
elog "If you are upgrading from a previous version of ${PN}, please read:" |
219 |
elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/" |
220 |
|
221 |
- tmpfiles_process gluster.conf |
222 |
- |
223 |
use emacs && elisp-site-regen |
224 |
} |