commit: 2a330638070882a0a9635498c8e6d99aeeca65a8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 03:09:33 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 22:13:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a330638
app-admin/puppet: [QA] call tmpfiles_process in pkg_postinst
This is needed to actually apply the tmpfiles configuration
we've installed in the ebuild. See tmpfiles.eclass documentation.
Revbump because the new tmpfiles inherit adds a new dependency
(virtual/tmpfiles).
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-admin/puppet/{puppet-5.5.22.ebuild => puppet-5.5.22-r1.ebuild} | 7 ++++---
app-admin/puppet/{puppet-7.8.0.ebuild => puppet-7.8.0-r1.ebuild} | 7 ++++---
app-admin/puppet/{puppet-7.9.0.ebuild => puppet-7.9.0-r1.ebuild} | 7 ++++---
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/app-admin/puppet/puppet-5.5.22.ebuild
b/app-admin/puppet/puppet-5.5.22-r1.ebuild
similarity index 97%
rename from app-admin/puppet/puppet-5.5.22.ebuild
rename to app-admin/puppet/puppet-5.5.22-r1.ebuild
index d0814cc9e78..a33a8285cc8 100644
--- a/app-admin/puppet/puppet-5.5.22.ebuild
+++ b/app-admin/puppet/puppet-5.5.22-r1.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_TASK_DOC="doc:all"
RUBY_FAKEGEM_EXTRAINSTALL="locales"
-inherit ruby-fakegem
+inherit ruby-fakegem tmpfiles
DESCRIPTION="A system automation and configuration management software."
HOMEPAGE="https://puppet.com/";
@@ -88,8 +88,7 @@ all_ruby_install() {
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
# tmpfiles stuff
- insinto /usr/lib/tmpfiles.d
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+ newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
# openrc init stuff
newinitd "${FILESDIR}"/puppet.init-4.x puppet
@@ -121,6 +120,8 @@ all_ruby_install() {
}
pkg_postinst() {
+ tmpfiles_process puppet.conf
+
elog
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as
this could"
elog "cause puppet to hang while installing packages."
diff --git a/app-admin/puppet/puppet-7.8.0.ebuild
b/app-admin/puppet/puppet-7.8.0-r1.ebuild
similarity index 96%
rename from app-admin/puppet/puppet-7.8.0.ebuild
rename to app-admin/puppet/puppet-7.8.0-r1.ebuild
index d3f1ad182f3..9c67dbe4f52 100644
--- a/app-admin/puppet/puppet-7.8.0.ebuild
+++ b/app-admin/puppet/puppet-7.8.0-r1.ebuild
@@ -8,7 +8,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_TASK_DOC="doc:all"
RUBY_FAKEGEM_EXTRAINSTALL="locales"
-inherit ruby-fakegem
+inherit ruby-fakegem tmpfiles
DESCRIPTION="A system automation and configuration management software."
HOMEPAGE="https://puppet.com/";
@@ -85,8 +85,7 @@ all_ruby_install() {
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
# tmpfiles stuff
- insinto /usr/lib/tmpfiles.d
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+ newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
# openrc init stuff
newinitd "${FILESDIR}"/puppet.init-4.x puppet
@@ -118,6 +117,8 @@ all_ruby_install() {
}
pkg_postinst() {
+ tmpfiles_process puppet.conf
+
elog
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as
this could"
elog "cause puppet to hang while installing packages."
diff --git a/app-admin/puppet/puppet-7.9.0.ebuild
b/app-admin/puppet/puppet-7.9.0-r1.ebuild
similarity index 96%
rename from app-admin/puppet/puppet-7.9.0.ebuild
rename to app-admin/puppet/puppet-7.9.0-r1.ebuild
index 125aa53e82c..b097feb026a 100644
--- a/app-admin/puppet/puppet-7.9.0.ebuild
+++ b/app-admin/puppet/puppet-7.9.0-r1.ebuild
@@ -8,7 +8,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_TASK_DOC="doc:all"
RUBY_FAKEGEM_EXTRAINSTALL="locales"
-inherit ruby-fakegem
+inherit ruby-fakegem tmpfiles
DESCRIPTION="A system automation and configuration management software."
HOMEPAGE="https://puppet.com/";
@@ -85,8 +85,7 @@ all_ruby_install() {
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
# tmpfiles stuff
- insinto /usr/lib/tmpfiles.d
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+ newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
# openrc init stuff
newinitd "${FILESDIR}"/puppet.init-4.x puppet
@@ -118,6 +117,8 @@ all_ruby_install() {
}
pkg_postinst() {
+ tmpfiles_process puppet.conf
+
elog
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as
this could"
elog "cause puppet to hang while installing packages."
