@@ -90,6 +90,18 @@ def systemd_service_path(service, searchpaths, d):
return path_found, base
+def systemd_service_searchpaths(user, d):
+ if user:
+ return [
+ oe.path.join(d.getVar("sysconfdir"), "systemd", "user"),
+ d.getVar("systemd_user_unitdir"),
+ ]
+ else:
+ return [
+ oe.path.join(d.getVar("sysconfdir"), "systemd", "system"),
+ d.getVar("systemd_system_unitdir"),
+ ]
+
python systemd_populate_packages() {
import re
import shlex
@@ -169,12 +181,9 @@ python systemd_populate_packages() {
# Check service-files and call systemd_add_files_and_parse for each entry
def systemd_check_services():
- searchpaths = [
- oe.path.join(d.getVar("sysconfdir"), "systemd", "system"),
- oe.path.join(d.getVar("sysconfdir"), "systemd", "user"),
- ]
- searchpaths.append(d.getVar("systemd_system_unitdir"))
- searchpaths.append(d.getVar("systemd_user_unitdir"))
+ searchpaths = systemd_service_searchpaths(False, d)
+ searchpaths.extend(systemd_service_searchpaths(True, d))
+
systemd_packages = d.getVar('SYSTEMD_PACKAGES')
# scan for all in SYSTEMD_SERVICE[]
systemd_service_searchpaths accepts boolean value indicating whether we are dealing with system or user units and returns search paths accordingly. Previously search path list was created in systemd_check_services() but following commits will introduce additional places. The systemd_service_searchpaths helper function is meant to reduce code duplication. Signed-off-by: Artur Kowalski <arturkow2000@gmail.com> --- meta/classes-recipe/systemd.bbclass | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)