mirror of
git://git.yoctoproject.org/poky.git
synced 2025-08-22 00:42:05 +02:00

There was a regression introduced by the change to use systemd-systemctl-native rather than a python fake implementation, which caused template units to not be properly enabled when set in the SYSTEMD_SERVICE variable. Through investigation, it seems that the best way to re-enable template instances is to handle them explicitly in the systemd.bbclass and enable them with `preset`, like most units are handled[1,2]. Per the systemd.preset manpage, the format for template units is different than for regular units[3]. We need to coalesce all the template instances onto a single line and emit them as an additional space-deliminated argument. Ran this against openbmc's phosphor-ipmi-net recipe and generated the following preset file: ``` $ cat packages-split/phosphor-ipmi-net/usr/lib/systemd/system-preset/98-phosphor-ipmi-net.preset enable phosphor-ipmi-net@.service eth0 enable phosphor-ipmi-net@.socket eth0 ``` [1]: https://lore.kernel.org/openembedded-core/Z2ch.1747051947055246176.oktf@lists.openembedded.org/ [2]: https://lore.kernel.org/openembedded-core/aDdoTVtCmElpURYD@heinlein/ [3]: https://www.freedesktop.org/software/systemd/man/latest/systemd.preset.html Fixes: 7a580800db39 ("systemd: Build the systemctl executable") (From OE-Core rev: f33d9b1f434e40a459614d8dc21ce45e11581008) (From OE-Core rev: ea207dce1f5f8579d8ddde487ac9852f50bfc792) Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Steve Sakoman <steve@sakoman.com>
299 lines
12 KiB
Plaintext
299 lines
12 KiB
Plaintext
#
|
|
# Copyright OpenEmbedded Contributors
|
|
#
|
|
# SPDX-License-Identifier: MIT
|
|
#
|
|
|
|
# The list of packages that should have systemd packaging scripts added. For
|
|
# each entry, optionally have a SYSTEMD_SERVICE:[package] that lists the service
|
|
# files in this package. If this variable isn't set, [package].service is used.
|
|
SYSTEMD_PACKAGES ?= "${PN}"
|
|
SYSTEMD_PACKAGES:class-native ?= ""
|
|
SYSTEMD_PACKAGES:class-nativesdk ?= ""
|
|
|
|
# Whether to enable or disable the services on installation.
|
|
SYSTEMD_AUTO_ENABLE ??= "enable"
|
|
|
|
# This class will be included in any recipe that supports systemd init scripts,
|
|
# even if systemd is not in DISTRO_FEATURES. As such don't make any changes
|
|
# directly but check the DISTRO_FEATURES first.
|
|
python __anonymous() {
|
|
# If the distro features have systemd but not sysvinit, inhibit update-rcd
|
|
# from doing any work so that pure-systemd images don't have redundant init
|
|
# files.
|
|
if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d):
|
|
d.appendVar("DEPENDS", " systemd-systemctl-native")
|
|
d.appendVar("PACKAGE_WRITE_DEPS", " systemd-systemctl-native")
|
|
if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
|
|
d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
|
|
}
|
|
|
|
systemd_postinst() {
|
|
if systemctl >/dev/null 2>/dev/null; then
|
|
OPTS=""
|
|
|
|
if [ -n "$D" ]; then
|
|
OPTS="--root=$D"
|
|
fi
|
|
|
|
if [ "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then
|
|
for service in ${@systemd_filter_services("${SYSTEMD_SERVICE_ESCAPED}", False, d)}; do
|
|
systemctl ${OPTS} enable "$service"
|
|
done
|
|
|
|
for service in ${@systemd_filter_services("${SYSTEMD_SERVICE_ESCAPED}", True, d)}; do
|
|
systemctl --global ${OPTS} enable "$service"
|
|
done
|
|
fi
|
|
|
|
if [ -z "$D" ]; then
|
|
# Reload only system service manager
|
|
# --global for daemon-reload is not supported: https://github.com/systemd/systemd/issues/19284
|
|
systemctl daemon-reload
|
|
[ -n "${@systemd_filter_services("${SYSTEMD_SERVICE_ESCAPED}", False, d)}" ] && \
|
|
systemctl preset ${@systemd_filter_services("${SYSTEMD_SERVICE_ESCAPED}", False, d)}
|
|
|
|
[ -n "${@systemd_filter_services("${SYSTEMD_SERVICE_ESCAPED}", True, d)}" ] && \
|
|
systemctl --global preset ${@systemd_filter_services("${SYSTEMD_SERVICE_ESCAPED}", True, d)}
|
|
|
|
if [ "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then
|
|
# --global flag for restart is not supported by systemd (see above)
|
|
[ -n "${@systemd_filter_services("${SYSTEMD_SERVICE_ESCAPED}", False, d)}" ] && \
|
|
systemctl --no-block restart ${@systemd_filter_services("${SYSTEMD_SERVICE_ESCAPED}", False, d)}
|
|
fi
|
|
fi
|
|
fi
|
|
}
|
|
|
|
systemd_prerm() {
|
|
if systemctl >/dev/null 2>/dev/null; then
|
|
if [ -z "$D" ]; then
|
|
if [ -n "${@systemd_filter_services("${SYSTEMD_SERVICE_ESCAPED}", False, d)}" ]; then
|
|
systemctl stop ${@systemd_filter_services("${SYSTEMD_SERVICE_ESCAPED}", False, d)}
|
|
systemctl disable ${@systemd_filter_services("${SYSTEMD_SERVICE_ESCAPED}", False, d)}
|
|
fi
|
|
|
|
# same as above, --global flag is not supported for stop so do disable only
|
|
[ -n "${@systemd_filter_services("${SYSTEMD_SERVICE_ESCAPED}", True, d)}" ] && \
|
|
systemctl --global disable ${@systemd_filter_services("${SYSTEMD_SERVICE_ESCAPED}", True, d)}
|
|
fi
|
|
fi
|
|
}
|
|
|
|
|
|
systemd_populate_packages[vardeps] += "systemd_prerm systemd_postinst"
|
|
systemd_populate_packages[vardepsexclude] += "OVERRIDES"
|
|
|
|
|
|
def systemd_service_path(service, searchpaths, d):
|
|
path_found = ''
|
|
|
|
# Deal with adding, for example, 'ifplugd@eth0.service' from
|
|
# 'ifplugd@.service'
|
|
base = None
|
|
at = service.find('@')
|
|
if at != -1:
|
|
ext = service.rfind('.')
|
|
base = service[:at] + '@' + service[ext:]
|
|
|
|
for path in searchpaths:
|
|
if os.path.lexists(oe.path.join(d.getVar("D"), path, service)):
|
|
path_found = path
|
|
break
|
|
elif base is not None:
|
|
if os.path.exists(oe.path.join(d.getVar("D"), path, base)):
|
|
path_found = path
|
|
break
|
|
|
|
return path_found, base
|
|
|
|
def systemd_service_searchpaths(user, d):
|
|
if user:
|
|
return [
|
|
oe.path.join(d.getVar("sysconfdir"), "systemd", "user"),
|
|
d.getVar("systemd_user_unitdir"),
|
|
]
|
|
else:
|
|
return [
|
|
oe.path.join(d.getVar("sysconfdir"), "systemd", "system"),
|
|
d.getVar("systemd_system_unitdir"),
|
|
]
|
|
|
|
def systemd_service_exists(service, user, d):
|
|
searchpaths = systemd_service_searchpaths(user, d)
|
|
path, _ = systemd_service_path(service, searchpaths, d)
|
|
|
|
return path != ''
|
|
|
|
def systemd_filter_services(services, user, d):
|
|
return ' '.join(service for service in services.split() if systemd_service_exists(service, user, d))
|
|
|
|
python systemd_populate_packages() {
|
|
import re
|
|
import shlex
|
|
|
|
if not bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d):
|
|
return
|
|
|
|
def get_package_var(d, var, pkg):
|
|
val = (d.getVar('%s:%s' % (var, pkg)) or "").strip()
|
|
if val == "":
|
|
val = (d.getVar(var) or "").strip()
|
|
return val
|
|
|
|
# Check if systemd-packages already included in PACKAGES
|
|
def systemd_check_package(pkg_systemd):
|
|
packages = d.getVar('PACKAGES')
|
|
if not pkg_systemd in packages.split():
|
|
bb.error('%s is marked for packaging systemd scripts, but it does not appear in package list, please add it to PACKAGES or adjust SYSTEMD_PACKAGES accordingly' % pkg_systemd)
|
|
|
|
|
|
def systemd_generate_package_scripts(pkg):
|
|
bb.debug(1, 'adding systemd calls to postinst/postrm for %s' % pkg)
|
|
|
|
paths_escaped = ' '.join(shlex.quote(s) for s in d.getVar('SYSTEMD_SERVICE:' + pkg).split())
|
|
d.setVar('SYSTEMD_SERVICE_ESCAPED:' + pkg, paths_escaped)
|
|
|
|
# Add pkg to the overrides so that it finds the SYSTEMD_SERVICE:pkg
|
|
# variable.
|
|
localdata = d.createCopy()
|
|
localdata.prependVar("OVERRIDES", pkg + ":")
|
|
|
|
postinst = d.getVar('pkg_postinst:%s' % pkg)
|
|
if not postinst:
|
|
postinst = '#!/bin/sh\n'
|
|
postinst += localdata.getVar('systemd_postinst')
|
|
d.setVar('pkg_postinst:%s' % pkg, postinst)
|
|
|
|
prerm = d.getVar('pkg_prerm:%s' % pkg)
|
|
if not prerm:
|
|
prerm = '#!/bin/sh\n'
|
|
prerm += localdata.getVar('systemd_prerm')
|
|
d.setVar('pkg_prerm:%s' % pkg, prerm)
|
|
|
|
|
|
# Add files to FILES:*-systemd if existent and not already done
|
|
def systemd_append_file(pkg_systemd, file_append):
|
|
appended = False
|
|
if os.path.exists(oe.path.join(d.getVar("D"), file_append)):
|
|
var_name = "FILES:" + pkg_systemd
|
|
files = d.getVar(var_name, False) or ""
|
|
if file_append not in files.split():
|
|
d.appendVar(var_name, " " + file_append)
|
|
appended = True
|
|
return appended
|
|
|
|
# Add systemd files to FILES:*-systemd, parse for Also= and follow recursive
|
|
def systemd_add_files_and_parse(pkg_systemd, path, service):
|
|
# avoid infinite recursion
|
|
if systemd_append_file(pkg_systemd, oe.path.join(path, service)):
|
|
fullpath = oe.path.join(d.getVar("D"), path, service)
|
|
if service.find('.service') != -1:
|
|
# for *.service add *@.service
|
|
service_base = service.replace('.service', '')
|
|
systemd_add_files_and_parse(pkg_systemd, path, service_base + '@.service')
|
|
# Add the socket unit which is referred by the Also= in this service file to the same package.
|
|
with open(fullpath, 'r') as unit_f:
|
|
for line in unit_f:
|
|
if line.startswith('Also'):
|
|
also_unit = line.split('=', 1)[1].strip()
|
|
if also_unit.find('.socket') != -1:
|
|
systemd_add_files_and_parse(pkg_systemd, path, also_unit)
|
|
if service.find('.socket') != -1:
|
|
# for *.socket add *.service and *@.service
|
|
service_base = service.replace('.socket', '')
|
|
systemd_add_files_and_parse(pkg_systemd, path, service_base + '.service')
|
|
systemd_add_files_and_parse(pkg_systemd, path, service_base + '@.service')
|
|
|
|
# Check service-files and call systemd_add_files_and_parse for each entry
|
|
def systemd_check_services():
|
|
searchpaths = systemd_service_searchpaths(False, d)
|
|
searchpaths.extend(systemd_service_searchpaths(True, d))
|
|
|
|
systemd_packages = d.getVar('SYSTEMD_PACKAGES')
|
|
|
|
# scan for all in SYSTEMD_SERVICE[]
|
|
for pkg_systemd in systemd_packages.split():
|
|
for service in get_package_var(d, 'SYSTEMD_SERVICE', pkg_systemd).split():
|
|
path_found, base = systemd_service_path(service, searchpaths, d)
|
|
|
|
if path_found != '':
|
|
systemd_add_files_and_parse(pkg_systemd, path_found, service)
|
|
else:
|
|
bb.fatal("Didn't find service unit '{0}', specified in SYSTEMD_SERVICE:{1}. {2}".format(
|
|
service, pkg_systemd, "Also looked for service unit '{0}'.".format(base) if base is not None else ""))
|
|
|
|
def systemd_create_presets(pkg, action, user):
|
|
import re
|
|
|
|
# Check there is at least one service of given type (system/user), don't
|
|
# create empty files.
|
|
needs_preset = False
|
|
for service in d.getVar('SYSTEMD_SERVICE:%s' % pkg).split():
|
|
if systemd_service_exists(service, user, d):
|
|
needs_preset = True
|
|
break
|
|
|
|
if not needs_preset:
|
|
return
|
|
|
|
prefix = "user" if user else "system"
|
|
presetf = oe.path.join(d.getVar("PKGD"), d.getVar("systemd_unitdir"), "%s-preset/98-%s.preset" % (prefix, pkg))
|
|
bb.utils.mkdirhier(os.path.dirname(presetf))
|
|
with open(presetf, 'a') as fd:
|
|
template_services = {}
|
|
for service in d.getVar('SYSTEMD_SERVICE:%s' % pkg).split():
|
|
if not systemd_service_exists(service, user, d):
|
|
continue
|
|
if '@' in service and '@.' not in service:
|
|
(servicename, instance, service_type) = re.split('[@.]', service)
|
|
template_services.setdefault(servicename + '@.' + service_type, []).append(instance)
|
|
else:
|
|
fd.write("%s %s\n" % (action,service))
|
|
for template, instances in template_services.items():
|
|
fd.write("%s %s %s\n" % (action, template, ' '.join(instances)))
|
|
d.appendVar("FILES:%s" % pkg, ' ' + oe.path.join(d.getVar("systemd_unitdir"), "%s-preset/98-%s.preset" % (prefix, pkg)))
|
|
|
|
# Run all modifications once when creating package
|
|
if os.path.exists(d.getVar("D")):
|
|
for pkg in d.getVar('SYSTEMD_PACKAGES').split():
|
|
systemd_check_package(pkg)
|
|
if d.getVar('SYSTEMD_SERVICE:' + pkg):
|
|
systemd_generate_package_scripts(pkg)
|
|
action = get_package_var(d, 'SYSTEMD_AUTO_ENABLE', pkg)
|
|
if action in ("enable", "disable"):
|
|
systemd_create_presets(pkg, action, False)
|
|
systemd_create_presets(pkg, action, True)
|
|
elif action not in ("mask", "preset"):
|
|
bb.fatal("SYSTEMD_AUTO_ENABLE:%s '%s' is not 'enable', 'disable', 'mask' or 'preset'" % (pkg, action))
|
|
systemd_check_services()
|
|
}
|
|
|
|
PACKAGESPLITFUNCS =+ "systemd_populate_packages"
|
|
|
|
rm_systemd_unitdir() {
|
|
rm -rf ${D}${systemd_unitdir}
|
|
# Change into ${D} and use a relative path with rmdir -p to avoid
|
|
# having it remove ${D} if it becomes empty.
|
|
(cd ${D} && rmdir -p $(dirname ${systemd_unitdir#/}) 2>/dev/null || :)
|
|
}
|
|
|
|
rm_sysvinit_initddir() {
|
|
local sysv_initddir=${INIT_D_DIR}
|
|
: ${sysv_initddir:=${sysconfdir}/init.d}
|
|
|
|
# If systemd_system_unitdir contains anything, delete sysv_initddir
|
|
if [ "$(ls -A ${D}${systemd_system_unitdir} 2>/dev/null)" ]; then
|
|
rm -rf ${D}$sysv_initddir
|
|
rmdir -p $(dirname ${D}$sysv_initddir) 2>/dev/null || :
|
|
fi
|
|
}
|
|
|
|
do_install[postfuncs] += "${RMINITDIR}"
|
|
RMINITDIR = " \
|
|
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'rm_systemd_unitdir', d)} \
|
|
${@'rm_sysvinit_initddir' if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and \
|
|
not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) else ''} \
|
|
"
|
|
RMINITDIR:class-native = ""
|