Merge pull request #870 from YoeDistro/kraj/master

Update layers and fix docker for running ptests

CHANGELOG.md

@@ -33,6 +33,8 @@ and this project adheres to
 - Use meson as default buildsystem for gnomebase.bbclass
 - Adjust recipes in meta-openembedded to work with meson defaults for
   gnomebase.bbclass
+- Obsolete dleyna related recipes
+- Update linux-raspberrypi to 6.1.61
 
 ### Added
 
@@ -44,7 +46,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
+  - bindfs, kmsxx, python3-file-magic
 - Add KAS support in meta-riscv
 - Add handler to create go recipes Add go-vendor class
 - Add recipetool handler to create go recipes
@@ -57,7 +59,7 @@ and this project adheres to
 ### Removed
 
 - Remove ${CCACHE} from FORTRAN compiler in bitbake config file
-- Removed recipes - libcroco
+- Removed recipes - libcroco, netkit
 - Drop obsolete SERIAL_CONSOLES_CHECK for all machines
 - Dropped recipes:
   - python3-nacl, toscoterm

conf/projects/odroid-c4/config.conf

@@ -1,8 +1,9 @@
 MACHINE = "odroid-c4-hardkernel"
 DISTRO = "yoe"
 # "yoe-<libc>-<init-system>-<windowing-system>"
-YOE_PROFILE = "yoe-glibc-systemd-wayland"
+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 += "\
@@ -24,6 +25,9 @@ OLDEST_KERNEL = "4.9"
 #TEST_SERVER_IP = "10.0.0.13"
 TEST_TARGET = "simpleremote"
 
+# 4.9 kernel as such can not do drm backends
+PACKAGECONFIG_GRAPHICS:append:pn-qtbase = " linuxfb"
+
 IMG_VERSION = "0.0.1"
 #####################################################################
 # add project specific configuration below this line

conf/projects/qemucommon/config.conf

@@ -4,14 +4,7 @@ YOE_PROFILE = "yoe-glibc-systemd-wayland"
 # usually not changed often
 # Add 4G space to QEMU image
 #IMAGE_ROOTFS_EXTRA_SPACE:append = " + 4000000"
-# common
-#TEST_SERVER_IP = "10.0.0.13"
-# QEMU
-#TEST_TARGET_IP = "192.168.7.2"
 #TEST_QEMUBOOT_TIMEOUT = "100"
-#TEST_TARGET = "qemu"
-#TEST_TARGET = "simpleremote"
-#TFTP_SERVER_IP = "10.0.0.13"
 
 # Enable clang static analyzer
 #INHERIT += "scan-build"
@@ -20,19 +13,15 @@ YOE_PROFILE = "yoe-glibc-systemd-wayland"
 
 IMAGE_FSTYPES:append = " wic.xz wic.bmap tar.xz"
 IMAGE_FSTYPES:remove = "tar.bz2 tar.xz tar tar.gz wic.xz wic.bmap"
-# use kvm with x86/x86_64 qemu
-QEMU_USE_KVM = "1"
 # normal networking requires sudo access slirp does not
-#QEMU_USE_SLIRP = "1"
-#TEST_RUNQEMUPARAMS = "slirp"
-#TEST_SERVER_IP = "10.0.2.2:8000"
+#TEST_RUNQEMUPARAMS:append = " slirp"
 
 # Launch vnc backend during testing
-#TEST_RUNQEMUPARAMS = "publicvnc"
+#TEST_RUNQEMUPARAMS:append = " publicvnc"
 # needed for running ptests automatically
 PACKAGE_FEED_URIS ?= ""
 # Needed for ptest runs
-EXTRA_IMAGE_FEATURES += "debug-tweaks"
+EXTRA_IMAGE_FEATURES:append = " debug-tweaks"
 
 IMG_VERSION = "0.0.1"
 #####################################################################

local.sh.example

@@ -34,9 +34,10 @@
 # format is host-port:container-port e.g.
 # 5900 is for VNC
 # 8181 is for clang static analyzer bitbake -cscanview <recipe>
+# 8000 is for opkg feedserver
 #export DOCKER_PORTS="5900:5900 8181:8181"
 # Pass additional options to launch docker
 # --net=host is used to expose host network to
 # container, e.g. TAP devices created on host are accessible inside
 # docker needed for running ptests e.g. core-image-ptest-all
-#DOCKER_EXTRA_ARGS = "--net=host"
+#export DOCKER_EXTRA_ARGS="--net=host"

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

@@ -32,9 +32,11 @@ 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
-    else
+    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-env ${D}${sysconfdir}/default/yoe-kiosk-browser

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

@@ -1,7 +1,5 @@
 inherit features_check
 
-REQUIRED_DISTRO_FEATURES = "opengl"
-
 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)}"