| 1 |
commit: 8684fd59e701173cab6a220204b6f43097e18faf |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 31 03:11:20 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 31 22:13:39 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8684fd59 |
| 7 |
|
| 8 |
net-analyzer/munin: [QA] call tmpfiles_process in pkg_postinst |
| 9 |
|
| 10 |
This is needed to actually apply the tmpfiles configuration |
| 11 |
we've installed in the ebuild. See tmpfiles.eclass documentation. |
| 12 |
|
| 13 |
Revbump because the new tmpfiles inherit adds a new dependency |
| 14 |
(virtual/tmpfiles). |
| 15 |
|
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
.../munin/{munin-2.0.66-r2.ebuild => munin-2.0.66-r3.ebuild} | 9 +++++---- |
| 19 |
.../munin/{munin-2.0.67-r4.ebuild => munin-2.0.67-r6.ebuild} | 9 +++++---- |
| 20 |
.../munin/{munin-2.0.67-r5.ebuild => munin-2.0.67-r7.ebuild} | 9 +++++---- |
| 21 |
3 files changed, 15 insertions(+), 12 deletions(-) |
| 22 |
|
| 23 |
diff --git a/net-analyzer/munin/munin-2.0.66-r2.ebuild b/net-analyzer/munin/munin-2.0.66-r3.ebuild |
| 24 |
similarity index 98% |
| 25 |
rename from net-analyzer/munin/munin-2.0.66-r2.ebuild |
| 26 |
rename to net-analyzer/munin/munin-2.0.66-r3.ebuild |
| 27 |
index 7a5621b5deb..4d6837047b5 100644 |
| 28 |
--- a/net-analyzer/munin/munin-2.0.66-r2.ebuild |
| 29 |
+++ b/net-analyzer/munin/munin-2.0.66-r3.ebuild |
| 30 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 31 |
|
| 32 |
PATCHSET=1 |
| 33 |
|
| 34 |
-inherit java-pkg-opt-2 systemd |
| 35 |
+inherit java-pkg-opt-2 systemd tmpfiles |
| 36 |
|
| 37 |
MY_P=${P/_/-} |
| 38 |
|
| 39 |
@@ -131,7 +131,7 @@ src_configure() { |
| 40 |
|
| 41 |
local cgiuser=$(usex apache2 apache munin) |
| 42 |
|
| 43 |
- cat >> "${S}"/Makefile.config <<- EOF |
| 44 |
+ cat >> "${S}"/Makefile.config <<- EOF || die |
| 45 |
PREFIX=\$(DESTDIR)/usr |
| 46 |
CONFDIR=\$(DESTDIR)/etc/munin |
| 47 |
DOCDIR=${T}/useless/doc |
| 48 |
@@ -204,8 +204,7 @@ src_install() { |
| 49 |
|
| 50 |
newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd |
| 51 |
|
| 52 |
- dodir /usr/lib/tmpfiles.d |
| 53 |
- cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF |
| 54 |
+ newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die |
| 55 |
d /run/munin 0700 munin munin - - |
| 56 |
EOF |
| 57 |
|
| 58 |
@@ -374,6 +373,8 @@ pkg_config() { |
| 59 |
} |
| 60 |
|
| 61 |
pkg_postinst() { |
| 62 |
+ tmpfiles_process ${CATEGORY}:${PN}:${SLOT}.conf |
| 63 |
+ |
| 64 |
elog "Please follow the munin documentation to set up the plugins you" |
| 65 |
elog "need, afterwards start munin-node." |
| 66 |
elog "" |
| 67 |
|
| 68 |
diff --git a/net-analyzer/munin/munin-2.0.67-r4.ebuild b/net-analyzer/munin/munin-2.0.67-r6.ebuild |
| 69 |
similarity index 98% |
| 70 |
rename from net-analyzer/munin/munin-2.0.67-r4.ebuild |
| 71 |
rename to net-analyzer/munin/munin-2.0.67-r6.ebuild |
| 72 |
index 9f666d4ad68..b4ad2481fd4 100644 |
| 73 |
--- a/net-analyzer/munin/munin-2.0.67-r4.ebuild |
| 74 |
+++ b/net-analyzer/munin/munin-2.0.67-r6.ebuild |
| 75 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 76 |
|
| 77 |
PATCHSET=1 |
| 78 |
|
| 79 |
-inherit java-pkg-opt-2 systemd |
| 80 |
+inherit java-pkg-opt-2 systemd tmpfiles |
| 81 |
|
| 82 |
MY_P=${P/_/-} |
| 83 |
|
| 84 |
@@ -131,7 +131,7 @@ src_configure() { |
| 85 |
|
| 86 |
local cgiuser=$(usex apache2 apache munin) |
| 87 |
|
| 88 |
- cat >> "${S}"/Makefile.config <<- EOF |
| 89 |
+ cat >> "${S}"/Makefile.config <<- EOF || die |
| 90 |
PREFIX=\$(DESTDIR)/usr |
| 91 |
CONFDIR=\$(DESTDIR)/etc/munin |
| 92 |
DOCDIR=${T}/useless/doc |
| 93 |
@@ -204,8 +204,7 @@ src_install() { |
| 94 |
|
| 95 |
newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd |
| 96 |
|
| 97 |
- dodir /usr/lib/tmpfiles.d |
| 98 |
- cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF |
| 99 |
+ newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die |
| 100 |
d /run/munin 0700 munin munin - - |
| 101 |
EOF |
| 102 |
|
| 103 |
@@ -374,6 +373,8 @@ pkg_config() { |
| 104 |
} |
| 105 |
|
| 106 |
pkg_postinst() { |
| 107 |
+ tmpfiles_process ${CATEGORY}:${PN}:${SLOT}.conf |
| 108 |
+ |
| 109 |
elog "Please follow the munin documentation to set up the plugins you" |
| 110 |
elog "need, afterwards start munin-node." |
| 111 |
elog "" |
| 112 |
|
| 113 |
diff --git a/net-analyzer/munin/munin-2.0.67-r5.ebuild b/net-analyzer/munin/munin-2.0.67-r7.ebuild |
| 114 |
similarity index 98% |
| 115 |
rename from net-analyzer/munin/munin-2.0.67-r5.ebuild |
| 116 |
rename to net-analyzer/munin/munin-2.0.67-r7.ebuild |
| 117 |
index a0ed5615dc5..00a940ba1b5 100644 |
| 118 |
--- a/net-analyzer/munin/munin-2.0.67-r5.ebuild |
| 119 |
+++ b/net-analyzer/munin/munin-2.0.67-r7.ebuild |
| 120 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 121 |
|
| 122 |
PATCHSET=1 |
| 123 |
|
| 124 |
-inherit java-pkg-opt-2 systemd |
| 125 |
+inherit java-pkg-opt-2 systemd tmpfiles |
| 126 |
|
| 127 |
MY_P=${P/_/-} |
| 128 |
|
| 129 |
@@ -131,7 +131,7 @@ src_configure() { |
| 130 |
|
| 131 |
local cgiuser=$(usex apache2 apache munin) |
| 132 |
|
| 133 |
- cat >> "${S}"/Makefile.config <<- EOF |
| 134 |
+ cat >> "${S}"/Makefile.config <<- EOF || die |
| 135 |
PREFIX=\$(DESTDIR)/usr |
| 136 |
CONFDIR=\$(DESTDIR)/etc/munin |
| 137 |
DOCDIR=${T}/useless/doc |
| 138 |
@@ -204,8 +204,7 @@ src_install() { |
| 139 |
|
| 140 |
newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd |
| 141 |
|
| 142 |
- dodir /usr/lib/tmpfiles.d |
| 143 |
- cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF |
| 144 |
+ newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die |
| 145 |
d /run/munin 0700 munin munin - - |
| 146 |
EOF |
| 147 |
|
| 148 |
@@ -372,6 +371,8 @@ pkg_config() { |
| 149 |
} |
| 150 |
|
| 151 |
pkg_postinst() { |
| 152 |
+ tmpfiles_process ${CATEGORY}:${PN}:${SLOT}.conf |
| 153 |
+ |
| 154 |
elog "Please follow the munin documentation to set up the plugins you" |
| 155 |
elog "need, afterwards start munin-node." |
| 156 |
elog "" |
Archives