X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-profile-core%2Frecipes-connectivity%2Fbluez5%2Fbluez5_%25.bbappend;h=db5b09503b344c7dbc73510370e0463b56ba5275;hb=b1c5541c24b1e64d84826df6c0e573ab2c83a4fe;hp=c5afa875f068900f7b96fcac3336d06bf8445a59;hpb=b43165328658087277b667152fdbc04fe07cba08;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend
index c5afa875f..db5b09503 100644
--- a/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend
+++ b/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend
@@ -1,13 +1,25 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
-SRC_URI_append = " file://bluetooth.conf"
-
-APPLY_v522 = "${@str('no' if '${PV}' != '5.22' else 'yes')}"
-
-SRC_URI_append = "\
-    file://0001_fix_compile_issue_when_using_in_c++.patch;apply=${APPLY_v522} \
+SRC_URI_append = " \
+    file://bluetooth.conf \
+    file://tmpdir.conf \
+    file://obex.service \
+    file://bluetooth.service \
+    file://0001-obex-report-notification-status-on-incoming-message.patch \
 "
 
+FILES_${PN} += "${systemd_user_unitdir}/obex.service.d/tmpdir.conf"
 
 do_install_append() {
     install -m 0644 ${WORKDIR}/bluetooth.conf ${D}${sysconfdir}/dbus-1/system.d/bluetooth.conf
+
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        mkdir -p ${D}${systemd_user_unitdir}/obex.service.d
+
+        install -m 0644 ${WORKDIR}/obex.service ${D}${systemd_user_unitdir}
+        install -m 0644 ${WORKDIR}/tmpdir.conf ${D}${systemd_user_unitdir}/obex.service.d/tmpdir.conf
+        mkdir -p ${D}/etc/systemd/user
+        ln -sf ${systemd_user_unitdir}/obex.service ${D}/etc/systemd/user/dbus-org.bluez.obex.service
+        mkdir -p ${systemd_system_unitdir}
+        install -m 0644 ${WORKDIR}/bluetooth.service ${D}${systemd_system_unitdir}
+    fi
 }