Use new weston-ini-conf scheme and remove old per-machine files

[AGL/meta-agl.git] / meta-app-framework / recipes-config / agl-session / agl-session_0.1.bb

diff --git a/meta-app-framework/recipes-config/agl-session/agl-session_0.1.bb b/meta-app-framework/recipes-config/agl-session/agl-session_0.1.bb
index abde287..de31f99 100644 (file)
--- a/meta-app-framework/recipes-config/agl-session/agl-session_0.1.bb
+++ b/meta-app-framework/recipes-config/agl-session/agl-session_0.1.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca
 SRC_URI = "\
     file://agl-session@.service \
     file://agl-session.target \
+    file://50-xdg-data-dirs.sh \
 "
 
 inherit systemd allarch useradd
@@ -12,10 +13,16 @@ inherit systemd allarch useradd
 USERADD_PACKAGES = "${PN}"
 USERADDEXTENSION = "useradd-staticids"
 GROUPADD_PARAM:${PN} = "\
+       --system display ; \
+       --system video ; \
+       --system pipewire ; \
        -g 1001 agl-driver ; \
+       -g 1003 applaunchd ; \
 "
+
 USERADD_PARAM:${PN} = "\
-  -g 1001 -u 1001 -o -d /home/agl-driver -m -K PASS_MAX_DAYS=-1 agl-driver ; \
+  -g 1001 -u 1001 -G video,display,pipewire -o -d /home/agl-driver -m -K PASS_MAX_DAYS=-1 agl-driver ; \
+  -g 1003 -u 1003 -o -d / -K PASS_MAX_DAYS=-1 applaunchd ; \
 "
 
 SYSTEMD_PACKAGES = "${PN}"
@@ -30,6 +37,13 @@ do_install() {
 
     install -d ${D}${systemd_user_unitdir}
     install -m 0644 ${WORKDIR}/agl-session.target ${D}${systemd_user_unitdir}
+
+    install -d ${D}${libdir}/systemd/user-environment-generators
+    install -m 0755 ${WORKDIR}/50-xdg-data-dirs.sh ${D}${libdir}/systemd/user-environment-generators/
 }
 
-FILES:${PN} += "${systemd_system_unitdir} ${systemd_user_unitdir}"
+FILES:${PN} += " \
+    ${systemd_system_unitdir} \
+    ${systemd_user_unitdir} \
+    ${libdir}/systemd/user-environment-generators/ \
+"