mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 21:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

systemd: Restore mask and preset targets, fix instance creation

Browse Source 
Ensure that anyone who sets SYSTEMD_AUTO_ENABLE_${PN} = "mask" (or
"preset") retains the previous behaviour. In addition fix "enable" so it
can (again) create instance units out of templates.

Remove over-zealous quoting of SYSTEMD_SERVICE_ESCAPED as it's already
safely escaped (and can be multiple arguments).

Reported-by: Paul Barker <paul@betafive.co.uk>
(From OE-Core rev: e9444649f49431a8e203e6e2009a1de05e505007)

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alex Kiernan
2019-05-08 16:57:28 +01:00
committed by Richard Purdie
parent 534731e7a7
commit 2a2f74a27d
1 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
meta/classes/systemd.bbclass
View File

@@ -16,18 +16,36 @@ python __anonymous() {
# 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 type 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_SERVICE_ESCAPED}; do
case "${service}" in
*@*)
systemctl ${OPTS} enable "${service}"
;;
esac
done
fi
if [ -z "$D" ]; then
systemctl daemon-reload
systemctl preset "${SYSTEMD_SERVICE_ESCAPED}"
systemctl preset ${SYSTEMD_SERVICE_ESCAPED}
if [ "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then
systemctl --no-block restart "${SYSTEMD_SERVICE_ESCAPED}"
systemctl --no-block restart ${SYSTEMD_SERVICE_ESCAPED}
fi
fi
fi
@@ -36,9 +54,9 @@ fi
systemd_prerm() {
if type systemctl >/dev/null 2>/dev/null; then
if [ -z "$D" ]; then
systemctl stop "${SYSTEMD_SERVICE_ESCAPED}"
systemctl stop ${SYSTEMD_SERVICE_ESCAPED}
systemctl disable "${SYSTEMD_SERVICE_ESCAPED}"
systemctl disable ${SYSTEMD_SERVICE_ESCAPED}
fi
fi
}
@@ -162,10 +180,7 @@ python systemd_populate_packages() {
else:
bb.fatal("SYSTEMD_SERVICE_%s value %s does not exist" % (pkg_systemd, service))
def systemd_create_presets(pkg):
action = get_package_var(d, 'SYSTEMD_AUTO_ENABLE', pkg)
if action not in ("enable", "disable"):
bb.fatal("SYSTEMD_AUTO_ENABLE_%s '%s' is not 'enable' or 'disable'" % (pkg, action))
def systemd_create_presets(pkg, action):
presetf = oe.path.join(d.getVar("PKGD"), d.getVar("systemd_unitdir"), "system-preset/98-%s.preset" % pkg)
bb.utils.mkdirhier(os.path.dirname(presetf))
with open(presetf, 'a') as fd:
@@ -179,7 +194,11 @@ python systemd_populate_packages() {
systemd_check_package(pkg)
if d.getVar('SYSTEMD_SERVICE_' + pkg):
systemd_generate_package_scripts(pkg)
systemd_create_presets(pkg)
action = get_package_var(d, 'SYSTEMD_AUTO_ENABLE', pkg)
if action in ("enable", "disable"):
systemd_create_presets(pkg, action)
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()
}