diff options
Diffstat (limited to 'meta-app-framework/recipes-config')
6 files changed, 10 insertions, 87 deletions
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 deleted file mode 100644 index ecad1615d..000000000 --- a/meta-app-framework/recipes-config/agl-session/agl-session_0.1.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "AGL user session" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -SRC_URI = "\ - file://agl-session@.service \ - file://agl-session.target \ - file://50-xdg-data-dirs.sh \ -" - -inherit systemd allarch useradd - -USERADD_PACKAGES = "${PN}" -USERADDEXTENSION = "useradd-staticids" -GROUPADD_PARAM:${PN} = "\ - --system display ; \ - --system video ; \ - --system pipewire ; \ - -g 1001 agl-driver ; \ -" -USERADD_PARAM:${PN} = "\ - -g 1001 -u 1001 -G video,display,pipewire -o -d /home/agl-driver -m -K PASS_MAX_DAYS=-1 agl-driver ; \ -" - -SYSTEMD_PACKAGES = "${PN}" -# Instantiate session for the 'agl-driver' user, so we don't have to hardcode -# the user name/ID in the service file itself -SYSTEMD_SERVICE:${PN} = "agl-session@agl-driver.service" -SYSTEMD_AUTO_ENABLE:${PN} = "enable" - -do_install() { - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/agl-session@.service ${D}${systemd_system_unitdir} - - 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} \ - ${libdir}/systemd/user-environment-generators/ \ -" diff --git a/meta-app-framework/recipes-config/agl-session/files/50-xdg-data-dirs.sh b/meta-app-framework/recipes-config/agl-session/files/50-xdg-data-dirs.sh deleted file mode 100644 index 15ec3744a..000000000 --- a/meta-app-framework/recipes-config/agl-session/files/50-xdg-data-dirs.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# use a default value if not already set -XDG_DATA_DIRS="${XDG_DATA_DIRS:-/usr/local/share/:/usr/share}" - -# write our output -echo "XDG_DATA_DIRS=${XDG_DATA_DIRS}" diff --git a/meta-app-framework/recipes-config/agl-session/files/agl-session.target b/meta-app-framework/recipes-config/agl-session/files/agl-session.target deleted file mode 100644 index 84d9daa5b..000000000 --- a/meta-app-framework/recipes-config/agl-session/files/agl-session.target +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=AGL user session - -BindsTo=graphical-session.target -Before=graphical-session.target diff --git a/meta-app-framework/recipes-config/agl-session/files/agl-session@.service b/meta-app-framework/recipes-config/agl-session/files/agl-session@.service deleted file mode 100644 index 61afa4141..000000000 --- a/meta-app-framework/recipes-config/agl-session/files/agl-session@.service +++ /dev/null @@ -1,24 +0,0 @@ -[Unit] -Description=AGL user session -After=systemd-user-sessions.service -Wants=dbus.socket -After=dbus.socket -After=session-c1.scope -Before=multi-user.target - -[Service] -Environment=XDG_SESSION_TYPE=wayland -ExecStart=/bin/systemctl --wait --user start agl-session.target -TimeoutStartSec=30 -# This is a template service, instantiate for desired user's name or uid -User=%i -PAMName=login -WorkingDirectory=~ -StandardInput=tty-fail -StandardOutput=journal -StandardError=journal -Restart=always -RestartSec=3s - -[Install] -WantedBy=multi-user.target diff --git a/meta-app-framework/recipes-config/polkit-rule-agl-app/files/50-agl-app.rules b/meta-app-framework/recipes-config/polkit-rule-agl-app/files/50-agl-app.rules index dd4b6940d..35b9559c5 100644 --- a/meta-app-framework/recipes-config/polkit-rule-agl-app/files/50-agl-app.rules +++ b/meta-app-framework/recipes-config/polkit-rule-agl-app/files/50-agl-app.rules @@ -1,7 +1,7 @@ polkit.addRule(function(action, subject) { if (action.id == "org.freedesktop.systemd1.manage-units" && action.lookup("unit").indexOf("agl-app") == 0 && - subject.user == "agl-driver") { + subject.isInGroup("applaunchd")) { return polkit.Result.YES; } }); diff --git a/meta-app-framework/recipes-config/polkit-rule-agl-app/polkit-rule-agl-app.bb b/meta-app-framework/recipes-config/polkit-rule-agl-app/polkit-rule-agl-app.bb index 920bb86b3..57dda7787 100644 --- a/meta-app-framework/recipes-config/polkit-rule-agl-app/polkit-rule-agl-app.bb +++ b/meta-app-framework/recipes-config/polkit-rule-agl-app/polkit-rule-agl-app.bb @@ -6,11 +6,16 @@ SRC_URI = "file://50-agl-app.rules" DEPENDS += "polkit" -inherit features_check +inherit useradd features_check REQUIRED_DISTRO_FEATURES = "polkit" do_install() { - install -m 700 -d ${D}${sysconfdir}/polkit-1/rules.d - chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d - install -m 0644 ${WORKDIR}/50-agl-app.rules ${D}${sysconfdir}/polkit-1/rules.d + install -m 700 -d ${D}${datadir}/polkit-1/rules.d + chown polkitd:root ${D}/${datadir}/polkit-1/rules.d + install -m 0644 ${WORKDIR}/50-agl-app.rules ${D}${datadir}/polkit-1/rules.d } + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} += "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;" + +FILES:${PN} += "${datadir}/polkit-1/rules.d/*.rules" |