systemd.bbclass: support template files with dots
PATCH 1/1 systemd.bbclass: support template files with dots
If the SYSTEMD_SERVICE variable contains a template instance that has dots in the name such as "[email protected]", the regex splits on all the dots resulting in the following python exception:
Exception: ValueError: too many values to unpack (expected 3)
To continue to support service files with dots in the name, this changes to first split only on the '@' to isolate the name, then split the second half on the dot to get the remaining two parameters.
Confirmed when building that the three parameters for template instances without dots came out the same and that template instances with dots include the full name with dots in the first parameter.
--- meta/classes-recipe/systemd.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/classes-recipe/systemd.bbclass +2 -1
@@ -247,7 +247,8 @@ python systemd_populate_packages() { if not systemd_service_exists(service, user, d): continue if '@' in service and '@.' not in service: - (servicename, instance, service_type) = re.split('[@.]', service) + (servicename, postfix) = service.split('@') + (instance, service_type) = postfix.split('.') template_services.setdefault(servicename + '@.' + service_type, []).append(instance) else: template_services.setdefault(service, [])
Quoted 26 lines · Jason M via lists.openembedded.org
If the
SYSTEMD_SERVICEvariable contains a template instance that has dots in the name such as "[email protected]", the regex splits on all the dots resulting in the following python exception:Exception: ValueError: too many values to unpack (expected 3)
To continue to support service files with dots in the name, this changes to first split only on the '@' to isolate the name, then split the second half on the dot to get the remaining two parameters.
Confirmed when building that the three parameters for template instances without dots came out the same and that template instances with dots include the full name with dots in the first parameter.
Signed-off-by Jason M. Bills <[email protected]>---
meta/classes-recipe/systemd.bbclass | 3 ++-1 file changed, 2 insertions(+), 1 deletion(-)meta/classes-recipe/systemd.bbclass +0
-0
meta/classes-recipe/systemd.bbclass python systemd_populate_packages() { · line 251
Quoted 6 lines
meta/classes-recipe/systemd.bbclass +2
-1@@ -247,7 +247,8 @@ python systemd_populate_packages() { if not systemd_service_exists(service, user, d): continue if '@' in service and '@.' not in service: - (servicename, instance, service_type) = re.split('[@.]', service) + (servicename, postfix) = service.split('@') + (instance, service_type) = postfix.split('.')
The assumption here is that the service name only contains a single dot and the instance isn’t something like foo.bar, right? Are we certain that is the case?
Ross
Quoted 36 lines · Ross Burton
Quoted 26 lines · Jason M via lists.openembedded.org
If the
SYSTEMD_SERVICEvariable contains a template instance that has dots in the name such as "[email protected]", the regex splits on all the dots resulting in the following python exception:Exception: ValueError: too many values to unpack (expected 3)
To continue to support service files with dots in the name, this changes to first split only on the '@' to isolate the name, then split the second half on the dot to get the remaining two parameters.
Confirmed when building that the three parameters for template instances without dots came out the same and that template instances with dots include the full name with dots in the first parameter.
Signed-off-by Jason M. Bills <[email protected]>---
meta/classes-recipe/systemd.bbclass | 3 ++-1 file changed, 2 insertions(+), 1 deletion(-)meta/classes-recipe/systemd.bbclass +0
-0meta/classes-recipe/systemd.bbclass python systemd_populate_packages() { · line 251
Quoted 6 lines
meta/classes-recipe/systemd.bbclass +2
-1@@ -247,7 +247,8 @@ python systemd_populate_packages() { if not systemd_service_exists(service, user, d): continue if '@' in service and '@.' not in service: - (servicename, instance, service_type) = re.split('[@.]', service) + (servicename, postfix) = service.split('@') + (instance, service_type) = postfix.split('.')The assumption here is that the service name only contains a single dot and the instance isn’t something like foo.bar, right? Are we certain that is the case?
Quoted 2 lines
Ross
This splits first on the '@', so the assumption is the whole thing contains only one '@' and the service name can have many dots. But the instance is assumed to have no dots which is currently the case in OpenBMC, but I don't know is guaranteed in systemd.
The documentation ([1]) isn't explicit, but assuming "instance name" allows the same characters as "unit name prefix", then it looks like it's possible.
I will rework the second split to split on the last dot to allow for the case where someone may use an instance with dots.
[1]: https://www.freedesktop.org/software/systemd/man/latest/systemd.unit.html
-Jason