From 95a0f0ef7fec815b0b571b30e1e71ff2a3ea9021 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Tue, 31 May 2022 19:54:25 +0200 Subject: [PATCH] html5-settings: recover HTML5 settings application. Add updated html5-settings: * Fixes build with new application framework providing network and bluetooth mocks. * Updates NPM dependencies. * Updates recipe for kirkstone. Bug-AGL: SPEC-4248 Signed-off-by: Jose Dapena Paz Change-Id: I8dad730edd693ed69c0d5387b6e5ef8674356cb0 --- .../html5-settings/files/webapps-settings.desktop | 11 ++++++ recipes-demo/html5-settings/html5-settings_git.bb | 42 ++++++++++++++++++++++ .../packagegroup-agl-demo-platform-html5.bb | 2 +- 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 recipes-demo/html5-settings/files/webapps-settings.desktop create mode 100644 recipes-demo/html5-settings/html5-settings_git.bb diff --git a/recipes-demo/html5-settings/files/webapps-settings.desktop b/recipes-demo/html5-settings/files/webapps-settings.desktop new file mode 100644 index 000000000..d1081bf4b --- /dev/null +++ b/recipes-demo/html5-settings/files/webapps-settings.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Name=HTML5 Settings +Comment=Settings +GenericName=Settings +Exec=/usr/bin/WebAppMgr --appid=webapps-settings --app-install-dir=/usr/lib/wam_apps/html5-settings/ +Icon=settings +Terminal=false +Type=Application +Categories=System; +StartupNotify=true diff --git a/recipes-demo/html5-settings/html5-settings_git.bb b/recipes-demo/html5-settings/html5-settings_git.bb new file mode 100644 index 000000000..edbd80f2c --- /dev/null +++ b/recipes-demo/html5-settings/html5-settings_git.bb @@ -0,0 +1,42 @@ +SUMMARY = "AGL HTML5 settings Application" +HOMEPAGE = "https://git.automotivelinux.org/apps/html5-settings/" +SECTION = "apps" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +PV = "1.0+git${SRCPV}" +S = "${WORKDIR}/git" +B = "${WORKDIR}/build" + +SRC_URI = " \ + git://gerrit.automotivelinux.org/gerrit/apps/html5-settings;protocol=https;branch=master \ + file://webapps-settings.desktop \ +" +SRCREV = "69af4d9b9b209fcb33ef9071ddfa8561106044c2" + +inherit pythonnative + +DEPENDS = "nodejs-native" + +do_compile[network] = "1" +do_compile() { + cd ${S} + rm -rf package node_modules package-lock.json + npm install + npm run build +} + +WAM_APPLICATIONS_DIR="${libdir}/wam_apps" +APPLICATIONS_DIR="${datadir}/applications" + +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}/webapps-settings.desktop ${D}${APPLICATIONS_DIR} +} + +FILES:${PN} = " \ + ${WAM_APPLICATIONS_DIR}/${PN} \ + ${APPLICATIONS_DIR} \ +" diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb index 056faa01d..d91c96ef1 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb @@ -35,7 +35,7 @@ AGL_APPS = " \ html5-homescreen \ html5-hvac \ ondemandnavi \ - settings \ + html5-settings \ " # TODO(jdapena): review if we still need the demo-i2c stuff. -- 2.16.6