| 1 |
commit: 2a330638070882a0a9635498c8e6d99aeeca65a8 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 31 03:09:33 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 31 22:13:38 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a330638 |
| 7 |
|
| 8 |
app-admin/puppet: [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 |
app-admin/puppet/{puppet-5.5.22.ebuild => puppet-5.5.22-r1.ebuild} | 7 ++++--- |
| 19 |
app-admin/puppet/{puppet-7.8.0.ebuild => puppet-7.8.0-r1.ebuild} | 7 ++++--- |
| 20 |
app-admin/puppet/{puppet-7.9.0.ebuild => puppet-7.9.0-r1.ebuild} | 7 ++++--- |
| 21 |
3 files changed, 12 insertions(+), 9 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-admin/puppet/puppet-5.5.22.ebuild b/app-admin/puppet/puppet-5.5.22-r1.ebuild |
| 24 |
similarity index 97% |
| 25 |
rename from app-admin/puppet/puppet-5.5.22.ebuild |
| 26 |
rename to app-admin/puppet/puppet-5.5.22-r1.ebuild |
| 27 |
index d0814cc9e78..a33a8285cc8 100644 |
| 28 |
--- a/app-admin/puppet/puppet-5.5.22.ebuild |
| 29 |
+++ b/app-admin/puppet/puppet-5.5.22-r1.ebuild |
| 30 |
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_TASK_DOC="doc:all" |
| 31 |
|
| 32 |
RUBY_FAKEGEM_EXTRAINSTALL="locales" |
| 33 |
|
| 34 |
-inherit ruby-fakegem |
| 35 |
+inherit ruby-fakegem tmpfiles |
| 36 |
|
| 37 |
DESCRIPTION="A system automation and configuration management software." |
| 38 |
HOMEPAGE="https://puppet.com/" |
| 39 |
@@ -88,8 +88,7 @@ all_ruby_install() { |
| 40 |
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service" |
| 41 |
|
| 42 |
# tmpfiles stuff |
| 43 |
- insinto /usr/lib/tmpfiles.d |
| 44 |
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf" |
| 45 |
+ newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf" |
| 46 |
|
| 47 |
# openrc init stuff |
| 48 |
newinitd "${FILESDIR}"/puppet.init-4.x puppet |
| 49 |
@@ -121,6 +120,8 @@ all_ruby_install() { |
| 50 |
} |
| 51 |
|
| 52 |
pkg_postinst() { |
| 53 |
+ tmpfiles_process puppet.conf |
| 54 |
+ |
| 55 |
elog |
| 56 |
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
| 57 |
elog "cause puppet to hang while installing packages." |
| 58 |
|
| 59 |
diff --git a/app-admin/puppet/puppet-7.8.0.ebuild b/app-admin/puppet/puppet-7.8.0-r1.ebuild |
| 60 |
similarity index 96% |
| 61 |
rename from app-admin/puppet/puppet-7.8.0.ebuild |
| 62 |
rename to app-admin/puppet/puppet-7.8.0-r1.ebuild |
| 63 |
index d3f1ad182f3..9c67dbe4f52 100644 |
| 64 |
--- a/app-admin/puppet/puppet-7.8.0.ebuild |
| 65 |
+++ b/app-admin/puppet/puppet-7.8.0-r1.ebuild |
| 66 |
@@ -8,7 +8,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec3" |
| 67 |
RUBY_FAKEGEM_TASK_DOC="doc:all" |
| 68 |
RUBY_FAKEGEM_EXTRAINSTALL="locales" |
| 69 |
|
| 70 |
-inherit ruby-fakegem |
| 71 |
+inherit ruby-fakegem tmpfiles |
| 72 |
|
| 73 |
DESCRIPTION="A system automation and configuration management software." |
| 74 |
HOMEPAGE="https://puppet.com/" |
| 75 |
@@ -85,8 +85,7 @@ all_ruby_install() { |
| 76 |
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service" |
| 77 |
|
| 78 |
# tmpfiles stuff |
| 79 |
- insinto /usr/lib/tmpfiles.d |
| 80 |
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf" |
| 81 |
+ newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf" |
| 82 |
|
| 83 |
# openrc init stuff |
| 84 |
newinitd "${FILESDIR}"/puppet.init-4.x puppet |
| 85 |
@@ -118,6 +117,8 @@ all_ruby_install() { |
| 86 |
} |
| 87 |
|
| 88 |
pkg_postinst() { |
| 89 |
+ tmpfiles_process puppet.conf |
| 90 |
+ |
| 91 |
elog |
| 92 |
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
| 93 |
elog "cause puppet to hang while installing packages." |
| 94 |
|
| 95 |
diff --git a/app-admin/puppet/puppet-7.9.0.ebuild b/app-admin/puppet/puppet-7.9.0-r1.ebuild |
| 96 |
similarity index 96% |
| 97 |
rename from app-admin/puppet/puppet-7.9.0.ebuild |
| 98 |
rename to app-admin/puppet/puppet-7.9.0-r1.ebuild |
| 99 |
index 125aa53e82c..b097feb026a 100644 |
| 100 |
--- a/app-admin/puppet/puppet-7.9.0.ebuild |
| 101 |
+++ b/app-admin/puppet/puppet-7.9.0-r1.ebuild |
| 102 |
@@ -8,7 +8,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec3" |
| 103 |
RUBY_FAKEGEM_TASK_DOC="doc:all" |
| 104 |
RUBY_FAKEGEM_EXTRAINSTALL="locales" |
| 105 |
|
| 106 |
-inherit ruby-fakegem |
| 107 |
+inherit ruby-fakegem tmpfiles |
| 108 |
|
| 109 |
DESCRIPTION="A system automation and configuration management software." |
| 110 |
HOMEPAGE="https://puppet.com/" |
| 111 |
@@ -85,8 +85,7 @@ all_ruby_install() { |
| 112 |
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service" |
| 113 |
|
| 114 |
# tmpfiles stuff |
| 115 |
- insinto /usr/lib/tmpfiles.d |
| 116 |
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf" |
| 117 |
+ newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf" |
| 118 |
|
| 119 |
# openrc init stuff |
| 120 |
newinitd "${FILESDIR}"/puppet.init-4.x puppet |
| 121 |
@@ -118,6 +117,8 @@ all_ruby_install() { |
| 122 |
} |
| 123 |
|
| 124 |
pkg_postinst() { |
| 125 |
+ tmpfiles_process puppet.conf |
| 126 |
+ |
| 127 |
elog |
| 128 |
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
| 129 |
elog "cause puppet to hang while installing packages." |
Archives