From 0e4b5768e146908f24992ea0e8dcbec65c8f88a3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 14 Aug 2023 08:08:06 -0700 Subject: [PATCH 01/11] qemucommon: Add comments about using slirp Signed-off-by: Khem Raj --- conf/projects/qemucommon/config.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/projects/qemucommon/config.conf b/conf/projects/qemucommon/config.conf index a8b68adda..8d49b9f5e 100644 --- a/conf/projects/qemucommon/config.conf +++ b/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 From d6d2dfc0257f1198f91da6900fa69f90c487e6c3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 14 Aug 2023 08:09:17 -0700 Subject: [PATCH 02/11] Layer Updates: sources/poky * sources/poky 653ff4d85cb...d151ba95f69 (24): > Add GCP fetcher to list of supported protocols > libadwaita: upgrade 1.3.3 -> 1.3.4 > gtk4: upgrade 4.10.4 -> 4.10.5 > sudo: upgrade 1.9.14p2 -> 1.9.14p3 > shaderc: upgrade 2023.4 -> 2023.5 > re2c: upgrade 3.0 -> 3.1 > python3-pyparsing: upgrade 3.1.0 -> 3.1.1 > python3-pip: upgrade 23.2 -> 23.2.1 > python3-pathspec: upgrade 0.11.1 -> 0.11.2 > python3-markdown: upgrade 3.4.3 -> 3.4.4 > python3-editables: upgrade 0.4 -> 0.5 > xxhash: upgrade 0.8.1 -> 0.8.2 > gmp: upgrade 6.2.1 -> 6.3.0 > file: upgrade 5.44 -> 5.45 > curl: upgrade 8.2.0 -> 8.2.1 > btrfs-tools: upgrade 6.3.1 -> 6.3.3 > kea: upgrade to v2.4.0 > gnu-efi: Fix build on musl > connman-conf: don't take over any ethernet devices, not just eth0 > rust-target-config: fix target_features for vfpv3d16 > systemd: fix efi dependency > scripts/create-pull-request: update URLs to git repositories > bitbake: siggen: Update debug > bitbake: siggen: Fix indentation Signed-off-by: Khem Raj --- sources/poky | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/poky b/sources/poky index 653ff4d85..d151ba95f 160000 --- a/sources/poky +++ b/sources/poky @@ -1 +1 @@ -Subproject commit 653ff4d85cbaf53627f7978b06c1f025ac4694e2 +Subproject commit d151ba95f69d7224241fb8c76c90bbe4b2fd9563 From 2895943c44977a848df58bdb1f33b40c36e02eb6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 14 Aug 2023 08:12:25 -0700 Subject: [PATCH 03/11] CHANGELOG.md: Document changes Signed-off-by: Khem Raj --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c33bbfc11..46516538b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,9 @@ 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 ### Added @@ -49,6 +52,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 From 42b726c2c0fd0683c48394c775a8088ad06059e2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 14 Aug 2023 13:08:14 -0700 Subject: [PATCH 04/11] eglfs: Move DISABLE_VC4GRAPHICS settings to project conf DISABLE_VC4GRAPHICS is rpi specific, does not belong to distro settings Signed-off-by: Khem Raj --- conf/projects/rpi4-64/config.conf | 2 ++ sources/meta-yoe/conf/distro/eglfs.inc | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/conf/projects/rpi4-64/config.conf b/conf/projects/rpi4-64/config.conf index 93b38437d..add06adc1 100644 --- a/conf/projects/rpi4-64/config.conf +++ b/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 TEST_TARGET_IP = "10.0.0.47" TEST_SERVER_IP = "10.0.0.13" @@ -42,6 +43,7 @@ IMG_VERSION = "0.0.1" ##################################################################### # add project specific configuration below this line ##################################################################### +PACKAGECONFIG:pn-wpebackend-rdk = "rpi" #require conf/distro/include/lto.inc #DISTRO_FEATURES:append = " lto" diff --git a/sources/meta-yoe/conf/distro/eglfs.inc b/sources/meta-yoe/conf/distro/eglfs.inc index 814313c4e..7b6d8eea7 100644 --- a/sources/meta-yoe/conf/distro/eglfs.inc +++ b/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" From 6a0d9deac8b594c41d67bf36026bdf388a656c59 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 14 Aug 2023 13:11:53 -0700 Subject: [PATCH 05/11] rpi4-64: Switch to using Qt6 yoe-kiosk-image uses yoe-kiosk-browser which needs QT6 Signed-off-by: Khem Raj --- conf/projects/rpi4-64/layers.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/projects/rpi4-64/layers.conf b/conf/projects/rpi4-64/layers.conf index d14a2743d..f000b6e52 100644 --- a/conf/projects/rpi4-64/layers.conf +++ b/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 \ From fd63b6c3fe514c438d2b830140ccfbc5530ec24a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 14 Aug 2023 13:13:23 -0700 Subject: [PATCH 06/11] CHANGELOG.md: Document changes Signed-off-by: Khem Raj --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46516538b..0d3ddd873 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ and this project adheres to - Fix rust features for vfpv3d16 - Adjust commman to work with interface renaming with kernel 6.4 and systemd 254 +- Switch RPI4 to use QT6 ### Added From 1a03ddd0961fdda9fc73157b296929a86b5c343e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 14 Aug 2023 17:23:31 -0700 Subject: [PATCH 07/11] rpi: Update the updater and image artifacts New files have been added, therefore sync it with meta-raspberrypi Signed-off-by: Khem Raj --- .../images/machines/raspberrypi2.inc | 53 ++++--------- .../images/machines/raspberrypi3.inc | 53 ++++--------- .../images/machines/raspberrypi4-64.inc | 40 +--------- .../images/machines/raspberrypi4.inc | 52 ++++--------- .../updater/files/raspberrypi2/platform | 77 ++++++++++++------- .../updater/files/raspberrypi3/platform | 77 ++++++++++++------- .../updater/files/raspberrypi4-64/platform | 64 ++++++++------- .../updater/files/raspberrypi4/platform | 76 +++++++++++------- 8 files changed, 228 insertions(+), 264 deletions(-) diff --git a/sources/meta-yoe/recipes-core/images/machines/raspberrypi2.inc b/sources/meta-yoe/recipes-core/images/machines/raspberrypi2.inc index 3aa97d523..72252b87c 100644 --- a/sources/meta-yoe/recipes-core/images/machines/raspberrypi2.inc +++ b/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" diff --git a/sources/meta-yoe/recipes-core/images/machines/raspberrypi3.inc b/sources/meta-yoe/recipes-core/images/machines/raspberrypi3.inc index 3aa97d523..72252b87c 100644 --- a/sources/meta-yoe/recipes-core/images/machines/raspberrypi3.inc +++ b/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" diff --git a/sources/meta-yoe/recipes-core/images/machines/raspberrypi4-64.inc b/sources/meta-yoe/recipes-core/images/machines/raspberrypi4-64.inc index 47581f884..9cb649642 100644 --- a/sources/meta-yoe/recipes-core/images/machines/raspberrypi4-64.inc +++ b/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" diff --git a/sources/meta-yoe/recipes-core/images/machines/raspberrypi4.inc b/sources/meta-yoe/recipes-core/images/machines/raspberrypi4.inc index 3e62f90c1..0c8ece6fc 100644 --- a/sources/meta-yoe/recipes-core/images/machines/raspberrypi4.inc +++ b/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" diff --git a/sources/meta-yoe/recipes-support/updater/files/raspberrypi2/platform b/sources/meta-yoe/recipes-support/updater/files/raspberrypi2/platform index adbb51221..67aa45d74 100644 --- a/sources/meta-yoe/recipes-support/updater/files/raspberrypi2/platform +++ b/sources/meta-yoe/recipes-support/updater/files/raspberrypi2/platform @@ -6,49 +6,68 @@ USB_DETECTION_DELAY=4 # Add zImage when using u-boot to KERNEL KERNEL="\ - 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 \ + \ kernel7.img \ - overlays/mcp2515-can1.dtbo \ + \ + overlays/overlay_map.dtb \ + overlays/at86rf233.dtbo \ + overlays/disable-bt.dtbo \ + overlays/disable-wifi.dtbo \ + overlays/dwc2.dtbo \ + overlays/gpio-ir.dtbo \ + overlays/gpio-ir-tx.dtbo \ + overlays/gpio-key.dtbo \ + overlays/gpio-poweroff.dtbo \ + overlays/gpio-shutdown.dtbo \ + overlays/hifiberry-amp.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/hifiberry-digi.dtbo \ + overlays/justboom-both.dtbo \ overlays/justboom-dac.dtbo \ - overlays/vc4-kms-dsi-7inch.dtbo \ - overlays/mcp2515-can0.dtbo \ + overlays/justboom-digi.dtbo \ + overlays/i2c-gpio.dtbo \ overlays/i2c-rtc.dtbo \ + overlays/imx219.dtbo \ + overlays/imx477.dtbo \ + overlays/imx708.dtbo \ + overlays/iqaudio-dac.dtbo \ + overlays/iqaudio-dacplus.dtbo \ + overlays/mcp2515-can0.dtbo \ + overlays/mcp2515-can1.dtbo \ + overlays/mcp3008.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-capacitive.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/pitft35-resistive.dtbo \ overlays/pps-gpio.dtbo \ + overlays/rpi-ft5406.dtbo \ overlays/rpi-poe.dtbo \ - overlays/pitft35-resistive.dtbo \ - overlays/overlay_map.dtb \ - overlays/iqaudio-dac.dtbo \ + overlays/vc4-fkms-v3d.dtbo \ + overlays/vc4-fkms-v3d-pi4.dtbo \ + overlays/vc4-kms-v3d.dtbo \ + overlays/vc4-kms-v3d-pi4.dtbo \ + overlays/vc4-kms-dsi-7inch.dtbo \ + overlays/w1-gpio.dtbo \ + overlays/w1-gpio-pullup.dtbo \ + overlays/wm8960-soundcard.dtbo \ " BOOT="\ diff --git a/sources/meta-yoe/recipes-support/updater/files/raspberrypi3/platform b/sources/meta-yoe/recipes-support/updater/files/raspberrypi3/platform index 12e271f52..b1377f6b3 100644 --- a/sources/meta-yoe/recipes-support/updater/files/raspberrypi3/platform +++ b/sources/meta-yoe/recipes-support/updater/files/raspberrypi3/platform @@ -6,49 +6,68 @@ USB_DETECTION_DELAY=4 # Add zImage when using u-boot to KERNEL KERNEL="\ - 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 \ + \ kernel7.img \ - overlays/mcp2515-can1.dtbo \ + \ + overlays/overlay_map.dtb \ + overlays/at86rf233.dtbo \ + overlays/disable-bt.dtbo \ + overlays/disable-wifi.dtbo \ + overlays/dwc2.dtbo \ + overlays/gpio-ir.dtbo \ + overlays/gpio-ir-tx.dtbo \ + overlays/gpio-key.dtbo \ + overlays/gpio-poweroff.dtbo \ + overlays/gpio-shutdown.dtbo \ + overlays/hifiberry-amp.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/hifiberry-digi.dtbo \ + overlays/justboom-both.dtbo \ overlays/justboom-dac.dtbo \ - overlays/vc4-kms-dsi-7inch.dtbo \ - overlays/mcp2515-can0.dtbo \ + overlays/justboom-digi.dtbo \ + overlays/i2c-gpio.dtbo \ overlays/i2c-rtc.dtbo \ + overlays/imx219.dtbo \ + overlays/imx477.dtbo \ + overlays/imx708.dtbo \ + overlays/iqaudio-dac.dtbo \ + overlays/iqaudio-dacplus.dtbo \ + overlays/mcp2515-can0.dtbo \ + overlays/mcp2515-can1.dtbo \ + overlays/mcp3008.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-capacitive.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/pitft35-resistive.dtbo \ overlays/pps-gpio.dtbo \ + overlays/rpi-ft5406.dtbo \ overlays/rpi-poe.dtbo \ - overlays/pitft35-resistive.dtbo \ - overlays/overlay_map.dtb \ - overlays/iqaudio-dac.dtbo \ + overlays/vc4-fkms-v3d.dtbo \ + overlays/vc4-fkms-v3d-pi4.dtbo \ + overlays/vc4-kms-v3d.dtbo \ + overlays/vc4-kms-v3d-pi4.dtbo \ + overlays/vc4-kms-dsi-7inch.dtbo \ + overlays/w1-gpio.dtbo \ + overlays/w1-gpio-pullup.dtbo \ + overlays/wm8960-soundcard.dtbo \ " BOOT="\ diff --git a/sources/meta-yoe/recipes-support/updater/files/raspberrypi4-64/platform b/sources/meta-yoe/recipes-support/updater/files/raspberrypi4-64/platform index e1bd9ea3f..4e8d6ff7d 100644 --- a/sources/meta-yoe/recipes-support/updater/files/raspberrypi4-64/platform +++ b/sources/meta-yoe/recipes-support/updater/files/raspberrypi4-64/platform @@ -5,44 +5,56 @@ UPDATE_FILE_NAME="${PLAT}" USB_DETECTION_DELAY=4 KERNEL="\ - bcm2711-rpi-400.dtb \ bcm2711-rpi-4-b.dtb \ + bcm2711-rpi-400.dtb \ bcm2711-rpi-cm4.dtb \ + bcm2711-rpi-cm4s.dtb \ + \ kernel8.img \ - overlays/mcp2515-can1.dtbo \ + \ + overlays/overlay_map.dtb \ + overlays/at86rf233.dtbo \ + overlays/disable-bt.dtbo \ + overlays/disable-wifi.dtbo \ + overlays/dwc2.dtbo \ + overlays/gpio-ir.dtbo \ + overlays/gpio-ir-tx.dtbo \ + overlays/gpio-key.dtbo \ + overlays/gpio-poweroff.dtbo \ + overlays/gpio-shutdown.dtbo \ + overlays/hifiberry-amp.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/hifiberry-digi.dtbo \ + overlays/justboom-both.dtbo \ overlays/justboom-dac.dtbo \ - overlays/vc4-kms-dsi-7inch.dtbo \ - overlays/mcp2515-can0.dtbo \ + overlays/justboom-digi.dtbo \ + overlays/i2c-gpio.dtbo \ overlays/i2c-rtc.dtbo \ + overlays/imx219.dtbo \ + overlays/imx477.dtbo \ + overlays/imx708.dtbo \ + overlays/iqaudio-dac.dtbo \ + overlays/iqaudio-dacplus.dtbo \ + overlays/mcp2515-can0.dtbo \ + overlays/mcp2515-can1.dtbo \ + overlays/mcp3008.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-capacitive.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/pitft35-resistive.dtbo \ overlays/pps-gpio.dtbo \ + overlays/rpi-ft5406.dtbo \ overlays/rpi-poe.dtbo \ - overlays/pitft35-resistive.dtbo \ - overlays/overlay_map.dtb \ - overlays/iqaudio-dac.dtbo \ + overlays/vc4-fkms-v3d.dtbo \ + overlays/vc4-fkms-v3d-pi4.dtbo \ + overlays/vc4-kms-v3d.dtbo \ + overlays/vc4-kms-v3d-pi4.dtbo \ + overlays/vc4-kms-dsi-7inch.dtbo \ + overlays/w1-gpio.dtbo \ + overlays/w1-gpio-pullup.dtbo \ + overlays/wm8960-soundcard.dtbo \ " BOOT="\ diff --git a/sources/meta-yoe/recipes-support/updater/files/raspberrypi4/platform b/sources/meta-yoe/recipes-support/updater/files/raspberrypi4/platform index ff652cb8f..18a1676d3 100644 --- a/sources/meta-yoe/recipes-support/updater/files/raspberrypi4/platform +++ b/sources/meta-yoe/recipes-support/updater/files/raspberrypi4/platform @@ -5,44 +5,68 @@ UPDATE_FILE_NAME="${PLAT}" USB_DETECTION_DELAY=4 KERNEL="\ - 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 \ + \ kernel7l.img \ - overlays/mcp2515-can1.dtbo \ + \ + overlays/overlay_map.dtb \ + overlays/at86rf233.dtbo \ + overlays/disable-bt.dtbo \ + overlays/disable-wifi.dtbo \ + overlays/dwc2.dtbo \ + overlays/gpio-ir.dtbo \ + overlays/gpio-ir-tx.dtbo \ + overlays/gpio-key.dtbo \ + overlays/gpio-poweroff.dtbo \ + overlays/gpio-shutdown.dtbo \ + overlays/hifiberry-amp.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/hifiberry-digi.dtbo \ + overlays/justboom-both.dtbo \ overlays/justboom-dac.dtbo \ - overlays/vc4-kms-dsi-7inch.dtbo \ - overlays/mcp2515-can0.dtbo \ + overlays/justboom-digi.dtbo \ + overlays/i2c-gpio.dtbo \ overlays/i2c-rtc.dtbo \ + overlays/imx219.dtbo \ + overlays/imx477.dtbo \ + overlays/imx708.dtbo \ + overlays/iqaudio-dac.dtbo \ + overlays/iqaudio-dacplus.dtbo \ + overlays/mcp2515-can0.dtbo \ + overlays/mcp2515-can1.dtbo \ + overlays/mcp3008.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-capacitive.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/pitft35-resistive.dtbo \ overlays/pps-gpio.dtbo \ + overlays/rpi-ft5406.dtbo \ overlays/rpi-poe.dtbo \ - overlays/pitft35-resistive.dtbo \ - overlays/overlay_map.dtb \ - overlays/iqaudio-dac.dtbo \ + overlays/vc4-fkms-v3d.dtbo \ + overlays/vc4-fkms-v3d-pi4.dtbo \ + overlays/vc4-kms-v3d.dtbo \ + overlays/vc4-kms-v3d-pi4.dtbo \ + overlays/vc4-kms-dsi-7inch.dtbo \ + overlays/w1-gpio.dtbo \ + overlays/w1-gpio-pullup.dtbo \ + overlays/wm8960-soundcard.dtbo \ " BOOT="\ From a9ead7ff5199a99923237a22dd1804a2e77d5810 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 14 Aug 2023 18:58:21 -0700 Subject: [PATCH 08/11] envsetup.sh: Wrap more bitbake and oe cmds This ensures that some of interactive commands are also run inside the docker Signed-off-by: Khem Raj --- envsetup.sh | 49 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index f4cb4eca7..b760e760f 100644 --- a/envsetup.sh +++ b/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') } From 6b3bb6fb04ba1c7cf8fb2957d420873f82c3e66e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 14 Aug 2023 19:33:46 -0700 Subject: [PATCH 09/11] CHANGELOG.md: Document changes Signed-off-by: Khem Raj --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d3ddd873..4d3bf7fe9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ and this project adheres to - 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 From 08929ddb774e46959a8c812018cfaa070ea9ee45 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 14 Aug 2023 21:16:06 -0700 Subject: [PATCH 10/11] rpi4-64: Use vc4-fkms-v3d when neither x11 nor wayland is enabled This ensures that QT6 apps can keep working with EGLFS Signed-off-by: Khem Raj --- conf/projects/rpi4-64/config.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/projects/rpi4-64/config.conf b/conf/projects/rpi4-64/config.conf index add06adc1..d8e503bc2 100644 --- a/conf/projects/rpi4-64/config.conf +++ b/conf/projects/rpi4-64/config.conf @@ -44,6 +44,9 @@ 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" From 996398d67206cb5245523c9b923926a87f6a911c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 14 Aug 2023 23:32:07 -0700 Subject: [PATCH 11/11] Layer Updates: sources/meta-clang sources/meta-riscv * sources/meta-clang 0f31c0b...6df9ffe (2): > scan-build: Add --no-browser option to scan-view > scan-build.bbclass: Use 0.0.0.0 for CLANG_SCAN_SERVER_IP * sources/meta-riscv 9e5bb73...97609a3 (4): > visionfive2-pvr-graphics: Add systemd service > visionfive2-pvr-graphics: Package for musl > visionfive2-firmware: Update binary blobs to v3.4.5 > linux-starfive-dev: update VF2 kernel to V3.4.5 SDK Signed-off-by: Khem Raj --- sources/meta-clang | 2 +- sources/meta-riscv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/meta-clang b/sources/meta-clang index 0f31c0b29..6df9ffeac 160000 --- a/sources/meta-clang +++ b/sources/meta-clang @@ -1 +1 @@ -Subproject commit 0f31c0b29580825af8700e484b984a8824a31a4f +Subproject commit 6df9ffeac401b4074ce7baa0031bfd8bb4010374 diff --git a/sources/meta-riscv b/sources/meta-riscv index 9e5bb734b..97609a3d4 160000 --- a/sources/meta-riscv +++ b/sources/meta-riscv @@ -1 +1 @@ -Subproject commit 9e5bb734b9f773f445ec48a4df2acd279e6f586d +Subproject commit 97609a3d454da9bb0281193e8005151590723837