From: Adrian Freihofer <[email protected]>
Starting a systemd service “Also” does not mean that both services
must be in the same package. However, the systemd.bbclass enforces
this.
Example:
a.service:
[Install]
Also=b.service
If a.service is packed in package A, b.service is automatically packed
into package A as well. This happens even if b.service is explicitly
added to package B using FILES and SYSTEMD_SERVICE variables.
The automatic packing of socket files with the corresponding service
files is probably a widely used feature of systemd.bbclass. This bahavior
does not change.
Adding regular service files to a package just because it is another
service in the same package that "Also" uses the service is a bug that
this commit fixes.
Signed-off-by: Adrian Freihofer <[email protected]>
---
meta/classes-recipe/systemd.bbclass | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/meta/classes-recipe/systemd.bbclass
b/meta/classes-recipe/systemd.bbclass
index be77da48125..4b4470b7b34 100644
--- a/meta/classes-recipe/systemd.bbclass
+++ b/meta/classes-recipe/systemd.bbclass
@@ -132,18 +132,18 @@ python systemd_populate_packages() {
# 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')
- # Add all units which have an Also= referring a unit in this
package to this package as well.
- with open(fullpath, 'r') as unit_f:
- for line in unit_f:
- if line.startswith('Also'):
- also_unit = line.split('=', 1)[1].strip()
- bb.warn("also: %s" % also_unit)
- systemd_add_files_and_parse(pkg_systemd, path,
also_unit)
# Check service-files and call systemd_add_files_and_parse for each entry
def systemd_check_services():
--
2.47.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#208615):
https://lists.openembedded.org/g/openembedded-core/message/208615
Mute This Topic: https://lists.openembedded.org/mt/110070405/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
