MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

systemd.bbclass: properly handle user units in systemd_create_presets

Browse Source 
Previously user units were handled the same way as system units, that
is all preset files were created in system-preset directory, but user
presets should be in user-preset directory.

(From OE-Core rev: 0218542d80723ec314a648af8e9649806c3a51aa)

Signed-off-by: Artur Kowalski <arturkow2000@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Artur Kowalski 2025-01-20 13:46:03 +01:00 committed by Richard Purdie
parent a3302b8216
commit 284450ed97
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
meta/classes-recipe/systemd.bbclass
View File

@ -102,6 +102,12 @@ def systemd_service_searchpaths(user, d):
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 != ''
python systemd_populate_packages() {
import re
import shlex
@ -197,13 +203,27 @@ python systemd_populate_packages() {
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):
presetf = oe.path.join(d.getVar("PKGD"), d.getVar("systemd_unitdir"), "system-preset/98-%s.preset" % pkg)
def systemd_create_presets(pkg, action, user):
# 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:
for service in d.getVar('SYSTEMD_SERVICE:%s' % pkg).split():
if not systemd_service_exists(service, user, d):
continue
fd.write("%s %s\n" % (action,service))
d.appendVar("FILES:%s" % pkg, ' ' + oe.path.join(d.getVar("systemd_unitdir"), "system-preset/98-%s.preset" % pkg))
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")):
@ -213,7 +233,8 @@ python systemd_populate_packages() {
systemd_generate_package_scripts(pkg)
action = get_package_var(d, 'SYSTEMD_AUTO_ENABLE', pkg)
if action in ("enable", "disable"):
systemd_create_presets(pkg, action)
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()