[OE-core] [oe-commits] Cristian Iorga : bluez4: add proper systemd support

[Martin Jansa]

On Sun, Apr 26, 2015 at 09:58:38PM +0000, git at git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master-next
> Commit: c7fe8d52563619e2a248255ee7225593f5bb498f
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c7fe8d52563619e2a248255ee7225593f5bb498f
> 
> Author: Cristian Iorga <cristian.iorga at intel.com>
> Date:   Thu Apr 23 17:38:33 2015 +0300
> 
> bluez4: add proper systemd support
> 
> Signed-off-by: Cristian Iorga <cristian.iorga at intel.com>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

This seems to break gst-plugin-bluetooth which is using the same
bluez4.inc, but doesn't have systemd support:

meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb,
do_package

ERROR: Function failed: SYSTEMD_SERVICE_gst-plugin-bluetooth value bluetooth.service does not exist
ERROR: Logfile of failure stored in: /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/gst-plugin-bluetooth/4.101-r1/temp/log.do_package.7708
Log data follows:
| DEBUG: Executing python function sstate_task_prefunc
| DEBUG: Python function sstate_task_prefunc finished
| DEBUG: Executing python function do_package
| DEBUG: Executing python function package_get_auto_pr
| DEBUG: Python function package_get_auto_pr finished
| DEBUG: Executing python function perform_packagecopy
| DEBUG: Python function perform_packagecopy finished
| DEBUG: Executing python function split_and_strip_files
| DEBUG: runstrip: 'i586-oe-linux-strip' --remove-section=.comment --remove-section=.note --strip-unneeded '/home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/gst-plugin-bluetooth/4.101-r1/package/usr/lib/gstreamer-0.10/libgstbluetooth.so' -o '/home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/gst-plugin-bluetooth/4.101-r1/package/usr/lib/gstreamer-0.10/libgstbluetooth.so.tmp' && chown --reference='/home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/gst-plugin-bluetooth/4.101-r1/package/usr/lib/gstreamer-0.10/libgstbluetooth.so' '/home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/gst-plugin-bluetooth/4.101-r1/package/usr/lib/gstreamer-0.10/libgstbluetooth.so.tmp' && mv '/home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/gst-plugin-bluetooth/4.101-r1/package/usr/lib/gstreamer-0.10/libgstbluetooth.so.tmp' '/home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/gst-plugin-bluetooth/4.101-r1/package/usr/lib/gstreamer-0.10/libgstbluetooth.so'
| DEBUG: Python function split_and_strip_files finished
| DEBUG: Executing python function fixup_perms
| DEBUG: Python function fixup_perms finished
| DEBUG: Executing python function split_gstreamer10_packages
| DEBUG: Python function split_gstreamer10_packages finished
| DEBUG: Executing python function systemd_populate_packages
| DEBUG: adding systemd calls to postinst/postrm for gst-plugin-bluetooth
| DEBUG: Python function systemd_populate_packages finished
| DEBUG: Python function do_package finished
| ERROR: Function failed: SYSTEMD_SERVICE_gst-plugin-bluetooth value bluetooth.service does not exist
NOTE: recipe gst-plugin-bluetooth-4.101-r1: task do_package: Failed
ERROR: Task 31556 (/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb, do_package) failed with exit code '1'


> 
> ---
> 
>  meta/recipes-connectivity/bluez/bluez4.inc | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
> index 11c9616..948b495 100644
> --- a/meta/recipes-connectivity/bluez/bluez4.inc
> +++ b/meta/recipes-connectivity/bluez/bluez4.inc
> @@ -13,9 +13,11 @@ RDEPENDS_${PN}-dev = "bluez-hcidump"
>  PACKAGECONFIG ??= "\
>      ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\
>      ${@bb.utils.contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\
> +    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd','systemd', '', d)} \
>  "
>  PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
>  PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,"
> +PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
>  
>  ASNEEDED = ""
>  
> @@ -24,7 +26,7 @@ SRC_URI = "\
>  "
>  S = "${WORKDIR}/bluez-${PV}"
>  
> -inherit autotools-brokensep pkgconfig
> +inherit autotools-brokensep pkgconfig systemd
>  
>  EXTRA_OECONF = "\
>    --disable-gstreamer \
> @@ -43,4 +45,6 @@ EXTRA_OECONF = "\
>    --with-udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \
>  "
>  
> +SYSTEMD_SERVICE_${PN} = "bluetooth.service"
> +
>  EXCLUDE_FROM_WORLD = "1"
> 
> -- 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com