diff options
author | Khang D Nguyen <khangng@os.amperecomputing.com> | 2025-08-20 09:55:24 +0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-08-21 10:29:56 +0100 |
commit | 2ba3de20783e07728fb1409002fea33d21ac54fa (patch) | |
tree | 00de4aaae24cc8e5af07c474ee030ca110548b8e /scripts/lib/scriptutils.py | |
parent | 11817b180e68a64cf22d0417f8d647e382ca758d (diff) | |
download | poky-2ba3de20783e07728fb1409002fea33d21ac54fa.tar.gz |
systemd.bbclass: deduplicate template and instance lines in preset file
If SYSTEMD_SERVICE contains both template and instance names, the
preset file will contain two lines: one describing the template name
and one describing the instance names.
This is problematic because systemd.preset only use the first matching
one [1], leading to the instances not getting enabled.
For example, openbmc's obmc-console recipe has the following
final SYSTEMD_SERVICE variable:
```
SYSTEMD_SERVICE:obmc-console = " \
obmc-console@.service \
obmc-console-ssh@.service \
obmc-console-ssh@2200.service \
"
```
The resulting preset file will contain lines with the same name:
```
enable obmc-console@.service
enable obmc-console-ssh@.service
enable obmc-console-ssh@.service 2200
```
Fix this by interpreting the template name as a special case of empty
instances.
Tested: preset files are generated correctly:
```
enable obmc-console@.service
enable obmc-console-ssh@.service 2200
```
[1]: https://www.freedesktop.org/software/systemd/man/257/systemd.preset.html#Preset%20File%20Format
Fixes: f33d9b1f434e ("systemd.bbclass: generate preset for templates")
(From OE-Core rev: 7cdf10840c200a327b6336775698342af7212ee4)
Signed-off-by: Khang D Nguyen <khangng@os.amperecomputing.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/scriptutils.py')
0 files changed, 0 insertions, 0 deletions