X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl%2Frecipes-connectivity%2Frygel%2Frygel_%25.bbappend;h=bfee4f569d5d1c1b9b69a2fb4a2212e7a14d169b;hb=d3f1e0980eb1cd6b50c6d0af8fb6f80391347e2d;hp=7cfb9c063780636a54ad4b0e4afe021ff544f3a8;hpb=6f0bdfc2c3d11cf18d149593a189c48a2a14e3d2;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl/recipes-connectivity/rygel/rygel_%.bbappend b/meta-agl/recipes-connectivity/rygel/rygel_%.bbappend
index 7cfb9c063..bfee4f569 100644
--- a/meta-agl/recipes-connectivity/rygel/rygel_%.bbappend
+++ b/meta-agl/recipes-connectivity/rygel/rygel_%.bbappend
@@ -1,3 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
 # Disable everything but the media-export plugin, add the lms plugin
 PACKAGECONFIG = "media-export lms"
 PACKAGECONFIG[lms] = "--enable-lms-plugin,--disable-lms-plugin,sqlite3"
@@ -5,18 +7,26 @@ PACKAGECONFIG[lms] = "--enable-lms-plugin,--disable-lms-plugin,sqlite3"
 # LightMediaScanner plugin patches
 SRC_URI += "file://0001-Add-LightMediaScanner-plugin.patch \
             file://0002-lms-add-C-source-files.patch \
+            file://0001-Fix-missing-link-to-unistring-for-lms-plugin.patch \
             file://rygel.service \
             "
 
 inherit systemd
 
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = ""
-SYSTEMD_SERVICE_${PN} += "rygel.service"
-
 do_install_append() {
        # Install rygel systemd service
        if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-              install -p -D ${WORKDIR}/rygel.service ${D}${systemd_unitdir}/system/rygel.service
+              install -m 644 -p -D ${WORKDIR}/rygel.service ${D}${systemd_user_unitdir}/rygel.service
+
+              # Execute these manually on behalf of systemctl script (from systemd-systemctl-native.bb)
+              # because it does not support systemd's user mode.
+              # However, systemctl --global should be checked
+              #mkdir -p ${D}/etc/systemd/user/default.target.wants/
+              #ln -sf ${systemd_user_unitdir}/rygel.service ${D}/etc/systemd/user/dbus-org.gnome.Rygel1.service
+              #ln -sf ${systemd_user_unitdir}/rygel.service ${D}/etc/systemd/user/default.target.wants/rygel.service
        fi
 }
+
+FILES_${PN} += " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_user_unitdir}/rygel.service', '', d)} \
+    "