aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaud Ferraris <arnaud.ferraris@collabora.com>2021-12-07 19:15:56 +0100
committerArnaud Ferraris <arnaud.ferraris@collabora.com>2021-12-21 09:02:51 +0100
commit864ca525d2edd914d58077bec6faa963b704258a (patch)
tree1587a190c388df769c405ecb162151ee1c8f56b0
parent5d603679f32614ced2569a860d310a67c8ce98f9 (diff)
homescreen: convert to using the new App FW
Bug-AGL: SPEC-4161 Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com> Change-Id: I3f53c4d9143baad15fee59110f5f9fbf64290d6c
-rw-r--r--recipes-demo/homescreen/files/homescreen.service13
-rw-r--r--recipes-demo/homescreen/homescreen_git.bb9
2 files changed, 11 insertions, 11 deletions
diff --git a/recipes-demo/homescreen/files/homescreen.service b/recipes-demo/homescreen/files/homescreen.service
index 6d57ea775..b95d58386 100644
--- a/recipes-demo/homescreen/files/homescreen.service
+++ b/recipes-demo/homescreen/files/homescreen.service
@@ -1,14 +1,11 @@
[Unit]
-Requires=weston.service
-After=weston.service
+Requires=agl-compositor.service
+After=agl-compositor.service
[Service]
-# Placeholder configuration to run as weston user for now.
-User=weston
-Group=weston
-Environment=XDG_RUNTIME_DIR=/run/user/200
-EnvironmentFile=-/etc/default/homescreen
+Type=simple
ExecStart=/usr/bin/homescreen
+Restart=on-failure
[Install]
-WantedBy=graphical.target
+WantedBy=agl-session.target
diff --git a/recipes-demo/homescreen/homescreen_git.bb b/recipes-demo/homescreen/homescreen_git.bb
index 2b183d58c..f04305f2c 100644
--- a/recipes-demo/homescreen/homescreen_git.bb
+++ b/recipes-demo/homescreen/homescreen_git.bb
@@ -14,6 +14,7 @@ DEPENDS = " \
qtwayland \
qtwayland-native \
agl-compositor \
+ applaunchd \
"
PV = "1.0+git${SRCPV}"
@@ -32,13 +33,15 @@ PATH:prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
OE_QMAKE_CXXFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
do_install:append() {
- install -D -p -m0644 ${WORKDIR}/homescreen.service ${D}${systemd_system_unitdir}/homescreen.service
+ install -d ${D}${systemd_user_unitdir}/agl-session.target.wants
+ install -m0644 ${WORKDIR}/homescreen.service ${D}${systemd_user_unitdir}/homescreen.service
+ ln -s ../homescreen.service ${D}${systemd_user_unitdir}/agl-session.target.wants/homescreen.service
}
-SYSTEMD_SERVICE_${PN} = "homescreen.service"
-SYSTEMD_AUTO_ENABLE = "enable"
+FILES:${PN} += " ${systemd_user_unitdir}"
RDEPENDS:${PN} += " \
+ applaunchd \
qtwayland \
qtbase-qmlplugins \
qtgraphicaleffects-qmlplugins \