From 8fa8d6bed7bbf0c1f95d996bd51693d28aad01ae Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 21 Feb 2024 14:54:18 -0800 Subject: [PATCH 1/4] python3-sense-hat: Drop PYTHON_PN Starting OE core commit b566b1e32c7993d1ab7795562f648e52ce186a70, we no longer need PYTHON_PN for any abstraction of python2 vs python3. Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-sense-hat_2.2.0.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb b/dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb index fd67580f3..cf745fc6a 100644 --- a/dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb +++ b/dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb @@ -18,7 +18,7 @@ DEPENDS += " \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-numpy \ - ${PYTHON_PN}-rtimu \ - ${PYTHON_PN}-pillow \ + python3-numpy \ + python3-rtimu \ + python3-pillow \ " From b65bff6323585d2a3325678f92262ddf54ad7eeb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 1 Jul 2023 19:04:07 +0200 Subject: [PATCH 2/4] sdcard_image-rpi.bbclass: include ${IMAGE_NAME_SUFFIX} directly in both ${IMAGE_NAME} and ${IMAGE_LINK_NAME} * Adjust to https://git.openembedded.org/openembedded-core/commit/?id=26d97acc71379ab6702fa54a23b6542a3f51779c * ${IMAGE_NAME}${IMAGE_NAME_SUFFIX} is almost always used together already and when they aren't it's usually because of hardcoded '.rootfs' suffix * it's a bit strange, because ${IMAGE_NAME_SUFFIX} is applied after the version from ${IMAGE_VERSION_SUFFIX}, if we move it to ${IMAGE_LINK_NAME} then it will be applied before the version and ${IMAGE_LINK_NAME} will be just the version-less symlink to latest built version. * it's not added to INITRAMFS_IMAGE_NAME as it assumes that all images used as initramfs will set IMAGE_NAME_SUFFIX to empty. Many already do as shown bellow, but you might need to extend this list in your layer. * without this fix, build with: IMAGE_FSTYPES:rpi = "rpi-sdimg.gz" will fail due to duplicated .rootfs suffix as shown in: http://errors.yoctoproject.org/Errors/Details/754267/ 130023424 bytes (130 MB, 124 MiB) copied, 0.0706353 s, 1.8 GB/s gzip: skipping: core-image-minimal-raspberrypi4-64.rootfs-20240222111049.rpi-sdimg does not exist WARNING: TOPDIR/tmp-glibc/work/raspberrypi4_64-oe-linux/core-image-minimal/1.0/temp/run.do_image_rpi_sdimg.1238835:263 exit 1 from 'gzip -f -9 -n -c --rsyncable core-image-minimal-raspberrypi4-64.rootfs-20240222111049.rpi-sdimg > core-image-minimal-raspberrypi4-64.rootfs-20240222111049.rpi-sdimg.gz' OE raspberrypi4-64@ /OE/build/oe-core/tmp-glibc/work/raspberrypi4_64-oe-linux/core-image-minimal/1.0/deploy-core-image-minimal-image-complete $ ll total 305612 drwxr-xr-x 2 martin martin 4096 Feb 22 12:12 ./ drwxr-xr-x 17 martin martin 4096 Feb 22 12:12 ../ -rw-r--r-- 1 martin martin 130023424 Feb 22 12:12 core-image-minimal-raspberrypi4-64.rootfs-20240222111049.ext3 -rw-r--r-- 1 martin martin 3535 Feb 22 12:12 core-image-minimal-raspberrypi4-64.rootfs-20240222111049.manifest -rw-r--r-- 1 martin martin 184549376 Feb 22 12:12 core-image-minimal-raspberrypi4-64.rootfs-20240222111049.rootfs.rpi-sdimg -rw-r--r-- 1 martin martin 0 Feb 22 12:12 core-image-minimal-raspberrypi4-64.rootfs-20240222111049.rpi-sdimg.gz -rw-r--r-- 1 martin martin 361441 Feb 22 12:12 core-image-minimal-raspberrypi4-64.rootfs-20240222111049.spdx.tar.zst -rw-r--r-- 1 martin martin 271541 Feb 22 12:12 core-image-minimal-raspberrypi4-64.rootfs-20240222111049.testdata.json -rw-r--r-- 1 martin martin 50331648 Feb 22 12:12 core-image-minimal-raspberrypi4-64.rootfs-20240222111049.vfat lrwxrwxrwx 1 martin martin 61 Feb 22 12:12 core-image-minimal-raspberrypi4-64.rootfs.ext3 -> core-image-minimal-raspberrypi4-64.rootfs-20240222111049.ext3 lrwxrwxrwx 1 martin martin 65 Feb 22 12:12 core-image-minimal-raspberrypi4-64.rootfs.manifest -> core-image-minimal-raspberrypi4-64.rootfs-20240222111049.manifest lrwxrwxrwx 1 martin martin 69 Feb 22 12:12 core-image-minimal-raspberrypi4-64.rootfs.spdx.tar.zst -> core-image-minimal-raspberrypi4-64.rootfs-20240222111049.spdx.tar.zst lrwxrwxrwx 1 martin martin 70 Feb 22 12:12 core-image-minimal-raspberrypi4-64.rootfs.testdata.json -> core-image-minimal-raspberrypi4-64.rootfs-20240222111049.testdata.json lrwxrwxrwx 1 martin martin 61 Feb 22 12:12 core-image-minimal-raspberrypi4-64.rootfs.vfat -> core-image-minimal-raspberrypi4-64.rootfs-20240222111049.vfat Signed-off-by: Martin Jansa --- classes/sdcard_image-rpi.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index 178e4ef24..ddcd69d31 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass @@ -60,7 +60,7 @@ do_image_rpi_sdimg[depends] = " \ do_image_rpi_sdimg[recrdeps] = "do_build" # SD card image name -SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.rpi-sdimg" +SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rpi-sdimg" # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS. FATPAYLOAD ?= "" From 95a9103f914c3e2665a1ffe7f70533c44cb4f3af Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 22 Feb 2024 20:07:29 +0100 Subject: [PATCH 3/4] sdimage-raspberrypi.wks: increase /boot partition minimal size from 20 to 100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * current aarch64 kernel image alone is 24MB: 24M tmp-glibc/deploy/images/raspberrypi4-64/Image-raspberrypi4-64-1-6.1.77+git0+43d1723dbe_77fc1fbcb5-r0.1-20110405230000.bin and with rpi-bootfiles it takes around 46MB (e.g. this is from kirkstone raspberrypi4-64 build): 2.0K boot.scr 2.0K cmdline.txt 4.0K fixup4cd.dat 4.0K fixup_cd.dat 4.0K uEnv.txt 6.0K fixup4.dat 8.0K fixup.dat 10K fixup4db.dat 10K fixup4x.dat 10K fixup_db.dat 10K fixup_x.dat 16K uboot.env 36K config.txt 52K bcm2711-rpi-4-b.dtb 52K bcm2711-rpi-400.dtb 52K bcm2711-rpi-cm4.dtb 52K bootcode.bin 126K overlays 558K kernel8.img 786K start4cd.elf 786K start_cd.elf 2.2M start4.elf 2.9M start.elf 2.9M start4x.elf 3.6M start4db.elf 3.6M start_x.elf 4.6M start_db.elf 23M Image * it is increased automatically to fit the content: tmp-glibc/deploy/images/raspberrypi4-64 $ sfdisk -l core-image-minimal-raspberrypi4-64.rootfs--1.0-r0-20110405230000.wic Disk core-image-minimal-raspberrypi4-64.rootfs--1.0-r0-20110405230000.wic: 241.2 MiB, 252915712 bytes, 493976 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: 0x076c4a2a Device Boot Start End Sectors Size Id Type core-image-minimal-raspberrypi4-64.rootfs--1.0-r0-20110405230000.wic1 * 8192 157815 149624 73.1M c W95 FAT32 (LBA) core-image-minimal-raspberrypi4-64.rootfs--1.0-r0-20110405230000.wic2 163840 493975 330136 161.2M 83 Linux but if you want to update the kernel in place or add some additional files later, it might not be big enough, increase the minimal size from 20M to 100M * reminder (as I forgot about it before): "--size" is just minimum https://docs.yoctoproject.org/ref-manual/kickstart.html says: --size: The minimum partition size. Specify as an integer value optionally followed by one of the units “k” / “K” for kibibyte, “M” for mebibyte and “G” for gibibyte. The default unit if none is given is “M”. You do not need this option if you use --source. --fixed-size: The exact partition size. Specify as an integer value optionally followed by one of the units “k” / “K” for kibibyte, “M” for mebibyte and “G” for gibibyte. The default unit if none is given is “M”. Cannot be specify together with --size. An error occurs when assembling the disk image if the partition data is larger than --fixed-size. Signed-off-by: Martin Jansa --- wic/sdimage-raspberrypi.wks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wic/sdimage-raspberrypi.wks b/wic/sdimage-raspberrypi.wks index 01fbaeaeb..bb41e0f56 100644 --- a/wic/sdimage-raspberrypi.wks +++ b/wic/sdimage-raspberrypi.wks @@ -2,5 +2,5 @@ # long-description: Creates a partitioned SD card image for use with # Raspberry Pi. Boot files are located in the first vfat partition. -part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --size 20 +part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --size 100 part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 4096 From 92a9b7a01245507a347c59997a3e5960b0f75ae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kluska?= Date: Tue, 27 Feb 2024 19:23:59 +0100 Subject: [PATCH 4/4] rpi-base: Added missing HiFiBerry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added support for missing HiFiBerry AMP100, AMP3, AMP4 Pro, DAC+ ADC Pro, DAC+ DSP, DAC+ HD, Digi Pro. Signed-off-by: Michał Kluska --- conf/machine/include/rpi-base.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc index ff0480a34..e36b46002 100644 --- a/conf/machine/include/rpi-base.inc +++ b/conf/machine/include/rpi-base.inc @@ -26,9 +26,15 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/gpio-poweroff.dtbo \ overlays/gpio-shutdown.dtbo \ overlays/hifiberry-amp.dtbo \ + overlays/hifiberry-amp100.dtbo \ + overlays/hifiberry-amp3.dtbo \ + overlays/hifiberry-amp4pro.dtbo \ overlays/hifiberry-dac.dtbo \ overlays/hifiberry-dacplus.dtbo \ overlays/hifiberry-dacplusadcpro.dtbo \ + overlays/hifiberry-dacplusdsp.dtbo \ + overlays/hifiberry-dacplushd.dtbo \ + overlays/hifiberry-digi-pro.dtbo \ overlays/hifiberry-digi.dtbo \ overlays/justboom-both.dtbo \ overlays/justboom-dac.dtbo \