[yocto] [PATCH] meta: Search also FILESEXTRAPATHS for systemd service files

[Jukka Rissanen]

Signed-off-by: Jukka Rissanen <jukka.rissanen at linux.intel.com>
---
 meta/classes/systemd.bbclass | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 564cd72..b807d4e 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -1,3 +1,5 @@
+inherit utils
+
 # The list of packages that should have systemd packaging scripts added.  For
 # each entry, optionally have a SYSTEMD_SERVICE_[package] that lists the service
 # files in this package.  If this variable isn't set, [package].service is used.
@@ -137,6 +139,7 @@ python systemd_populate_packages() {
             # single service gets also the /dev/null dummies
             keys = 'Also Conflicts'
         # scan for all in SYSTEMD_SERVICE[]
+        extrapaths = base_set_filespath([],d).split(":")
         for pkg_systemd in systemd_packages.split():
             for service in get_package_var(d, 'SYSTEMD_SERVICE', pkg_systemd).split():
                 path_found = ''
@@ -144,6 +147,11 @@ python systemd_populate_packages() {
                     if os.path.exists(oe.path.join(d.getVar("D", True), path, service)):
                         path_found = path
                         break
+                if path_found == '':
+                    for path in extrapaths:
+                        if os.path.exists(oe.path.join(path, service)):
+                            path_found = path
+                            break
                 if path_found != '':
                     systemd_add_files_and_parse(pkg_systemd, path_found, service, keys)
                 else:
-- 
1.7.11.4