diff options
18 files changed, 125 insertions, 39 deletions
diff --git a/meta-egvirt/recipes-extended/vhost-device-sound/vhost-device-sound_0.2.0.bb b/meta-egvirt/recipes-extended/vhost-device-sound/vhost-device-sound_0.2.0.bb index 2520e481..eaafe9de 100644 --- a/meta-egvirt/recipes-extended/vhost-device-sound/vhost-device-sound_0.2.0.bb +++ b/meta-egvirt/recipes-extended/vhost-device-sound/vhost-device-sound_0.2.0.bb @@ -27,4 +27,6 @@ inherit cargo inherit cargo-update-recipe-crates inherit pkgconfig +export BINDGEN_EXTRA_CLANG_ARGS= "--sysroot=${STAGING_DIR_TARGET}" + include vhost-device-sound-crates.inc diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/udev/uhmi-udev-conf/99-uhmi-user.rules b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/udev/uhmi-udev-conf/99-uhmi-user.rules new file mode 100644 index 00000000..bf75adf1 --- /dev/null +++ b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/udev/uhmi-udev-conf/99-uhmi-user.rules @@ -0,0 +1,4 @@ +KERNEL=="virtio-lo", GROUP="video", MODE="0660" +KERNEL=="uinput", RUN="/usr/bin/chown agl-driver:input /dev/uinput" +SUBSYSTEM=="drm", KERNEL=="card[1-9]*", ACTION=="add", PROGRAM="/bin/bash -c '[ -f /tmp/rvgpu-index ] && cat /tmp/rvgpu-index || echo \"\"'", RUN="/usr/bin/chown agl-driver:video /dev/dri/rvgpu_virtio%c" +SUBSYSTEM=="input", KERNEL=="event[1-9]*", ACTION=="add", ATTRS{name}=="rvgpu*", PROGRAM="/bin/bash -c '[ -f /tmp/rvgpu-index ] && cat /tmp/rvgpu-index || echo \"\"'", RUN="/usr/bin/chown agl-driver:input /dev/input/%s{name}%c" diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/udev/uhmi-udev-conf_1.0.bb b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/udev/uhmi-udev-conf_1.0.bb new file mode 100644 index 00000000..6566208d --- /dev/null +++ b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/udev/uhmi-udev-conf_1.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "UHMI kernel devices user udev configuration" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SRC_URI = "file://99-uhmi-user.rules" + +do_compile[noexec] = "1" + +do_install() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${WORKDIR}/99-uhmi-user.rules ${D}${sysconfdir}/udev/rules.d/ + fi +} + +FILES:${PN} += "${systemd_system_unitdir}" + +RDEPENDS:${PN} += "udev" diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/app.json b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/app.json index 1dcce8aa..4da7020d 100644 --- a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/app.json +++ b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/app.json @@ -28,7 +28,7 @@ "listen_port" : 33445, "initial_screen_color" : "0x33333333" }, - "env" : "XDG_RUNTIME_DIR=/run/user/200 WAYLAND_DISPLAY=wayland-1" + "env" : "" }, { "launcher" : "agl-host1", @@ -42,7 +42,7 @@ "listen_port" : 33445, "initial_screen_color" : "0x33333333" }, - "env" : "XDG_RUNTIME_DIR=/run/user/200 WAYLAND_DISPLAY=wayland-1" + "env" : "" } ] } diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/wired-receiver.config b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/wired-receiver.config deleted file mode 100644 index 9d6b3a63..00000000 --- a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/wired-receiver.config +++ /dev/null @@ -1,7 +0,0 @@ -[global] -Name = Wired -Description = Wired network configuration - -[service_ether] -Type = ethernet -IPv4 = 192.168.0.101/24 diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/wired-sender.config b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/wired-sender.config deleted file mode 100644 index 777a3e95..00000000 --- a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/wired-sender.config +++ /dev/null @@ -1,7 +0,0 @@ -[global] -Name = Wired -Description = Wired network configuration - -[service_ether] -Type = ethernet -IPv4 = 192.168.0.100/24 diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/uhmi-config-receiver.bb b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/uhmi-config-receiver.bb index 94092b13..b0b9a17e 100644 --- a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/uhmi-config-receiver.bb +++ b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/uhmi-config-receiver.bb @@ -3,20 +3,11 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = " \ - file://wired-receiver.config \ file://uhmi-ivi-wm.conf \ " do_install() { - if [ ! -e ${D}/var/lib/connman/wired.config ]; then - install -d ${D}/var/lib/connman/ - install -m 6444 ${WORKDIR}/wired-receiver.config ${D}/var/lib/connman/wired.config - fi - install -d ${D}/etc/systemd/system/uhmi-ivi-wm.service.d/ install -m 0644 ${WORKDIR}/uhmi-ivi-wm.conf ${D}/etc/systemd/system/uhmi-ivi-wm.service.d/ } -FILES:${PN} += " \ - /var/lib/connman/wired.config \ -" diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/uhmi-config-sender.bb b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/uhmi-config-sender.bb index ee854d85..04b20671 100644 --- a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/uhmi-config-sender.bb +++ b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/uhmi-config-sender.bb @@ -5,16 +5,10 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = " \ file://app.json \ file://initial_vscreen.json \ - file://wired-sender.config \ file://uhmi-ivi-wm.conf \ " do_install() { - if [ ! -e ${D}/var/lib/connman/wired.config ]; then - install -d ${D}/var/lib/connman/ - install -m 6444 ${WORKDIR}/wired-sender.config ${D}/var/lib/connman/wired.config - fi - install -d ${D}/var/local/uhmi-app/glmark2 install -m 644 ${WORKDIR}/app.json ${D}/var/local/uhmi-app/glmark2/ install -m 644 ${WORKDIR}/initial_vscreen.json ${D}/var/local/uhmi-app/glmark2/ @@ -24,6 +18,5 @@ do_install() { } FILES:${PN} += " \ - /var/lib/connman/wired.config \ /var/local/uhmi-app/glmark2 \ " diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-platform/images/agl-uhmi-demo-preconfigured-receiver-agl.bb b/meta-uhmi/meta-agl-uhmi-demo/recipes-platform/images/agl-uhmi-demo-preconfigured-receiver-agl.bb index c77dc269..89f19073 100644 --- a/meta-uhmi/meta-agl-uhmi-demo/recipes-platform/images/agl-uhmi-demo-preconfigured-receiver-agl.bb +++ b/meta-uhmi/meta-agl-uhmi-demo/recipes-platform/images/agl-uhmi-demo-preconfigured-receiver-agl.bb @@ -15,6 +15,7 @@ IMAGE_INSTALL += " \ uhmi-config-receiver \ agl-compositor \ native-shell-client \ + uhmi-udev-conf \ " UHMI_HOSTNAME ?= "agl-host1" diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-platform/images/agl-uhmi-demo-preconfigured-sender-agl.bb b/meta-uhmi/meta-agl-uhmi-demo/recipes-platform/images/agl-uhmi-demo-preconfigured-sender-agl.bb index b8033f35..ce47aff6 100644 --- a/meta-uhmi/meta-agl-uhmi-demo/recipes-platform/images/agl-uhmi-demo-preconfigured-sender-agl.bb +++ b/meta-uhmi/meta-agl-uhmi-demo/recipes-platform/images/agl-uhmi-demo-preconfigured-sender-agl.bb @@ -16,6 +16,7 @@ IMAGE_INSTALL += " \ agl-compositor \ native-shell-client \ glmark2 \ + uhmi-udev-conf \ " UHMI_HOSTNAME ?= "agl-host0" diff --git a/meta-uhmi/recipes-core/ucl-tools/files/ucl-launcher.service b/meta-uhmi/recipes-core/ucl-tools/files/ucl-launcher.service index 37f289e6..a954c90f 100644 --- a/meta-uhmi/recipes-core/ucl-tools/files/ucl-launcher.service +++ b/meta-uhmi/recipes-core/ucl-tools/files/ucl-launcher.service @@ -2,7 +2,9 @@ Description=ucl-launcher [Service] -Type=idle +Type=simple +User=agl-driver +Environment=XDG_RUNTIME_DIR=/run/user/1001 ExecStart=/usr/bin/ucl-launcher KillSignal=SIGTERM TimeoutStopSec=10 diff --git a/meta-uhmi/recipes-core/uhmi-agl-wm/files/uhmi-agl-wm.service b/meta-uhmi/recipes-core/uhmi-agl-wm/files/uhmi-agl-wm.service index 7e8d4d3f..39ca19d8 100644 --- a/meta-uhmi/recipes-core/uhmi-agl-wm/files/uhmi-agl-wm.service +++ b/meta-uhmi/recipes-core/uhmi-agl-wm/files/uhmi-agl-wm.service @@ -3,9 +3,10 @@ Description=uhmi AGL window manager After=agl-compositor.service [Service] -EnvironmentFile=-/etc/default/uhmi-agl-wm - Type=simple +User=agl-driver +Environment=XDG_RUNTIME_DIR=/run/user/1001 +EnvironmentFile=-/etc/default/uhmi-agl-wm ExecStart=/usr/bin/uhmi-agl-wm KillSignal=SIGKILL Restart=always 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..2d01b7c2 --- /dev/null +++ b/meta-uhmi/recipes-core/ula-tools/files/ula-node-agl.service @@ -0,0 +1,17 @@ +[Unit] +Description=ula-node +Requires=uhmi-agl-wm.service +After=uhmi-agl-wm.service + +[Service] +Type=simple +User=agl-driver +Environment=XDG_RUNTIME_DIR=/run/user/1001 +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/files/ula-node.service b/meta-uhmi/recipes-core/ula-tools/files/ula-node.service index edf69f3d..44a3af48 100644 --- a/meta-uhmi/recipes-core/ula-tools/files/ula-node.service +++ b/meta-uhmi/recipes-core/ula-tools/files/ula-node.service @@ -4,7 +4,9 @@ Requires=uhmi-ivi-wm.service After=uhmi-ivi-wm.service [Service] -Type=idle +Type=simple +User=agl-driver +Environment=XDG_RUNTIME_DIR=/run/user/1001 ExecStart=/usr/bin/ula-node KillSignal=SIGTERM TimeoutStopSec=10 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-kernel/virtio-loopback-driver/virtio-loopback-driver.inc b/meta-uhmi/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver.inc index a7c0111b..a6fb033a 100644 --- a/meta-uhmi/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver.inc +++ b/meta-uhmi/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver.inc @@ -1,5 +1,5 @@ PV = "0.0+git${SRCPV}" -SRCREV = "cf40e4d295c75567cb7d1d03f9fe291e9593e882" +SRCREV = "52da5c41c45b7bbc8f042d40d3c2daa3c779e06c" BRANCH ?= "main" SRC_URI = " \ git://github.com/unified-hmi/virtio-loopback-driver.git;protocol=https;branch=${BRANCH} \ 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 \ " diff --git a/templates/feature/agl-uhmi-demo/50_local.conf.inc b/templates/feature/agl-uhmi-demo/50_local.conf.inc deleted file mode 100644 index 8ae7b749..00000000 --- a/templates/feature/agl-uhmi-demo/50_local.conf.inc +++ /dev/null @@ -1 +0,0 @@ -AGL_EXTRA_IMAGE_FSTYPES = "ext4" |