From 321af7331c91a174b52eb5e17d8ab5b3e72ce5cb Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 27 Jul 2022 16:50:30 -0400 Subject: meta-app-framework: Update app template scheme Changes to support the move to systemd unit based app enumeration in applaunchd: - Bump applaunchd SRCREV to pick up enumeration changes. - Tweak the polkit rule to match agl-app* instead of agl-app@* to allow more flexibility with respect to different app templates. - Tweak the Description field definition in the agl-app service template to just use the instance name, as that field is now used for the application display name by applaunchd. - Add a agl-app-web service template for web apps. - Add a agl-app.bbclass for use in application recipes to simplify installation of the now required systemd template instances and potential generation of override files to tweak application configuration. - Split the agl-app and agl-app-web templates into their own packages in the applaunchd recipe so they can be depended on by applications as required. - Move applaunchd installed systemd units and override files to /lib/systemd/system since that matches the upstream recommendation for units installed as part of the system installation. Bug-AGL: SPEC-4466 Signed-off-by: Scott Murray Change-Id: I32ff6c9624850662856b79a2b14b33a05e7f9a65 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/27835 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jose Dapena Paz Reviewed-by: Jan-Simon Moeller --- .../recipes-core/applaunchd/applaunchd_git.bb | 26 ++++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'meta-app-framework/recipes-core/applaunchd/applaunchd_git.bb') diff --git a/meta-app-framework/recipes-core/applaunchd/applaunchd_git.bb b/meta-app-framework/recipes-core/applaunchd/applaunchd_git.bb index 5c2036a78..0aef4e003 100644 --- a/meta-app-framework/recipes-core/applaunchd/applaunchd_git.bb +++ b/meta-app-framework/recipes-core/applaunchd/applaunchd_git.bb @@ -16,10 +16,11 @@ PV = "2.0+git${SRCPV}" SRC_URI = " \ git://gerrit.automotivelinux.org/gerrit/src/applaunchd;protocol=https;branch=${AGL_BRANCH} \ file://agl-app@.service \ + file://agl-app-web@.service \ file://no-network.conf \ file://private-tmp.conf \ " -SRCREV = "efbd734aca8b813710d7564d79696b1cf150a88c" +SRCREV = "c675bafdf15cc19276bd8276c34f56404a5ecb62" S = "${WORKDIR}/git" @@ -27,18 +28,29 @@ inherit meson pkgconfig do_install:append() { # Install generic template for all agl-app services - mkdir -p ${D}${sysconfdir}/systemd/system/ - install -m 644 ${WORKDIR}/agl-app@.service ${D}${sysconfdir}/systemd/system/ + install -d ${D}${systemd_system_unitdir} + install -m 644 ${WORKDIR}/agl-app@.service ${D}${systemd_system_unitdir}/ + install -m 644 ${WORKDIR}/agl-app-web@.service ${D}${systemd_system_unitdir}/ # Install individual sandboxing overrides/drop-ins to be used by apps - mkdir -p ${D}${sysconfdir}/systemd/sandboxing/ - install -m 644 ${WORKDIR}/no-network.conf ${D}${sysconfdir}/systemd/sandboxing/ - install -m 644 ${WORKDIR}/private-tmp.conf ${D}${sysconfdir}/systemd/sandboxing/ + install -d ${D}${systemd_system_unitdir}/sandboxing + install -m 644 ${WORKDIR}/no-network.conf ${D}${systemd_system_unitdir}/sandboxing/ + install -m 644 ${WORKDIR}/private-tmp.conf ${D}${systemd_system_unitdir}/sandboxing/ } -FILES:${PN} += " ${datadir}/dbus-1/" +PACKAGE_BEFORE_PN += "${PN}-template-agl-app ${PN}-template-agl-app-web" + +FILES:${PN} += "${systemd_system_unitdir} ${datadir}/dbus-1/" + +FILES:${PN}-template-agl-app = "${systemd_system_unitdir}/agl-app@.service" + +FILES:${PN}-template-agl-app-web = "${systemd_system_unitdir}/agl-app-web@.service" RDEPENDS:${PN} += " \ agl-session \ polkit-rule-agl-app \ " + +RDEPENDS:${PN}-template-agl-app = "${PN}" + +RDEPENDS:${PN}-template-agl-app-web = "${PN}" -- cgit 1.2.3-korg