Merge pull request #954 from YoeDistro/kraj/master

Update layers and fix jetson-agx-orin-devkit project build/runtime issues.

CHANGELOG.md

@@ -19,6 +19,12 @@ and this project adheres to
 - Fix exceptions with -mbranch-protection on ARM64/Libc++
 - Enable build-id for systems built with clang compiler
 - Upgrade QEMU to 9.0.1
+- Update MACHINE in jetson-agx-orin-devkit
+- Always use lld linker with clang for qt6 recipes
+- Ignore various issues fatal with gcc-14
+- Upgrade linux-raspberrypi to 6.6.36
+- Pin runtime type to GCC runtime in cuda-gcc and define TOOLCHAIN variable
+- Upgrade Go compiler to 1.22.5
 
 ### Added
 

conf/projects/jetson-agx-orin-devkit/config.conf

@@ -1,7 +1,7 @@
-MACHINE = "jetson-agx-orin-devkit"
+MACHINE = "p3737-0000-p3701-0005"
 DISTRO = "yoe"
 # "yoe-<libc>-<init-system>-<windowing-system>"
-YOE_PROFILE = "yoe-glibc-systemd-x11"
+YOE_PROFILE = "yoe-glibc-systemd-eglfs"
 
 # Freeescale stuff EULA yeah :(
 ACCEPT_FSL_EULA = "1"
@@ -23,7 +23,7 @@ IMAGE_FSTYPES:remove = "ext4 tar.gz wic.*"
 #IMAGE_BOOT_FILES:remove = "${KERNEL_IMAGETYPE}"
 #IMAGE_BOOT_FILES:append = " ${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin;${KERNEL_IMAGETYPE}"
 # Use default Device Tree
-IMAGE_BOOT_FILES:append = " tegra234-p3767-0003-p3768-0000-a0.dtb"
+#IMAGE_BOOT_FILES:append = " tegra234-p3767-0003-p3768-0000-a0.dtb"
 
 #WKS_FILE:yoe = "yoe-sdimage.wks"
 #WKS_FILE:yoe:pn-yoe-installer-image = "yoe-installer.wks.in"
@@ -32,6 +32,9 @@ IMAGE_BOOT_FILES:append = " tegra234-p3767-0003-p3768-0000-a0.dtb"
 OBJCOPY:pn-linux-tegra:toolchain-clang = "${HOST_PREFIX}objcopy"
 OBJCOPY:pn-linux-jammy-nvidia-tegra:toolchain-clang = "${HOST_PREFIX}objcopy"
 
+# Use tegra-udrm-gbm for now - https://github.com/OE4T/meta-tegra/issues/1613#issuecomment-2221113973
+#PREFERRED_RPROVIDER_tegra-gbm-backend ?= "tegra-udrm-gbm"
+
 # OE has moved to demand 5.15 minimum kernel but meta-tegra is at 5.10 for jetson-orin-nano
 OLDEST_KERNEL = "5.10"
 
@@ -49,6 +52,25 @@ TOOLCHAIN:pn-qwt = "gcc"
 # Use gnu run time to keep cuda happy
 RUNTIME = "gnu"
 TC_CXX_RUNTIME = "gnu"
+CORE_IMAGE_EXTRA_INSTALL:append = " \
+  nvidia-drm-loadconf \
+  "
+CORE_IMAGE_EXTRA_INSTALL1:append = " \
+  cuda-libraries \
+  ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'tegra-mmapi-samples mesa-demos l4t-graphics-demos-x11 nvgstapps argus-samples', '', d)} \
+  ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'l4t-graphics-demos-wayland weston-examples', '', d)} \
+  tensorrt-samples \
+  tegra-tools-tegrastats \
+  cuda-samples \
+  optee-nvsamples optee-test \
+  vulkan-tools \
+  cuda-samples \
+  opencv-samples opencv-apps \
+  "
+
+DISTRO_FEATURES:remove = "ld-is-lld"
+
+DISPLAY_CARD = "/dev/dri/card1"
 
 # Needed for Running bitbake -ctestimage <image>
 #TEST_TARGET_IP = "10.0.0.36"

conf/site.conf

@@ -11,4 +11,4 @@ require ${TOPDIR}/conf/projects/${PROJECT}/config.conf
 #YOE_PROFILE = "yoe-musl-sysvinit-wayland"
 #require conf/world.conf
 
-IMG_VERSION = "24.6.2"
+IMG_VERSION = "24.6.3"

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

@@ -4,7 +4,7 @@ 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 = "c4550fd947fcb6ef4b75eca514701aad2b588134"
+SRCREV = "738469237165cf991a24541e18ce99909b3806d4"
 
 PV = "1.0.0+git"
 
@@ -36,7 +36,11 @@ YOE_KIOSK_BROWSER_RETRY_INTERVAL = "10"
 # If this is not set, the default error screen is shown.
 YOE_KIOSK_BROWSER_EXCEPTION_URL=""
 
+# Depending upon screen attached to system
+SCREEN_RESOLUTION ?= "1024x600"
 
+# DRI card number, may vary for different boards
+DISPLAY_CARD ?= "/dev/dri/card0"
 # 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)}"
 
@@ -62,6 +66,12 @@ do_install:append() {
     sed -i "s|@@|${YOE_KIOSK_BROWSER_KEYBOARD_SCALE}|" \
         ${D}${sysconfdir}/default/yoe-kiosk-browser
 
+    sed -i "s|@RESOLUTION@|${SCREEN_RESOLUTION}|" \
+        ${D}${sysconfdir}/default/eglfs.json
+
+    sed -i "s|@DISPLAY_CARD@|${DISPLAY_CARD}|" \
+        ${D}${sysconfdir}/default/eglfs.json
+
 }
 
 SYSTEMD_SERVICE:${PN} = "yoe-kiosk-browser.service"