From aa6100e48b4beabe8cb5371fb88a98aebe58a996 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 7 Jul 2022 16:26:45 +0000 Subject: [PATCH] recipes-demo: update application's .desktop files for systemd execution Initial version of applaunchd with systemd_manager still uses .desktop files for enumeration purposes and requires DBusActivatable=true to indicate apps that should be launched as systemd services. This will be addressed in the new revision of applaunchd and hopefully .desktop files dropped completely. Bug-AGL: SPEC-4466 Signed-off-by: Denys Dmytriyenko Change-Id: I3bcea79ec653fc834a39be4135ed4c008d5979db --- recipes-demo/dashboard/dashboard_git.bb | 6 ++++++ recipes-demo/hvac/hvac_git.bb | 6 ++++++ recipes-demo/mediaplayer/mediaplayer_git.bb | 6 ++++++ recipes-demo/messaging/messaging_git.bb | 6 ++++++ recipes-demo/navigation/ondemandnavi_git.bb | 6 ++++++ recipes-demo/phone/phone_git.bb | 6 ++++++ recipes-demo/radio/radio_git.bb | 6 ++++++ recipes-demo/settings/settings_git.bb | 6 ++++++ 8 files changed, 48 insertions(+) diff --git a/recipes-demo/dashboard/dashboard_git.bb b/recipes-demo/dashboard/dashboard_git.bb index 9f5dba83a..70b5ad4b7 100644 --- a/recipes-demo/dashboard/dashboard_git.bb +++ b/recipes-demo/dashboard/dashboard_git.bb @@ -37,6 +37,12 @@ do_install:append() { install -m 0644 ${WORKDIR}/dashboard.token ${D}${sysconfdir}/xdg/AGL/dashboard/ } +# HACK: new systemd-enabled applaunchd for now relies on .desktop and DBusActivatable +do_install:append() { + sed -n "/^DBusActivatable=/!p" -i ${D}${datadir}/applications/dashboard.desktop + echo "DBusActivatable=true" >> ${D}${datadir}/applications/dashboard.desktop +} + FILES:${PN} += "${datadir}/icons/" RDEPENDS:${PN} += " \ diff --git a/recipes-demo/hvac/hvac_git.bb b/recipes-demo/hvac/hvac_git.bb index 8b4b090d1..99a22e364 100644 --- a/recipes-demo/hvac/hvac_git.bb +++ b/recipes-demo/hvac/hvac_git.bb @@ -39,6 +39,12 @@ do_install:append() { install -m 0644 ${WORKDIR}/hvac.token ${D}${sysconfdir}/xdg/AGL/hvac/ } +# HACK: new systemd-enabled applaunchd for now relies on .desktop and DBusActivatable +do_install:append() { + sed -n "/^DBusActivatable=/!p" -i ${D}${datadir}/applications/hvac.desktop + echo "DBusActivatable=true" >> ${D}${datadir}/applications/hvac.desktop +} + FILES:${PN} += "${datadir}/icons/" RDEPENDS:${PN} += " \ diff --git a/recipes-demo/mediaplayer/mediaplayer_git.bb b/recipes-demo/mediaplayer/mediaplayer_git.bb index 897099af2..9458212ad 100644 --- a/recipes-demo/mediaplayer/mediaplayer_git.bb +++ b/recipes-demo/mediaplayer/mediaplayer_git.bb @@ -33,6 +33,12 @@ do_install:append() { install -m 0644 ${WORKDIR}/mediaplayer.token ${D}${sysconfdir}/xdg/AGL/mediaplayer/ } +# HACK: new systemd-enabled applaunchd for now relies on .desktop and DBusActivatable +do_install:append() { + sed -n "/^DBusActivatable=/!p" -i ${D}${datadir}/applications/mediaplayer.desktop + echo "DBusActivatable=true" >> ${D}${datadir}/applications/mediaplayer.desktop +} + FILES:${PN} += "${datadir}/icons/" RDEPENDS:${PN} += "libqtappfw mpd" diff --git a/recipes-demo/messaging/messaging_git.bb b/recipes-demo/messaging/messaging_git.bb index 31ca7ce0d..c7ce8cb39 100644 --- a/recipes-demo/messaging/messaging_git.bb +++ b/recipes-demo/messaging/messaging_git.bb @@ -17,6 +17,12 @@ S = "${WORKDIR}/git" inherit qmake5 pkgconfig +# HACK: new systemd-enabled applaunchd for now relies on .desktop and DBusActivatable +do_install:append() { + sed -n "/^DBusActivatable=/!p" -i ${D}${datadir}/applications/messaging.desktop + echo "DBusActivatable=true" >> ${D}${datadir}/applications/messaging.desktop +} + FILES:${PN} += "${datadir}/icons/" RDEPENDS:${PN} += "libqtappfw" diff --git a/recipes-demo/navigation/ondemandnavi_git.bb b/recipes-demo/navigation/ondemandnavi_git.bb index da198025f..d1069c315 100644 --- a/recipes-demo/navigation/ondemandnavi_git.bb +++ b/recipes-demo/navigation/ondemandnavi_git.bb @@ -33,6 +33,12 @@ do_install:append() { install -m 0644 ${WORKDIR}/navigation.token ${D}${sysconfdir}/xdg/AGL/navigation/ } +# HACK: new systemd-enabled applaunchd for now relies on .desktop and DBusActivatable +do_install:append() { + sed -n "/^DBusActivatable=/!p" -i ${D}${datadir}/applications/navigation.desktop + echo "DBusActivatable=true" >> ${D}${datadir}/applications/navigation.desktop +} + FILES:${PN} += "${datadir}/icons/" RDEPENDS:${PN} += " \ diff --git a/recipes-demo/phone/phone_git.bb b/recipes-demo/phone/phone_git.bb index 61050bc31..e8b8d9ab6 100644 --- a/recipes-demo/phone/phone_git.bb +++ b/recipes-demo/phone/phone_git.bb @@ -17,6 +17,12 @@ S = "${WORKDIR}/git" inherit qmake5 pkgconfig +# HACK: new systemd-enabled applaunchd for now relies on .desktop and DBusActivatable +do_install:append() { + sed -n "/^DBusActivatable=/!p" -i ${D}${datadir}/applications/phone.desktop + echo "DBusActivatable=true" >> ${D}${datadir}/applications/phone.desktop +} + FILES:${PN} += "${datadir}/icons/ ${datadir}/sounds/" RDEPENDS:${PN} += "libqtappfw" diff --git a/recipes-demo/radio/radio_git.bb b/recipes-demo/radio/radio_git.bb index 57b6df8be..fcbbd634c 100644 --- a/recipes-demo/radio/radio_git.bb +++ b/recipes-demo/radio/radio_git.bb @@ -31,6 +31,12 @@ do_install:append() { install -m 0644 ${WORKDIR}/presets-${AGL_RADIO_PRESETS_LOCALE}.conf ${D}${sysconfdir}/xdg/AGL/radio-presets.conf } +# HACK: new systemd-enabled applaunchd for now relies on .desktop and DBusActivatable +do_install:append() { + sed -n "/^DBusActivatable=/!p" -i ${D}${datadir}/applications/radio.desktop + echo "DBusActivatable=true" >> ${D}${datadir}/applications/radio.desktop +} + FILES:${PN} += "${sysconfdir}/xdg/AGL/* ${datadir}/icons/" RDEPENDS:${PN} += "libqtappfw" diff --git a/recipes-demo/settings/settings_git.bb b/recipes-demo/settings/settings_git.bb index 84d830cdf..0f31860ad 100644 --- a/recipes-demo/settings/settings_git.bb +++ b/recipes-demo/settings/settings_git.bb @@ -23,6 +23,12 @@ S = "${WORKDIR}/git" inherit qmake5 pkgconfig +# HACK: new systemd-enabled applaunchd for now relies on .desktop and DBusActivatable +do_install:append() { + sed -n "/^DBusActivatable=/!p" -i ${D}${datadir}/applications/settings.desktop + echo "DBusActivatable=true" >> ${D}${datadir}/applications/settings.desktop +} + FILES:${PN} += "${datadir}/icons/" RDEPENDS:${PN} += " \ -- 2.16.6