diff options
author | David Michael <fedora.dm0@gmail.com> | 2021-06-28 14:00:42 -0400 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2021-06-29 12:20:31 -0400 |
commit | 3596d78eecd4444b6792662c00b92e8b7214c3ca (patch) | |
tree | f883294192fd14f648c5938e2b97373080b26818 /eclass | |
parent | toolchain-glibc.eclass: migrate to tmpfiles.eclass (diff) | |
download | gentoo-3596d78eecd4444b6792662c00b92e8b7214c3ca.tar.gz gentoo-3596d78eecd4444b6792662c00b92e8b7214c3ca.tar.bz2 gentoo-3596d78eecd4444b6792662c00b92e8b7214c3ca.zip |
systemd.eclass: drop deprecated tmpfiles functions
Closes: https://bugs.gentoo.org/740638
Signed-off-by: David Michael <fedora.dm0@gmail.com>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/21462
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/systemd.eclass | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass index ab0d65619843..397a863cf257 100644 --- a/eclass/systemd.eclass +++ b/eclass/systemd.eclass @@ -237,48 +237,6 @@ systemd_install_serviced() { ) } -# @FUNCTION: systemd_dotmpfilesd -# @USAGE: <tmpfilesd>... -# @DESCRIPTION: -# Deprecated in favor of tmpfiles.eclass. -# -# Install systemd tmpfiles.d files. Uses doins, thus it is fatal -# in EAPI 4 and non-fatal in earlier EAPIs. -systemd_dotmpfilesd() { - debug-print-function ${FUNCNAME} "${@}" - - for f; do - [[ ${f} == *.conf ]] \ - || die 'tmpfiles.d files need to have .conf suffix.' - done - - ( - insopts -m 0644 - insinto /usr/lib/tmpfiles.d/ - doins "${@}" - ) -} - -# @FUNCTION: systemd_newtmpfilesd -# @USAGE: <old-name> <new-name>.conf -# @DESCRIPTION: -# Deprecated in favor of tmpfiles.eclass. -# -# Install systemd tmpfiles.d file under a new name. Uses newins, thus it -# is fatal in EAPI 4 and non-fatal in earlier EAPIs. -systemd_newtmpfilesd() { - debug-print-function ${FUNCNAME} "${@}" - - [[ ${2} == *.conf ]] \ - || die 'tmpfiles.d files need to have .conf suffix.' - - ( - insopts -m 0644 - insinto /usr/lib/tmpfiles.d/ - newins "${@}" - ) -} - # @FUNCTION: systemd_enable_service # @USAGE: <target> <service> # @DESCRIPTION: @@ -436,29 +394,6 @@ systemd_is_booted() { return ${ret} } -# @FUNCTION: systemd_tmpfiles_create -# @USAGE: <tmpfilesd> ... -# @DESCRIPTION: -# Deprecated in favor of tmpfiles.eclass. -# -# Invokes systemd-tmpfiles --create with given arguments. -# Does nothing if ROOT != / or systemd-tmpfiles is not in PATH. -# This function should be called from pkg_postinst. -# -# Generally, this function should be called with the names of any tmpfiles -# fragments which have been installed, either by the build system or by a -# previous call to systemd_dotmpfilesd. This ensures that any tmpfiles are -# created without the need to reboot the system. -systemd_tmpfiles_create() { - debug-print-function ${FUNCNAME} "${@}" - - [[ ${EBUILD_PHASE} == postinst ]] || die "${FUNCNAME}: Only valid in pkg_postinst" - [[ ${#} -gt 0 ]] || die "${FUNCNAME}: Must specify at least one filename" - [[ ${ROOT:-/} == / ]] || return 0 - type systemd-tmpfiles &> /dev/null || return 0 - systemd-tmpfiles --create "${@}" -} - # @FUNCTION: systemd_reenable # @USAGE: <unit> ... # @DESCRIPTION: |