Merge pull request #824 from YoeDistro/kraj/master

Update layers

CHANGELOG.md

@@ -41,6 +41,11 @@ and this project adheres to
 - Upgrade openssh to 9.3p2
 - Upgrade go compiler to 1.20.7
 - Fix recipe_sysroot_check_ld_is_lld to not trigger on allarch recipes
+- Fix rust features for vfpv3d16
+- Adjust commman to work with interface renaming with
+  kernel 6.4 and systemd 254
+- Switch RPI4 to use QT6
+- Wrap more bitbake commands in container e.g. bitbake-getvar
 
 ### Added
 
@@ -49,6 +54,7 @@ and this project adheres to
 - Add script to generate kernel CVE_STATUS entries for linux-yocto
 - Add packageconfig to support colored logs in journald
 - Add DOCKER_PORTS variable in setenv to forward ports between docker and host
+- Add GCP fetcher to list of supported protocols
 
 ### Removed
 

conf/projects/qemucommon/config.conf

@@ -21,6 +21,9 @@ 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"
 # Launch vnc backend during testing
 #TEST_RUNQEMUPARAMS = "publicvnc"
 # needed for running ptests automatically

conf/projects/rpi4-64/config.conf

@@ -34,6 +34,7 @@ IMAGE_BOOT_FILES:append = " ${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin;${SDIMG
 # Subprocess output:arm-yoe-linux-llvm-objcopy: error: Link field value 22 in section .rel.dyn is not a symbol table
 OBJCOPY:pn-linux-raspberrypi:toolchain-clang = "${HOST_PREFIX}objcopy"
 
+PACKAGECONFIG:pn-wpebackend-rdk:rpi = "rpi"
 # Needed for Running bitbake -ctestimage <image>
 TEST_TARGET_IP = "10.0.0.47"
 TEST_SERVER_IP = "10.0.0.13"
@@ -42,6 +43,10 @@ IMG_VERSION = "0.0.1"
 #####################################################################
 # add project specific configuration below this line
 #####################################################################
+PACKAGECONFIG:pn-wpebackend-rdk = "rpi"
+# Use fkms for eglfs on RPI4 this enables both console display & graphics (for EGLFS)
+# Otherwise use full kms
+VC4DTBO = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'vc4-kms-v3d', 'vc4-fkms-v3d', d)}"
 #require conf/distro/include/lto.inc
 #DISTRO_FEATURES:append = " lto"
 

conf/projects/rpi4-64/layers.conf

@@ -8,7 +8,7 @@ BBLAYERS = "\
     \
     ${TOPDIR}/sources/meta-clang \
     ${TOPDIR}/sources/meta-elm-binary \
-    ${TOPDIR}/sources/meta-qt5 \
+    ${TOPDIR}/sources/meta-qt6 \
     \
     ${TOPDIR}/sources/meta-openembedded/meta-filesystems \
     ${TOPDIR}/sources/meta-openembedded/meta-gnome \

envsetup.sh

