From: Chris Laplante <mostthingsweb@gmail.com>
Date: Mon, 11 Jan 2021 17:52:49 +0000 (-0500)
Subject: systemd.bbclass: improve error message when a service unit specified in SYSTEMD_SERVI... 
X-Git-Tag: uninative-2.10~236
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ef6117b148be65536e89409a83cbfd22049c652e;p=openembedded-core.git

systemd.bbclass: improve error message when a service unit specified in SYSTEMD_SERVICE is not found

The previous message was fairly useless without diving into the bbclass.

Signed-off-by: Chris Laplante <mostthingsweb@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 9ec465c759..db5d109545 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -174,7 +174,8 @@ python systemd_populate_packages() {
                 if path_found != '':
                     systemd_add_files_and_parse(pkg_systemd, path_found, service, keys)
                 else:
-                    bb.fatal("SYSTEMD_SERVICE_%s value %s does not exist" % (pkg_systemd, service))
+                    bb.fatal("Didn't find service unit '{0}', specified in SYSTEMD_SERVICE_{1}. {2}".format(
+                        service, pkg_systemd, "Also looked for service unit '{0}'.".format(base) if base is not None else ""))
 
     def systemd_create_presets(pkg, action):
         presetf = oe.path.join(d.getVar("PKGD"), d.getVar("systemd_unitdir"), "system-preset/98-%s.preset" % pkg)