From 731adc93b2fed74bc4410dff510fb019d10f253f Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Wed, 27 Jul 2022 17:02:54 -0400
Subject: Updates for application enumeration via systemd units

Update application recipes to use the new agl-app.bbclass to install
the now required by applaunchd systemd template unit instances.  The
previously used .desktop files have been removed, and it is believed
that the required configuration with respect to application display
names has been captured in the new agl-app configuration variables.

Bug-AGL: SPEC-4466

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I2925a68f911646c287bc7128bb0e5f43d55ce7bf
---
 recipes-demo/html5-launcher/files/launcher.desktop | 11 -----------
 recipes-demo/html5-launcher/html5-launcher_git.bb  | 17 +++++++----------
 2 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 recipes-demo/html5-launcher/files/launcher.desktop

(limited to 'recipes-demo/html5-launcher')

diff --git a/recipes-demo/html5-launcher/files/launcher.desktop b/recipes-demo/html5-launcher/files/launcher.desktop
deleted file mode 100644
index b3e8e4390..000000000
--- a/recipes-demo/html5-launcher/files/launcher.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=HTML5 Launcher
-Comment=Launcher
-GenericName=Launcher
-Exec=/usr/bin/WebAppMgr --appid=launcher --app-install-dir=/usr/lib/wam_apps/html5-launcher/
-Icon=settings
-Terminal=false
-Type=Application
-Categories=System;
-StartupNotify=true
diff --git a/recipes-demo/html5-launcher/html5-launcher_git.bb b/recipes-demo/html5-launcher/html5-launcher_git.bb
index 83e7f8070..3595423b9 100644
--- a/recipes-demo/html5-launcher/html5-launcher_git.bb
+++ b/recipes-demo/html5-launcher/html5-launcher_git.bb
@@ -10,11 +10,14 @@ B       = "${WORKDIR}/build"
 
 SRC_URI = " \
   git://gerrit.automotivelinux.org/gerrit/apps/html5-launcher;protocol=https;branch=master \
-  file://launcher.desktop \
 "
 SRCREV = "1283e3bddd4655be0d5208fbbcd9535f8f1ff0f6"
 
-inherit pythonnative
+inherit pythonnative agl-app
+
+AGL_APP_TEMPLATE = "agl-app-web"
+AGL_APP_ID = "launcher"
+AGL_APP_NAME = "HTML5 Launcher"
 
 DEPENDS = "nodejs-native"
 
@@ -26,20 +29,14 @@ do_compile() {
   npm run build
 }
 
-WAM_APPLICATIONS_DIR="${libdir}/wam_apps"
-APPLICATIONS_DIR="${datadir}/applications"
+WAM_APPLICATIONS_DIR = "${libdir}/wam_apps"
 
 do_install() {
   install -d ${D}${WAM_APPLICATIONS_DIR}/${PN}
   cp -R --no-dereference --preserve=mode,links ${S}/dist/* ${D}${WAM_APPLICATIONS_DIR}/${PN}
-  install -d ${D}${APPLICATIONS_DIR}
-  install ${WORKDIR}/launcher.desktop ${D}${APPLICATIONS_DIR}
 }
 
-FILES:${PN} = " \
-  ${WAM_APPLICATIONS_DIR}/${PN} \
-  ${APPLICATIONS_DIR} \
-"
+FILES:${PN} = "${WAM_APPLICATIONS_DIR}/${PN}"
 
 RCONFLICTS:${PN} = "launcher"
 RDEPENDS:${PN} = "applaunchd"
-- 
cgit 1.2.3-korg