@@ -553,7 +553,7 @@ dkr() {
     echo "setting dkr action to shell"
     CMD="/bin/bash"
   else
-    CMD=". ${OE_BASE}/envsetup.sh $PROJECT && $@"
+    CMD=". ${OE_BASE}/envsetup.sh $PROJECT 2>&1 > /dev/null && $@"
     shift
   fi
   if [ "$DOCKER_PSEUDO_TTY" = "no" ]; then
@@ -631,24 +631,53 @@ dkr() {
     ${DOCKER_REPO} /bin/bash -c "$CMD"
 }
 
-bitbake() {
+wrapcmd() {
   ulimit -n 4096
+  cmd=$1
+  shift
   if [ -z $DOCKER_REPO ] || [ "$DOCKER_REPO" = "none" ]; then
-    ${OE_BASE}/sources/poky/bitbake/bin/bitbake $@
+    $cmd $@
   else
-    dkr "${OE_BASE}/sources/poky/bitbake/bin/bitbake $@"
+    dkr "$cmd $@"
   fi
 }
 
+bitbake() {
+  wrapcmd ${OE_BASE}/sources/poky/bitbake/bin/bitbake $@
+}
+bitbake-diffsigs() {
+  wrapcmd ${OE_BASE}/sources/poky/bitbake/bin/bitbake-diffsigs $@
+}
+
+bitbake-dumpsig() {
+  wrapcmd ${OE_BASE}/sources/poky/bitbake/bin/bitbake-dumpsig $@
+}
+
+bitbake-getvar() {
+  wrapcmd ${OE_BASE}/sources/poky/bitbake/bin/bitbake-getvar $@
+}
+
+bitbake-layers() {
+  wrapcmd ${OE_BASE}/sources/poky/bitbake/bin/bitbake-layers $@
+}
+
+bitbake-selftest() {
+  wrapcmd ${OE_BASE}/sources/poky/bitbake/bin/bitbake-selftest $@
+}
+
 devtool() {
-  ulimit -n 4096
-  if [ -z $DOCKER_REPO ] || [ "$DOCKER_REPO" = "none" ]; then
-    ${OE_BASE}/sources/poky/scripts/devtool $@
-  else
-    dkr "${OE_BASE}/sources/poky/scripts/devtool $@"
-  fi
+  wrapcmd ${OE_BASE}/sources/poky/scripts/devtool $@
 }
 
+oe-pkgdata-util() {
+  wrapcmd ${OE_BASE}/sources/poky/scripts/oe-pkgdata-util $@
+}
+
+recipetool() {
+  wrapcmd ${OE_BASE}/sources/poky/scripts/recipetool $@
+}
+
+
 yoe_get_image_version() {
   echo $(read_var_from_conf 'IMG_VERSION')
 }

sources/meta-yoe/conf/distro/eglfs.inc

@@ -1,9 +1,5 @@
 DISTRO_FEATURES:remove = " x11 wayland"
 
-# Use bcm userland graphics driver
-DISABLE_VC4GRAPHICS = "1"
-
 # Use rdk backend for eglfs
 PREFERRED_PROVIDER_virtual/wpebackend = "wpebackend-rdk"
 
-PACKAGECONFIG:pn-wpebackend-rdk:rpi = "rpi"

sources/meta-yoe/recipes-core/images/machines/raspberrypi2.inc

@@ -5,51 +5,24 @@ KERNEL_IMAGE = "${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin"
 
 # Add ${KERNEL_IMAGETYPE} to KERNEL_ARTEFACTS if using u-boot
 KERNEL_ARTEFACTS = "\
-    bcm2708-rpi-b.dtb \
-    bcm2708-rpi-cm.dtb \
+    bcm2708-rpi-zero.dtb \
     bcm2708-rpi-zero-w.dtb \
+    bcm2708-rpi-b.dtb \
+    bcm2708-rpi-b-rev1.dtb \
+    bcm2708-rpi-b-plus.dtb \
     bcm2709-rpi-2-b.dtb \
-    bcm2710-rpi-3-b-plus.dtb \
+    bcm2710-rpi-2-b.dtb \
     bcm2710-rpi-3-b.dtb \
-    bcm2710-rpi-cm3.dtb \
+    bcm2710-rpi-3-b-plus.dtb \
+    bcm2710-rpi-zero-2.dtb \
     bcm2711-rpi-4-b.dtb \
+    bcm2711-rpi-400.dtb \
+    bcm2708-rpi-cm.dtb \
+    bcm2710-rpi-cm3.dtb \
+    bcm2711-rpi-cm4.dtb \
+    bcm2711-rpi-cm4s.dtb \
 "
-DTBOFILES = "\
-    overlays/mcp2515-can1.dtbo \
-    overlays/hifiberry-dac.dtbo \
-    overlays/hifiberry-digi.dtbo \
-    overlays/hifiberry-dacplus.dtbo \
-    overlays/pitft28-capacitive.dtbo \
-    overlays/gpio-ir.dtbo \
-    overlays/iqaudio-dacplus.dtbo \
-    overlays/justboom-digi.dtbo \
-    overlays/justboom-dac.dtbo \
-    overlays/vc4-kms-dsi-7inch.dtbo \
-    overlays/mcp2515-can0.dtbo \
-    overlays/i2c-rtc.dtbo \
-    overlays/miniuart-bt.dtbo \
-    overlays/at86rf233.dtbo \
-    overlays/pitft22.dtbo \
-    overlays/imx219.dtbo \
-    overlays/vc4-fkms-v3d.dtbo \
-    overlays/justboom-both.dtbo \
-    overlays/disable-bt.dtbo \
-    overlays/w1-gpio.dtbo \
-    overlays/rpi-ft5406.dtbo \
-    overlays/dwc2.dtbo \
-    overlays/pitft28-resistive.dtbo \
-    overlays/hifiberry-amp.dtbo \
-    overlays/vc4-kms-v3d.dtbo \
-    overlays/w1-gpio-pullup.dtbo \
-    overlays/vc4-kms-v3d-pi4.dtbo \
-    overlays/gpio-key.dtbo \
-    overlays/gpio-ir-tx.dtbo \
-    overlays/pps-gpio.dtbo \
-    overlays/rpi-poe.dtbo \
-    overlays/pitft35-resistive.dtbo \
-    overlays/overlay_map.dtb \
-    overlays/iqaudio-dac.dtbo \
-    "
+DTBOFILES = " ${RPI_KERNEL_DEVICETREE_OVERLAYS} "
 
 ROOTFS_ARTEFACTS = "rootfs.ext4.xz"
 

sources/meta-yoe/recipes-core/images/machines/raspberrypi3.inc

@@ -5,51 +5,24 @@ KERNEL_IMAGE = "${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin"
 
 # Add ${KERNEL_IMAGETYPE} to KERNEL_ARTEFACTS if using u-boot
 KERNEL_ARTEFACTS = "\
-    bcm2708-rpi-b.dtb \
-    bcm2708-rpi-cm.dtb \
+    bcm2708-rpi-zero.dtb \
     bcm2708-rpi-zero-w.dtb \
+    bcm2708-rpi-b.dtb \
+    bcm2708-rpi-b-rev1.dtb \
+    bcm2708-rpi-b-plus.dtb \
     bcm2709-rpi-2-b.dtb \
-    bcm2710-rpi-3-b-plus.dtb \
+    bcm2710-rpi-2-b.dtb \
     bcm2710-rpi-3-b.dtb \
-    bcm2710-rpi-cm3.dtb \
+    bcm2710-rpi-3-b-plus.dtb \
+    bcm2710-rpi-zero-2.dtb \
     bcm2711-rpi-4-b.dtb \
+    bcm2711-rpi-400.dtb \
+    bcm2708-rpi-cm.dtb \
+    bcm2710-rpi-cm3.dtb \
+    bcm2711-rpi-cm4.dtb \
+    bcm2711-rpi-cm4s.dtb \
 "
-DTBOFILES = "\
-    overlays/mcp2515-can1.dtbo \
-    overlays/hifiberry-dac.dtbo \
-    overlays/hifiberry-digi.dtbo \
-    overlays/hifiberry-dacplus.dtbo \
-    overlays/pitft28-capacitive.dtbo \
-    overlays/gpio-ir.dtbo \
-    overlays/iqaudio-dacplus.dtbo \
-    overlays/justboom-digi.dtbo \
-    overlays/justboom-dac.dtbo \
-    overlays/vc4-kms-dsi-7inch.dtbo \
-    overlays/mcp2515-can0.dtbo \
-    overlays/i2c-rtc.dtbo \
-    overlays/miniuart-bt.dtbo \
-    overlays/at86rf233.dtbo \
-    overlays/pitft22.dtbo \
-    overlays/imx219.dtbo \
-    overlays/vc4-fkms-v3d.dtbo \
-    overlays/justboom-both.dtbo \
-    overlays/disable-bt.dtbo \
-    overlays/w1-gpio.dtbo \
-    overlays/rpi-ft5406.dtbo \
-    overlays/dwc2.dtbo \
-    overlays/pitft28-resistive.dtbo \
-    overlays/hifiberry-amp.dtbo \
-    overlays/vc4-kms-v3d.dtbo \
-    overlays/w1-gpio-pullup.dtbo \
-    overlays/vc4-kms-v3d-pi4.dtbo \
-    overlays/gpio-key.dtbo \
-    overlays/gpio-ir-tx.dtbo \
-    overlays/pps-gpio.dtbo \
-    overlays/rpi-poe.dtbo \
-    overlays/pitft35-resistive.dtbo \
-    overlays/overlay_map.dtb \
-    overlays/iqaudio-dac.dtbo \
-    "
+DTBOFILES = " ${RPI_KERNEL_DEVICETREE_OVERLAYS} "
 
 ROOTFS_ARTEFACTS = "rootfs.ext4.xz"
 

sources/meta-yoe/recipes-core/images/machines/raspberrypi4-64.inc

@@ -5,46 +5,12 @@ KERNEL_IMAGE = "${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin"
 
 # Add ${KERNEL_IMAGETYPE} to KERNEL_ARTEFACTS if using u-boot
 KERNEL_ARTEFACTS = "\
-    bcm2711-rpi-400.dtb \
     bcm2711-rpi-4-b.dtb \
+    bcm2711-rpi-400.dtb \
     bcm2711-rpi-cm4.dtb \
+    bcm2711-rpi-cm4s.dtb \
 "
-DTBOFILES = "\
-    overlays/mcp2515-can1.dtbo \
-    overlays/hifiberry-dac.dtbo \
-    overlays/hifiberry-digi.dtbo \
-    overlays/hifiberry-dacplus.dtbo \
-    overlays/pitft28-capacitive.dtbo \
-    overlays/gpio-ir.dtbo \
-    overlays/iqaudio-dacplus.dtbo \
-    overlays/justboom-digi.dtbo \
-    overlays/justboom-dac.dtbo \
-    overlays/vc4-kms-dsi-7inch.dtbo \
-    overlays/mcp2515-can0.dtbo \
-    overlays/i2c-rtc.dtbo \
-    overlays/miniuart-bt.dtbo \
-    overlays/at86rf233.dtbo \
-    overlays/pitft22.dtbo \
-    overlays/imx219.dtbo \
-    overlays/vc4-fkms-v3d.dtbo \
-    overlays/justboom-both.dtbo \
-    overlays/disable-bt.dtbo \
-    overlays/w1-gpio.dtbo \
-    overlays/rpi-ft5406.dtbo \
-    overlays/dwc2.dtbo \
-    overlays/pitft28-resistive.dtbo \
-    overlays/hifiberry-amp.dtbo \
-    overlays/vc4-kms-v3d.dtbo \
-    overlays/w1-gpio-pullup.dtbo \
-    overlays/vc4-kms-v3d-pi4.dtbo \
-    overlays/gpio-key.dtbo \
-    overlays/gpio-ir-tx.dtbo \
-    overlays/pps-gpio.dtbo \
-    overlays/rpi-poe.dtbo \
-    overlays/pitft35-resistive.dtbo \
-    overlays/overlay_map.dtb \
-    overlays/iqaudio-dac.dtbo \
-    "
+DTBOFILES = " ${RPI_KERNEL_DEVICETREE_OVERLAYS} "
 
 ROOTFS_ARTEFACTS = "rootfs.ext4.xz"
 

sources/meta-yoe/recipes-core/images/machines/raspberrypi4.inc

@@ -5,46 +5,24 @@ KERNEL_IMAGE = "${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin"
 
 # Add ${KERNEL_IMAGETYPE} to KERNEL_ARTEFACTS if using u-boot
 KERNEL_ARTEFACTS = "\
-    bcm2711-rpi-400.dtb \
+    bcm2708-rpi-zero.dtb \
+    bcm2708-rpi-zero-w.dtb \
+    bcm2708-rpi-b.dtb \
+    bcm2708-rpi-b-rev1.dtb \
+    bcm2708-rpi-b-plus.dtb \
+    bcm2709-rpi-2-b.dtb \
+    bcm2710-rpi-2-b.dtb \
+    bcm2710-rpi-3-b.dtb \
+    bcm2710-rpi-3-b-plus.dtb \
+    bcm2710-rpi-zero-2.dtb \
     bcm2711-rpi-4-b.dtb \
+    bcm2711-rpi-400.dtb \
+    bcm2708-rpi-cm.dtb \
+    bcm2710-rpi-cm3.dtb \
     bcm2711-rpi-cm4.dtb \
+    bcm2711-rpi-cm4s.dtb \
 "
-DTBOFILES = "\
-    overlays/mcp2515-can1.dtbo \
-    overlays/hifiberry-dac.dtbo \
-    overlays/hifiberry-digi.dtbo \
-    overlays/hifiberry-dacplus.dtbo \
-    overlays/pitft28-capacitive.dtbo \
-    overlays/gpio-ir.dtbo \
-    overlays/iqaudio-dacplus.dtbo \
-    overlays/justboom-digi.dtbo \
-    overlays/justboom-dac.dtbo \
-    overlays/vc4-kms-dsi-7inch.dtbo \
-    overlays/mcp2515-can0.dtbo \
-    overlays/i2c-rtc.dtbo \
-    overlays/miniuart-bt.dtbo \
-    overlays/at86rf233.dtbo \
-    overlays/pitft22.dtbo \
-    overlays/imx219.dtbo \
-    overlays/vc4-fkms-v3d.dtbo \
-    overlays/justboom-both.dtbo \
-    overlays/disable-bt.dtbo \
-    overlays/w1-gpio.dtbo \
-    overlays/rpi-ft5406.dtbo \
-    overlays/dwc2.dtbo \
-    overlays/pitft28-resistive.dtbo \
-    overlays/hifiberry-amp.dtbo \
-    overlays/vc4-kms-v3d.dtbo \
-    overlays/w1-gpio-pullup.dtbo \
-    overlays/vc4-kms-v3d-pi4.dtbo \
-    overlays/gpio-key.dtbo \
-    overlays/gpio-ir-tx.dtbo \
-    overlays/pps-gpio.dtbo \
-    overlays/rpi-poe.dtbo \
-    overlays/pitft35-resistive.dtbo \
-    overlays/overlay_map.dtb \
-    overlays/iqaudio-dac.dtbo \
-    "
+DTBOFILES = " ${RPI_KERNEL_DEVICETREE_OVERLAYS} "
 
 ROOTFS_ARTEFACTS = "rootfs.ext4.xz"