diff options
author | 2025-01-31 11:15:33 +0200 | |
---|---|---|
committer | 2025-02-04 20:00:18 +0000 | |
commit | 2080ac3aeaaf40d8ed2151a2b2a5d09987d5ecba (patch) | |
tree | e830ec319735be08ef5da76914d578f45859213e | |
parent | d69905231c223cdc000249e01384fc94b2dd76b5 (diff) |
ula-tools-agl: Add ula-tools-agl package
This is identical to the ula-tools but with a slighly different service file
to pick-up uhmi-agl-wm instead of uhmi-ivi-wm.
Bug-AGL: SPEC-5280
Change-Id: Ie3a825cacff7975e976623c23cc95aaf9c26504e
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
3 files changed, 85 insertions, 1 deletions
diff --git a/meta-uhmi/recipes-core/ula-tools/files/ula-node-agl.service b/meta-uhmi/recipes-core/ula-tools/files/ula-node-agl.service new file mode 100644 index 00000000..d07dd406 --- /dev/null +++ b/meta-uhmi/recipes-core/ula-tools/files/ula-node-agl.service @@ -0,0 +1,15 @@ +[Unit] +Description=ula-node +Requires=uhmi-agl-wm.service +After=uhmi-agl-wm.service + +[Service] +Type=idle +ExecStart=/usr/bin/ula-node +KillSignal=SIGTERM +TimeoutStopSec=10 +Restart=always +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/meta-uhmi/recipes-core/ula-tools/ula-tools-agl_git.bb b/meta-uhmi/recipes-core/ula-tools/ula-tools-agl_git.bb new file mode 100644 index 00000000..f5d1c888 --- /dev/null +++ b/meta-uhmi/recipes-core/ula-tools/ula-tools-agl_git.bb @@ -0,0 +1,69 @@ +SUMMARY = "Unified HMI Layout Tools" +SECTION = "graphics" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://src/ula-tools/LICENSE.md;md5=e789951aab02a3028d2e58b90fc933ba" + +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +PN="ula-tools-agl" +PROVIDES += "ula-tools-agl" + +SRCREV = "4403efd88fd4e79b092787ac727afe996dd7ca12" +BRANCH ?= "main" +SRC_URI = " \ + git://github.com/unified-hmi/ula-tools.git;protocol=https;branch=${BRANCH} \ +" +PV = "0.0+git${SRCPV}" + +S = "${WORKDIR}/git" + +export GO111MODULE="auto" + +GO_IMPORT = "ula-tools" +GO_INSTALL = " ${GO_IMPORT}/cmd/ula-distrib-com ${GO_IMPORT}/cmd/ula-node" + +inherit go +RDEPENDS:${PN} = "jq bash" +RDEPENDS:${PN}-dev = "bash" + +inherit systemd features_check + +SRC_URI += " \ + file://ula-node-agl.service \ + file://virtual-screen-def.json \ + " + +REQUIRED_DISTRO_FEATURES = "systemd" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "ula-node.service" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" +FILES:${PN} += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_system_unitdir}/${SYSTEMD_SERVICE}', '', d)} \ + /etc/uhmi-framework/virtual-screen-def.json \ + " + +do_compile:append() { + export CGO_ENABLED="1" + export GOFLAGS="-mod=vendor -trimpath" + ${GO} build -buildmode=c-shared -o ${GOPATH}/pkg/libulaclient.so -v -ldflags '-extldflags "-Wl,-soname=libulaclient.so"' ${GO_IMPORT}/pkg/ula-client-lib +} + +do_install:append() { + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_system_unitdir} + install -m 644 ${WORKDIR}/*.service ${D}/${systemd_system_unitdir}/ula-node.service + fi + + install -d ${D}/etc/uhmi-framework + install -m 644 ${WORKDIR}/virtual-screen-def.json ${D}/etc/uhmi-framework + + install -d ${D}${libdir} + install -m 0755 ${GOPATH}/pkg/libulaclient.so ${D}${libdir} + + install -d ${D}${includedir} + install -m 644 ${GOPATH}/pkg/libulaclient.h ${D}${includedir} +} + +FILES:${PN} += "${libdir}" +FILES:${PN} += "${includedir}" diff --git a/meta-uhmi/recipes-platform/packagegroups/packagegroup-ddfw-agl.bb b/meta-uhmi/recipes-platform/packagegroups/packagegroup-ddfw-agl.bb index fac19dd3..88a65d6a 100644 --- a/meta-uhmi/recipes-platform/packagegroups/packagegroup-ddfw-agl.bb +++ b/meta-uhmi/recipes-platform/packagegroups/packagegroup-ddfw-agl.bb @@ -5,7 +5,7 @@ inherit packagegroup RDEPENDS:${PN} += " \ ucl-tools \ - ula-tools \ + ula-tools-agl \ uhmi-agl-wm \ agl-compositor \ " |