Merge pull request #871 from YoeDistro/kraj/master

yoe-kiosk-browser, c4: Defined a knob to use linuxfb and update layers

CHANGELOG.md

@@ -35,6 +35,9 @@ and this project adheres to
   gnomebase.bbclass
 - Obsolete dleyna related recipes
 - Update linux-raspberrypi to 6.1.61
+- Add systemd startup to yoe-kiosk-browser to run it usin linuxfb
+- Add G31 mali driver and make it work with ODROID-C4
+- Update rpi-config to tip of tree
 
 ### Added
 
@@ -46,7 +49,7 @@ and this project adheres to
   - reptyr, python3-unoconv, python3-screeninfo, python3-zopeevent
   - python3-flask-restx, exiftool, python3-pdm, python3-pdm-backend
   - python3-wand, python3-py7zr, python3-pyppmd, python3-pybcj
-  - bindfs, kmsxx, python3-file-magic
+  - bindfs, kmsxx, python3-file-magic, btop
 - Add KAS support in meta-riscv
 - Add handler to create go recipes Add go-vendor class
 - Add recipetool handler to create go recipes

conf/projects/odroid-c4/config.conf

@@ -3,7 +3,6 @@ DISTRO = "yoe"
 # "yoe-<libc>-<init-system>-<windowing-system>"
 YOE_PROFILE = "yoe-glibc-systemd-eglfs"
 
-DISTRO_FEATURES:remove = "opengl"
 # Acknowledge that Synaptics can revoke their license at any time on the
 # Rapsberry pi firmware
 LICENSE_FLAGS_ACCEPTED += "\
@@ -25,6 +24,9 @@ OLDEST_KERNEL = "4.9"
 #TEST_SERVER_IP = "10.0.0.13"
 TEST_TARGET = "simpleremote"
 
+# Install the linuxfb systemd launch unit
+YOE_KIOSK_BROWSER_SYSTEMD_UNIT = "yoe-kiosk-browser-linuxfb.service"
+
 # 4.9 kernel as such can not do drm backends
 PACKAGECONFIG_GRAPHICS:append:pn-qtbase = " linuxfb"
 

sources/meta-yoe/dynamic-layers/qt6-layer/recipes-qt/kiosk-browser/yoe-kiosk-browser.bb

@@ -4,9 +4,9 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
 
 SRC_URI = "git://github.com/YoeDistro/yoe-kiosk-browser;branch=main;protocol=https"
-SRCREV = "ebeead7dc190cdbdc6f634a6fb5f6859c6765655"
+SRCREV = "6e94c4013f4f636a9d65561243e675dff0ae381d"
 
-PV = "1.0.0+git${SRCPV}"
+PV = "1.0.0+git"
 
 S = "${WORKDIR}/git"
 
@@ -27,18 +27,13 @@ YOE_KIOSK_BROWSER_URL ?= "http://localhost:8118"
 YOE_KIOSK_BROWSER_ROTATE ?= "0"
 # the following scale should be <= 1
 YOE_KIOSK_BROWSER_KEYBOARD_SCALE ?= "1"
+# Define it via a knob which can be set from config file e.g. local.conf
+YOE_KIOSK_BROWSER_SYSTEMD_UNIT ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'yoe-kiosk-browser-wayland.service', 'yoe-kiosk-browser-eglfs.service', d)}"
 
 do_install:append() {
     echo "Browser URL: ${YOE_KIOSK_BROWSER_URL}"
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'true', 'false', d)}; then
-        install -D -m 0644 ${S}/yoe-kiosk-browser-wayland.service ${D}${systemd_unitdir}/system/yoe-kiosk-browser.service
-    elif ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'true', 'false', d)}; then
-        install -D -m 0644 ${S}/yoe-kiosk-browser-eglfs.service ${D}${systemd_unitdir}/system/yoe-kiosk-browser.service
-        install -D -m 0644 ${S}/eglfs.json ${D}${sysconfdir}/default/eglfs.json
-    else
-        install -D -m 0644 ${S}/yoe-kiosk-browser-linuxfb.service ${D}${systemd_unitdir}/system/yoe-kiosk-browser.service
-    fi
-
+    install -D -m 0644 ${S}/${YOE_KIOSK_BROWSER_SYSTEMD_UNIT} ${D}${systemd_unitdir}/system/yoe-kiosk-browser.service
+    install -D -m 0644 ${S}/eglfs.json ${D}${sysconfdir}/default/eglfs.json
     install -D -m 0644 ${S}/yoe-kiosk-browser-env ${D}${sysconfdir}/default/yoe-kiosk-browser
 
     # fill in service template values

sources/meta-yoe/recipes-core/images/graphics.inc

@@ -1,5 +1,3 @@
-inherit features_check
-
 X11PKGS = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'packagegroup-core-x11 packagegroup-xfce-base', d)}"
 X11ONLYPKGS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11PKGS}', '', d)}"
 X11FEATURE = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'x11', d)}"

sources/meta-yoe/recipes-core/images/yoe-ptest-image.bb

@@ -2,6 +2,8 @@
 
 require yoe-sdk-image.bb
 
+inherit features_check
+
 REQUIRED_DISTRO_FEATURES += "ptest"
 
 IMAGE_FEATURES += "ptest-pkgs"