[oe-commits] [openembedded-core] 05/20: bluez5: Correct support for building without systemd

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit a751a1f4ab0625cbfedb6445b0da080fc455848f
Author: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
AuthorDate: Sun Sep 17 11:06:04 2017 +0200

    bluez5: Correct support for building without systemd
    
    This avoids the following error when the systemd DISTRO_FEATURE is
    enabled, but the systemd PACKAGECONFIG is not:
    
      ERROR: bluez5-5.46-r0 do_package: SYSTEMD_SERVICE_bluez5 value
      bluetooth.service does not exist
    
    Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-connectivity/bluez5/bluez5.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 2ae4553..1807aa7 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -132,7 +132,7 @@ FILES_${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TO
 
 RDEPENDS_${PN}-testtools += "python3 python3-dbus python3-pygobject"
 
-SYSTEMD_SERVICE_${PN} = "bluetooth.service"
+SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'bluetooth.service', '', d)}"
 INITSCRIPT_PACKAGES = "${PN}"
 INITSCRIPT_NAME_${PN} = "bluetooth"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.