diff options
Diffstat (limited to 'meta-app-framework/recipes-core')
3 files changed, 31 insertions, 9 deletions
diff --git a/meta-app-framework/recipes-core/applaunchd/applaunchd/agl-app-web@.service b/meta-app-framework/recipes-core/applaunchd/applaunchd/agl-app-web@.service new file mode 100644 index 000000000..3b736a5d2 --- /dev/null +++ b/meta-app-framework/recipes-core/applaunchd/applaunchd/agl-app-web@.service @@ -0,0 +1,10 @@ +[Unit] +Description=%I + +[Service] +Type=simple +User=agl-driver +Environment=XDG_RUNTIME_DIR=/run/user/1001/ +Environment=AGL_APP_WAM_DIR=%I +ExecStart=/usr/bin/WebAppMgr --appid=%I --app-install-dir=/usr/lib/wam_apps/${AGL_APP_WAM_DIR}/ + diff --git a/meta-app-framework/recipes-core/applaunchd/applaunchd/agl-app@.service b/meta-app-framework/recipes-core/applaunchd/applaunchd/agl-app@.service index c8361fa0a..234348846 100644 --- a/meta-app-framework/recipes-core/applaunchd/applaunchd/agl-app@.service +++ b/meta-app-framework/recipes-core/applaunchd/applaunchd/agl-app@.service @@ -1,8 +1,8 @@ [Unit] -Description=Sandboxed %I +Description=%I [Service] Type=simple User=agl-driver -ExecStart=%i Environment=XDG_RUNTIME_DIR=/run/user/1001/ +ExecStart=%i 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}" |