summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes-recipe/systemd.bbclass7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes-recipe/systemd.bbclass b/meta/classes-recipe/systemd.bbclass
index 12c59647be..0e9f7cfa33 100644
--- a/meta/classes-recipe/systemd.bbclass
+++ b/meta/classes-recipe/systemd.bbclass
@@ -249,9 +249,12 @@ python systemd_populate_packages() {
249 (servicename, instance, service_type) = re.split('[@.]', service) 249 (servicename, instance, service_type) = re.split('[@.]', service)
250 template_services.setdefault(servicename + '@.' + service_type, []).append(instance) 250 template_services.setdefault(servicename + '@.' + service_type, []).append(instance)
251 else: 251 else:
252 fd.write("%s %s\n" % (action,service)) 252 template_services.setdefault(service, [])
253 for template, instances in template_services.items(): 253 for template, instances in template_services.items():
254 fd.write("%s %s %s\n" % (action, template, ' '.join(instances))) 254 if instances:
255 fd.write("%s %s %s\n" % (action, template, ' '.join(instances)))
256 else:
257 fd.write("%s %s\n" % (action, template))
255 d.appendVar("FILES:%s" % pkg, ' ' + oe.path.join(d.getVar("systemd_unitdir"), "%s-preset/98-%s.preset" % (prefix, pkg))) 258 d.appendVar("FILES:%s" % pkg, ' ' + oe.path.join(d.getVar("systemd_unitdir"), "%s-preset/98-%s.preset" % (prefix, pkg)))
256 259
257 # Run all modifications once when creating package 260 # Run all modifications once when creating package