diff options
Diffstat (limited to 'recipes-demo/cluster-receiver')
4 files changed, 17 insertions, 14 deletions
diff --git a/recipes-demo/cluster-receiver/cluster-receiver/cluster-receiver.service b/recipes-demo/cluster-receiver/cluster-receiver/cluster-receiver.service index e544e25f..bf48afb2 100644 --- a/recipes-demo/cluster-receiver/cluster-receiver/cluster-receiver.service +++ b/recipes-demo/cluster-receiver/cluster-receiver/cluster-receiver.service @@ -6,9 +6,11 @@ After=agl-compositor.service # Since we are part of the agl session, make sure we are started before # it is complete. -Before=agl-session.target +Before=graphical.target [Service] +User=agl-driver +Environment=XDG_RUNTIME_DIR=/run/user/1001/ ExecStart=/usr/bin/xdg-cluster-receiver Restart=always @@ -17,4 +19,4 @@ StandardOutput=journal StandardError=journal [Install] -WantedBy=agl-session.target +WantedBy=graphical.target diff --git a/recipes-demo/cluster-receiver/cluster-receiver_git.bb b/recipes-demo/cluster-receiver/cluster-receiver_git.bb index 59d19da1..c9842ff3 100644 --- a/recipes-demo/cluster-receiver/cluster-receiver_git.bb +++ b/recipes-demo/cluster-receiver/cluster-receiver_git.bb @@ -21,16 +21,14 @@ SRCREV = "ce90cf8dd26d596d65e222a94e64aa51e1c33298" S = "${WORKDIR}/git" -inherit cmake pkgconfig +inherit cmake pkgconfig systemd + +SYSTEMD_SERVICE:${PN} = "${BPN}.service" do_install:append() { - install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_user_unitdir}/${BPN}.service - install -d ${D}${systemd_user_unitdir}/agl-session.target.wants - ln -s ../${BPN}.service ${D}${systemd_user_unitdir}/agl-session.target.wants/${BPN}.service + install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service } -FILES:${PN} += " ${systemd_user_unitdir}" - RDEPENDS:${PN} += " \ gstreamer1.0-plugins-base \ gstreamer1.0-plugins-good \ diff --git a/recipes-demo/cluster-receiver/qt-cluster-receiver/qt-cluster-receiver.service b/recipes-demo/cluster-receiver/qt-cluster-receiver/qt-cluster-receiver.service index bc328f9e..e3e1b952 100644 --- a/recipes-demo/cluster-receiver/qt-cluster-receiver/qt-cluster-receiver.service +++ b/recipes-demo/cluster-receiver/qt-cluster-receiver/qt-cluster-receiver.service @@ -6,9 +6,11 @@ After=agl-compositor.service # Since we are part of the agl session, make sure we are started before # it is complete. -Before=agl-session.target +Before=graphical.target [Service] +User=agl-driver +Environment=XDG_RUNTIME_DIR=/run/user/1001/ ExecStart=/usr/bin/qt-cluster-receiver Restart=always @@ -17,4 +19,4 @@ StandardOutput=journal StandardError=journal [Install] -WantedBy=agl-session.target +WantedBy=graphical.target diff --git a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb index 8d8908c2..d50e9dd1 100644 --- a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb +++ b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb @@ -23,18 +23,19 @@ SRCREV = "b5622ce91307589b03ad5d903214b47ff2277e48" S = "${WORKDIR}/git" -inherit cmake_qt5 pkgconfig +inherit cmake_qt5 pkgconfig systemd do_install:append() { # Only install unit, do not enable it by default - install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_user_unitdir}/${BPN}.service + install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service } -FILES:${PN} += " ${systemd_user_unitdir}" - RDEPENDS:${PN} += " \ qtwayland \ gstreamer1.0-plugins-base \ gstreamer1.0-plugins-good \ gstreamer1.0-plugins-bad \ " + +SYSTEMD_SERVICE:${PN} = "${BPN}.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" |