libcamera: move PACKAGECONFIG def to meta-oe

Move the raspberrypi PACKAGECONFIG to meta-oe (at least partially),
as the libcamera recipe needs to know when is it built for an rpi due
to a new build dependency. Also, make the PACKAGECONFIG append device
specific. Otherwise the behavior of the bbappend should not change
by this patch.

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>

.github/actions/docker-build/action.yml

@@ -32,7 +32,7 @@ runs:
         n=1
         until [ "$n" -gt "$tries" ]; do
           echo "Building the docker image ${{ inputs.docker_image }}-${{ inputs.id }}... try $n..."
-          if docker build . -f "${{ inputs.docker_image }}/Dockerfile" -t "${{ inputs.docker_image }}-${{ inputs.id }}"; then
+          if docker build --no-cache . -f "${{ inputs.docker_image }}/Dockerfile" -t "${{ inputs.docker_image }}-${{ inputs.id }}"; then
             # This can fail if a dangling images cleaning job runs in
             # parallel. So we try this a couple of times to minimize
             # conflict. This is because while building, docker creates a

.github/workflows/compliance.yml

@@ -23,7 +23,9 @@ jobs:
           id: ${{ github.event.number }}
       - name: Do DCO check
         run: |
-          docker run --rm -v "$GITHUB_WORKSPACE:/work:ro" \
+          docker run --rm --security-opt apparmor=unconfined \
+            --security-opt seccomp=unconfined \
+            -v "$GITHUB_WORKSPACE:/work:ro" \
             --env "BASE_REF=$GITHUB_BASE_REF" \
             "dco-check-${{ github.event.number }}"
       - name: Cleanup temporary docker image

.github/workflows/docker-images/README.md

@@ -17,5 +17,5 @@ passing the appropriate `-f` argument.
 Here is an example for building the `dco-check` image:
 
 ```
-docker build . -f dco-check/Dockerfile -t dco-check
+docker build --no-cache . -f dco-check/Dockerfile -t dco-check
 ```

.github/workflows/docker-images/yocto-builder/Dockerfile

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ARG DEBIAN_FRONTEND="noninteractive"
 RUN apt-get update -qq
@@ -10,12 +10,13 @@ RUN apt-get install -y eatmydata
 
 # Yocto/OE build host dependencies
 # Keep this in sync with
-# https://git.yoctoproject.org/poky/tree/documentation/poky.yaml
+# https://git.yoctoproject.org/poky/tree/documentation/poky.yaml.in
+# https://git.yoctoproject.org/poky/tree/documentation/tools/host_packages_scripts/ubuntu_essential.sh
 RUN eatmydata apt-get install -qq -y \
-	gawk wget git diffstat unzip texinfo gcc build-essential chrpath \
-	socat cpio python3 python3-pip python3-pexpect xz-utils debianutils \
-	iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev \
-	pylint3 xterm python3-subunit mesa-common-dev zstd liblz4-tool
+	build-essential chrpath cpio debianutils diffstat file gawk gcc \
+	git iputils-ping libacl1 liblz4-tool locales python3 python3-git \
+	python3-jinja2 python3-pexpect python3-pip python3-subunit socat \
+	texinfo unzip wget xz-utils zstd
 
 # en_US.UTF-8 is required by the build system
 RUN eatmydata apt-get install -qq -y locales \
@@ -29,6 +30,9 @@ RUN eatmydata apt-get clean && rm -rf /var/lib/apt/lists/*
 RUN echo "dash dash/sh boolean false" | debconf-set-selections \
  && dpkg-reconfigure dash
 
+# Fix the resource exhaustion problem on the build infrastructure
+RUN echo 'vm.max_map_count = 4048576' >> /etc/sysctl.conf
+
 # Run under normal user called 'ci'
 RUN useradd --create-home --uid 1000 --shell /usr/bin/bash ci
 USER ci

.github/workflows/yocto-builds.yml

@@ -20,11 +20,13 @@ jobs:
           - raspberrypi0-2w
           - raspberrypi0
           - raspberrypi0-wifi
+          - raspberrypi2-64
           - raspberrypi2
           - raspberrypi3-64
           - raspberrypi3
           - raspberrypi4-64
           - raspberrypi4
+          - raspberrypi5
           - raspberrypi-cm3
           - raspberrypi-cm
           - raspberrypi-armv7
@@ -65,7 +67,8 @@ jobs:
         if: steps.changed-files-specific.outputs.any_changed == 'true'
       - name: Build the image
         run: |
-          docker run --rm \
+          docker run --rm --security-opt apparmor=unconfined \
+            --security-opt seccomp=unconfined \
             -v "$GITHUB_WORKSPACE:/work:ro" \
             -v "$DL_DIR:$DL_DIR:rw" \
             -v "$SSTATE_DIR:$SSTATE_DIR:rw" \
@@ -75,6 +78,7 @@ jobs:
             --env "IMAGE=${{ matrix.image }}" \
             --env "DL_DIR=$DL_DIR" \
             --env "SSTATE_DIR=$SSTATE_DIR" \
+            --ulimit "nofile=1024:1048576" \
             "yocto-builder-${{ github.event.number }}" \
             /entrypoint-build.sh
         if: steps.changed-files-specific.outputs.any_changed == 'true'

.github/workflows/yocto-layer.yml

@@ -42,7 +42,8 @@ jobs:
         if: steps.changed-files-specific.outputs.any_changed == 'true'
       - name: Run yocto-check-layer
         run: |
-          docker run --rm -v "$GITHUB_WORKSPACE:/work:ro" \
+          docker run --rm --security-opt apparmor=unconfined \
+            -v "$GITHUB_WORKSPACE:/work:ro" \
             --env "BASE_REF=$GITHUB_BASE_REF" \
             "yocto-builder-${{ github.event.number }}" \
             /entrypoint-yocto-check-layer.sh

.readthedocs.yaml

@@ -1,5 +1,7 @@
 version: 2
 
+sphinx:
+  configuration: docs/conf.py
 build:
   os: ubuntu-22.04
   tools:

README.md

@@ -48,7 +48,7 @@ OpenEmbedded/Yocto distributions and layer stacks, such as:
 
 This layer is officially approved as part of the `Yocto Project Compatible
 Layers Program`. You can find details of that on the official Yocto Project
-[website](https://www.yoctoproject.org/software-overview/layers/?searchTerm=meta-raspberrypi).
+[website](https://www.yoctoproject.org/development/yocto-project-compatible-layers/).
 
 ## Dependencies
 
@@ -70,9 +70,10 @@ This layer depends on:
 ## Quick Start with kas
 
 1. Install kas build tool from PyPi (sudo pip3 install kas)
-2. kas build meta-raspberrypi/kas-poky-rpi.yml
-3. Use bmaptool to copy the generated .wic.bz2 file to the SD card
-4. Boot your RPI
+2. Set the `machine: ` in kas-poky-rpi.yml to one of the supported boards (see conf/machine/*.conf)
+3. kas build meta-raspberrypi/kas-poky-rpi.yml
+4. Use bmaptool to copy the generated .wic.bz2 file to the SD card
+5. Boot your RPI
 
 To adjust the build configuration with specific options (I2C, SPI, ...), simply add
 a section as follows:
@@ -81,7 +82,7 @@ a section as follows:
 local_conf_header:
   rpi-specific: |
     ENABLE_I2C = "1"
-    RPI_EXTRA_CONFIG = "dtoverlay=pi3-disable-bt"
+    RPI_EXTRA_CONFIG = "dtoverlay=disable-bt"
 ```
 
 To configure the machine, you have to update the `machine` variable.

SECURITY.md

@@ -0,0 +1,20 @@
+How to Report a Potential Vulnerability?
+========================================
+
+If you would like to report a public issue (for example, one with a released
+CVE number), please report it via GitHub issues:
+
+  https://github.com/agherzan/meta-raspberrypi/issues/new/choose
+
+If you are dealing with a not-yet released or urgent issue, please send a
+message to one of the maintainers listed in the [README.md](https://github.com/agherzan/meta-raspberrypi/blob/master/README.md).  Include as many
+details as possible:
+  - the layer or software module affected
+  - the recipe and its version
+  - any example code, if available
+
+Branches maintained with security fixes
+---------------------------------------
+
+See https://wiki.yoctoproject.org/wiki/Releases for the list of current
+releases.  We only accept patches for the LTS releases and the master branch.

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 ?= ""

conf/layer.conf

@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "raspberrypi"
 BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/"
 BBFILE_PRIORITY_raspberrypi = "9"
 
-LAYERSERIES_COMPAT_raspberrypi = "nanbield"
+LAYERSERIES_COMPAT_raspberrypi = "whinlatter"
 LAYERDEPENDS_raspberrypi = "core"
 
 # Additional license directories.
@@ -20,11 +20,6 @@ LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
 #
 # The .bbappend and .bb files are included if the respective layer
 # collection is available.
-BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bbappend' % layer \
-               for layer in BBFILE_COLLECTIONS.split())}"
-BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bb' % layer \
-               for layer in BBFILE_COLLECTIONS.split())}"
-
 BBFILES_DYNAMIC += " \
     openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \
     openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \
@@ -34,6 +29,8 @@ BBFILES_DYNAMIC += " \
     qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \
     multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bb \
     multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bbappend \
+    meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bb \
+    meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bbappend \
 "
 
 DEFAULT_TEST_SUITES:remove:rpi = "parselogs"

conf/machine/include/rpi-base.inc

@@ -18,7 +18,9 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
     overlays/overlay_map.dtb \
     overlays/at86rf233.dtbo \
     overlays/disable-bt.dtbo \
+    overlays/disable-bt-pi5.dtbo \
     overlays/disable-wifi.dtbo \
+    overlays/disable-wifi-pi5.dtbo \
     overlays/dwc2.dtbo \
     overlays/gpio-ir.dtbo \
     overlays/gpio-ir-tx.dtbo \
@@ -26,8 +28,16 @@ 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-dacplusadc.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 \
@@ -41,6 +51,7 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
     overlays/iqaudio-dacplus.dtbo \
     overlays/mcp2515-can0.dtbo \
     overlays/mcp2515-can1.dtbo \
+    overlays/seeed-can-fd-hat-v2.dtbo \
     overlays/mcp3008.dtbo \
     overlays/miniuart-bt.dtbo \
     overlays/pitft22.dtbo \
@@ -50,33 +61,48 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
     overlays/pps-gpio.dtbo \
     overlays/rpi-ft5406.dtbo \
     overlays/rpi-poe.dtbo \
+    overlays/uart0.dtbo \
+    overlays/uart0-pi5.dtbo \
+    overlays/uart1.dtbo \
+    overlays/uart1-pi5.dtbo \
+    overlays/uart2.dtbo \
+    overlays/uart2-pi5.dtbo \
+    overlays/uart3.dtbo \
+    overlays/uart3-pi5.dtbo \
+    overlays/uart4.dtbo \
+    overlays/uart4-pi5.dtbo \
+    overlays/uart5.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-v3d-pi5.dtbo \
     overlays/vc4-kms-dsi-7inch.dtbo \
+    overlays/vc4-kms-dsi-ili9881-7inch.dtbo \
     overlays/w1-gpio.dtbo \
     overlays/w1-gpio-pullup.dtbo \
+    overlays/w1-gpio-pi5.dtbo \
     overlays/wm8960-soundcard.dtbo \
+    overlays/bcm2712d0.dtbo \
     "
 
 RPI_KERNEL_DEVICETREE ?= " \
-    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 \
+    broadcom/bcm2708-rpi-zero.dtb \
+    broadcom/bcm2708-rpi-zero-w.dtb \
+    broadcom/bcm2708-rpi-b.dtb \
+    broadcom/bcm2708-rpi-b-rev1.dtb \
+    broadcom/bcm2708-rpi-b-plus.dtb \
+    broadcom/bcm2709-rpi-2-b.dtb \
+    broadcom/bcm2710-rpi-2-b.dtb \
+    broadcom/bcm2710-rpi-3-b.dtb \
+    broadcom/bcm2710-rpi-3-b-plus.dtb \
+    broadcom/bcm2710-rpi-zero-2.dtb \
+    broadcom/bcm2711-rpi-4-b.dtb \
+    broadcom/bcm2711-rpi-400.dtb \
+    broadcom/bcm2708-rpi-cm.dtb \
+    broadcom/bcm2710-rpi-cm3.dtb \
+    broadcom/bcm2711-rpi-cm4.dtb \
+    broadcom/bcm2711-rpi-cm4s.dtb \
     "
 
 KERNEL_DEVICETREE ??= " \

conf/machine/include/rpi-default-providers.inc

@@ -7,10 +7,6 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains("MACHINE_FEATURES",
 PREFERRED_PROVIDER_virtual/libgl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}"
 PREFERRED_PROVIDER_virtual/mesa ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}"
 PREFERRED_PROVIDER_virtual/libgbm ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}"
-PREFERRED_PROVIDER_vlc ?= "rpidistro-vlc"
-PREFERRED_PROVIDER_ffmpeg ?= "rpidistro-ffmpeg"
-PREFERRED_PROVIDER_libav ?= "rpidistro-ffmpeg"
-PREFERRED_PROVIDER_libpostproc ?= "rpidistro-ffmpeg"
 PREFERRED_PROVIDER_jpeg ?= "jpeg"
 
 PREFERRED_PROVIDER_virtual/libomxil ?= "userland"

conf/machine/include/rpi-default-versions.inc

@@ -1,4 +1,4 @@
 # RaspberryPi BSP default versions
 
-PREFERRED_VERSION_linux-raspberrypi ??= "6.1.%"
+PREFERRED_VERSION_linux-raspberrypi ??= "6.12.%"
 PREFERRED_VERSION_linux-raspberrypi-v7 ??= "${PREFERRED_VERSION_linux-raspberrypi}"

conf/machine/raspberrypi-armv8.conf

@@ -23,6 +23,7 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 "
 
 RPI_KERNEL_DEVICETREE = " \
+    broadcom/bcm2710-rpi-2-b.dtb \
     broadcom/bcm2710-rpi-3-b.dtb \
     broadcom/bcm2710-rpi-3-b-plus.dtb \
     broadcom/bcm2837-rpi-3-b.dtb \
@@ -32,6 +33,11 @@ RPI_KERNEL_DEVICETREE = " \
     broadcom/bcm2711-rpi-400.dtb \
     broadcom/bcm2711-rpi-cm4.dtb \
     broadcom/bcm2711-rpi-cm4s.dtb \
+    broadcom/bcm2712-rpi-5-b.dtb \
+    broadcom/bcm2712-rpi-cm5-cm5io.dtb \
+    broadcom/bcm2712-rpi-cm5-cm4io.dtb \
+    broadcom/bcm2712-rpi-cm5l-cm5io.dtb \
+    broadcom/bcm2712-rpi-cm5l-cm4io.dtb \
 "
 
 SDIMG_KERNELIMAGE ?= "kernel8.img"

conf/machine/raspberrypi2-64.conf

@@ -0,0 +1,30 @@
+#@TYPE: Machine
+#@NAME: RaspberryPi 2 V1.2 Development Board
+#@DESCRIPTION: Machine configuration for the RaspberryPi 2 in 64 bits mode
+
+MACHINEOVERRIDES =. "raspberrypi3-64:"
+
+DEFAULTTUNE ?= "cortexa53-nocrypto"
+require conf/machine/include/arm/armv8a/tune-cortexa53.inc
+include conf/machine/include/rpi-base.inc
+
+RPI_KERNEL_DEVICETREE = " \
+    broadcom/bcm2710-rpi-2-b.dtb \
+    broadcom/bcm2710-rpi-3-b.dtb \
+    broadcom/bcm2710-rpi-3-b-plus.dtb \
+    broadcom/bcm2837-rpi-3-b.dtb \
+    broadcom/bcm2710-rpi-cm3.dtb \
+    "
+
+SDIMG_KERNELIMAGE ?= "kernel8.img"
+# When u-boot is enabled we need to use the "Image" format and the "booti"
+# command to load the kernel
+KERNEL_IMAGETYPE_UBOOT ?= "Image"
+# "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet
+KERNEL_IMAGETYPE_DIRECT ?= "Image"
+KERNEL_BOOTCMD ?= "booti"
+UBOOT_MACHINE = "rpi_arm64_config"
+SERIAL_CONSOLES ?= "115200;ttyAMA0"
+
+VC4DTBO ?= "vc4-fkms-v3d"
+ARMSTUB ?= "armstub8.bin"

conf/machine/raspberrypi2.conf

@@ -12,3 +12,19 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0"
 UBOOT_MACHINE = "rpi_2_config"
 
 ARMSTUB ?= "armstub7.bin"
+
+#
+# Below are variables ONLY needed for running with Yocto/OE's runqemu script
+#
+IMAGE_CLASSES += "qemuboot"
+
+QB_SYSTEM_NAME = "qemu-system-arm"
+QB_MACHINE = "-machine raspi2b"
+QB_MEM = "-m 1024"
+QB_DTB = "bcm2709-rpi-2-b.dtb"
+QB_NET = "none"
+QB_KERNEL_ROOT = "/dev/mmcblk0"
+QB_KERNEL_CMDLINE_APPEND = "rootwait"
+QB_RNG = ""
+QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=sd,format=raw"
+QB_DEFAULT_FSTYPE = "ext3"

conf/machine/raspberrypi3-64.conf

@@ -11,10 +11,12 @@ MACHINE_EXTRA_RRECOMMENDS += "\
     bluez-firmware-rpidistro-bcm4345c0-hcd \
 "
 
+DEFAULTTUNE ?= "cortexa53-nocrypto"
 require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 include conf/machine/include/rpi-base.inc
 
 RPI_KERNEL_DEVICETREE = " \
+    broadcom/bcm2710-rpi-2-b.dtb \
     broadcom/bcm2710-rpi-3-b.dtb \
     broadcom/bcm2710-rpi-3-b-plus.dtb \
     broadcom/bcm2837-rpi-3-b.dtb \

conf/machine/raspberrypi4-64.conf

@@ -12,6 +12,8 @@ MACHINE_EXTRA_RRECOMMENDS += "\
     bluez-firmware-rpidistro-bcm4345c5-hcd \
 "
 
+DEFAULTTUNE = "cortexa72-nocrypto"
+
 require conf/machine/include/arm/armv8a/tune-cortexa72.inc
 include conf/machine/include/rpi-base.inc
 

conf/machine/raspberrypi5.conf

@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: RaspberryPi 5 Development Board (64bit)
+#@DESCRIPTION: Machine configuration for the RaspberryPi 5 in 64 bits mode
+
+require conf/machine/include/arm/armv8-2a/tune-cortexa76.inc
+include conf/machine/include/rpi-base.inc
+
+MACHINE_FEATURES += "pci"
+MACHINE_EXTRA_RRECOMMENDS += "\
+    linux-firmware-rpidistro-bcm43455 \
+    bluez-firmware-rpidistro-bcm4345c0-hcd \
+    linux-firmware-rpidistro-bcm43456 \
+    bluez-firmware-rpidistro-bcm4345c5-hcd \
+"
+
+RPI_KERNEL_DEVICETREE = " \
+    broadcom/bcm2712-rpi-5-b.dtb \
+    broadcom/bcm2712-rpi-cm5-cm5io.dtb \
+    broadcom/bcm2712-rpi-cm5-cm4io.dtb \
+    broadcom/bcm2712-rpi-cm5l-cm5io.dtb \
+    broadcom/bcm2712-rpi-cm5l-cm4io.dtb \
+"
+
+SDIMG_KERNELIMAGE ?= "kernel_2712.img"
+SERIAL_CONSOLES ?= "115200;ttyAMA10"
+
+VC4DTBO ?= "vc4-kms-v3d"
+
+# When u-boot is enabled we need to use the "Image" format and the "booti"
+# command to load the kernel
+KERNEL_IMAGETYPE_UBOOT ?= "Image"
+# "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet
+KERNEL_IMAGETYPE_DIRECT ?= "Image"
+KERNEL_BOOTCMD ?= "booti"
+
+UBOOT_MACHINE = "rpi_arm64_config"

docs/extra-build-config.md

@@ -74,6 +74,22 @@ To remove (or adjust) this delay set these variables in local.conf:
     BOOT_DELAY = "0"
     BOOT_DELAY_MS = "0"
 
+## Boot media
+
+The Raspberry Pi 4 board can load the boot image files from SD card and USB memory.
+By default SD card media is used as boot media.
+
+To switch the boot media from SD card to USB memory, the following variables are supported
+in local.conf: `CMDLINE_ROOT_PARTITION` and `BOOT_MEDIA`.
+The default value of `CMDLINE_ROOT_PARTITION` is "/dev/mmcblk0p2" to mount SD card. If you want to mount USB memory partition, set CMDLINE_ROOT_PARTITION to "/dev/sda2".
+`BOOT_MEDIA` allows  `mmc` and `usb`. The "mmc" is required to load an image from the SD card, following the u-boot specification. Similarly, if you want to load a boot image file from USB memory, set BOOT_MEDIA to "usb".
+
+For example, if you want to use USB boot, please define
+the following parameters in your local.conf file.
+
+    CMDLINE_ROOT_PARTITION = "/dev/sda2"
+    BOOT_MEDIA = "usb"
+
 ## Set overclocking options
 
 The Raspberry Pi can be overclocked. As of now overclocking up to the "Turbo
@@ -162,6 +178,7 @@ the following boards:
 * Raspberry Pi 3 64-bit
 * Raspberry Pi 4 32-bit
 * Raspberry Pi 4 64-bit
+
 It means that, for those boards, `RPI_USE_U_BOOT = "1"` is not compatible with
 `ENABLE_UART = "0"`.
 
@@ -324,12 +341,25 @@ Some modules may require setting the frequency of the crystal oscillator used on
 
     CAN_OSCILLATOR="8000000"
 
+Configure the interrupt pin to the one connected to the CAN module. By default,
+the pins are set to 25 for can0 and 24 for can1. To change them to 12 and 16,
+the following variables also have to be set:
+
+    CAN0_INTERRUPT_PIN = "12"
+    CAN1_INTERRUPT_PIN = "16"
+
 Tested modules:
 
 * PiCAN2 (16 MHz crystal): <http://skpang.co.uk/catalog/pican2-canbus-board-for-raspberry-pi-23-p-1475.html>
 * WaveShare RS485 CAN HAT (8 MHz or 12 MHz crystal): <https://www.waveshare.com/rs485-can-hat.htm>
 * PiCAN2 Duo (16 MHz crystal): <http://skpang.co.uk/catalog/pican2-duo-canbus-board-for-raspberry-pi-23-p-1480.html>
 
+To enable the 2-Channel CAN-BUS(FD) Shield (MCP2518FD), set:
+
+    ENABLE_DUAL_CAN_SEED_FD_HAT_V2 = "1"
+
+* Seed Studio (2-Channel CAN-BUS(FD) Shield): <https://wiki.seeedstudio.com/2-Channel-CAN-BUS-FD-Shield-for-Raspberry-Pi/>
+
 ## Enable infrared
 
 Users who want to enable infrared support, for example for using LIRC (Linux
@@ -464,14 +494,15 @@ MMAL is not enabled by default. To enable it add
 
     DISABLE_VC4GRAPHICS = "1"
 
-to `local.conf`. Adding `vlc` to `IMAGE_INSTALL` will then default to building the Raspberry
-Pi's Distro implementation of VLC with HW accelerated video decode through MMAL into the system
-image. It also defaults to building VLC with Raspberry PI's Distro implementation of ffmpeg. The
-oe-core implementation of ffmpeg and the meta-openembedded/meta-multimedia implementation of VLC
-can however be selected via:
+to `local.conf`. Adding `vlc` to `IMAGE_INSTALL` will then default to building the oe-core
+implementation of ffmpeg and the meta-openembedded/meta-multimedia implementation of VLC.
+The Raspberry Pi's Distro implementation of VLC with HW accelerated video decode through
+MMAL and the Raspberry PI's Distro implementation of ffmpeg. Can however be selected via:
 
-    PREFERRED_PROVIDER_ffmpeg = "ffmpeg"
-    PREFERRED_PROVIDER_vlc = "vlc"
+    PREFERRED_PROVIDER_vlc = "rpidistro-vlc"
+    PREFERRED_PROVIDER_ffmpeg = "rpidistro-ffmpeg"
+    PREFERRED_PROVIDER_libav = "rpidistro-ffmpeg"
+    PREFERRED_PROVIDER_libpostproc = "rpidistro-ffmpeg"
 
 Usage example: Start VLC with mmal_vout plugin and without an active display server.
 

docs/layer-contents.md

@@ -7,13 +7,18 @@
 * raspberrypi0-wifi
 * raspberrypi0-2w-64
 * raspberrypi2
+* raspberrypi2-64 (64 bit kernel & userspace)
 * raspberrypi3
 * raspberrypi3-64 (64 bit kernel & userspace)
 * raspberrypi4
 * raspberrypi4-64 (64 bit kernel & userspace)
+* raspberrypi5
 * raspberrypi-cm (dummy alias for raspberrypi)
 * raspberrypi-cm3
 
+Note: The raspberrypi2-64 machine includes 64-bit support for Raspberry Pi 2B
+V1.2.
+
 Note: The raspberrypi3 machines include support for Raspberry Pi 3B+.
 
 ## Multi-board Machines

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 \
     "

dynamic-layers/multimedia-layer/recipes-multimedia/libcamera-apps/libcamera-apps/0001-utils-version.py-use-usr-bin-env-in-shebang.patch

@@ -1,4 +1,4 @@
-From 738f530829fb5ee37d74191d34f75d72921284ca Mon Sep 17 00:00:00 2001
+From bbc1ea3e4119c665723cfd1c5a364bc8c7cbb464 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Thu, 4 May 2023 18:07:16 +0000
 Subject: [PATCH] utils/version.py: use /usr/bin/env in shebang
@@ -31,7 +31,7 @@ Upstream-Status: Pending
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/utils/version.py b/utils/version.py
-index fc2d431..1400eed 100755
+index 48d7e05..4a5e35c 100755
 --- a/utils/version.py
 +++ b/utils/version.py
 @@ -1,4 +1,4 @@
@@ -39,4 +39,4 @@ index fc2d431..1400eed 100755
 +#!/usr/bin/env python3
  
  # Copyright (C) 2021, Raspberry Pi (Trading) Limited
- # Generate version information for libcamera-apps
+ # Generate version information for rpicam-apps

dynamic-layers/multimedia-layer/recipes-multimedia/libcamera-apps/libcamera-apps/add-missing-header.patch

@@ -0,0 +1,24 @@
+add missing header
+
+When compiling with gcc15, compiliation fails with the following error:
+
+| In file included from ../sources/libcamera-apps-1.9.0/post_processing_stages/segmentation_tf_stage.cpp:8:
+| ../sources/libcamera-apps-1.9.0/post_processing_stages/segmentation.hpp:15:82: error: 'uint8_t' was not declared in this scope
+|    15 |         Segmentation(int w, int h, std::vector<std::string> l, const std::vector<uint8_t> &s)
+
+To avoid it, add the cstdint header to the offending file.
+
+Upstream-Status: Submitted [https://github.com/raspberrypi/rpicam-apps/pull/861]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+diff --git a/post_processing_stages/segmentation.hpp b/post_processing_stages/segmentation.hpp
+index ac87228..82d7939 100644
+--- a/post_processing_stages/segmentation.hpp
++++ b/post_processing_stages/segmentation.hpp
+@@ -7,6 +7,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 

dynamic-layers/multimedia-layer/recipes-multimedia/libcamera-apps/libcamera-apps_1.9.0.bb

@@ -0,0 +1,47 @@
+SUMMARY = "A suite of libcamera-based apps"
+DESCRIPTION = "This is a small suite of libcamera-based apps that aim to \
+copy the functionality of the existing \"raspicam\" apps."
+HOMEPAGE = "https://github.com/raspberrypi/rpicam-apps"
+SECTION = "console/utils"
+
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://license.txt;md5=a0013d1b383d72ba4bdc5b750e7d1d77"
+
+SRC_URI = "\
+    git://github.com/raspberrypi/rpicam-apps.git;protocol=https;branch=main \
+    file://0001-utils-version.py-use-usr-bin-env-in-shebang.patch \
+    file://add-missing-header.patch \
+"
+
+SRCREV = "eca9928b76c106141667288f1cef935d02ba59b3"
+
+PROVIDES += "rpicam-apps"
+
+DEPENDS = "libcamera libexif jpeg tiff libpng boost"
+
+PACKAGECONFIG ??= "drm"
+PACKAGECONFIG[libav] = "-Denable_libav=enabled, -Denable_libav=disabled, libav"
+PACKAGECONFIG[drm] = "-Denable_drm=enabled, -Denable_drm=disabled, libdrm"
+PACKAGECONFIG[egl] = "-Denable_egl=enabled, -Denable_egl=disabled, virtual/egl"
+PACKAGECONFIG[qt] = "-Denable_qt=enabled, -Denable_qt=disabled, qtbase"
+PACKAGECONFIG[opencv] = "-Denable_opencv=enabled, -Denable_opencv=disabled, opencv"
+PACKAGECONFIG[tflite] = "-Denable_tflite=enabled, -Denable_tflite=disabled, tensorflow-lite"
+
+inherit meson pkgconfig
+
+NEON_FLAGS = ""
+NEON_FLAGS:aarch64 = "-Dneon_flags=arm64"
+NEON_FLAGS:arm:raspberrypi3 = "-Dneon_flags=armv8-neon"
+NEON_FLAGS:arm:raspberrypi4 = "-Dneon_flags=armv8-neon"
+EXTRA_OEMESON += "${NEON_FLAGS}"
+
+# QA Issue: /usr/bin/camera-bug-report contained in package libcamera-apps requires /usr/bin/python3
+# QA Issue: File /usr/lib/pkgconfig/rpicam_app.pc in package libcamera-apps-dev contains reference to TMPDIR
+do_install:append() {
+    rm -v ${D}/${bindir}/camera-bug-report
+    sed -i "s,${RECIPE_SYSROOT}${libdir},$\{libdir},g" ${D}${libdir}/pkgconfig/rpicam_app.pc
+}
+
+FILES:${PN} += "${libdir}/rpicam-apps-postproc \
+                ${libdir}/rpicam-apps-preview \
+                ${datadir}/rpi-camera-assets"

dynamic-layers/multimedia-layer/recipes-multimedia/libcamera-apps/libcamera-apps_git.bb

@@ -1,40 +0,0 @@
-SUMMARY = "A suite of libcamera-based apps"
-DESCRIPTION = "This is a small suite of libcamera-based apps that aim to \
-copy the functionality of the existing \"raspicam\" apps."
-HOMEPAGE = "https://github.com/raspberrypi/libcamera-apps"
-SECTION = "console/utils"
-
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://license.txt;md5=a0013d1b383d72ba4bdc5b750e7d1d77"
-
-SRC_URI = "\
-    git://github.com/raspberrypi/libcamera-apps.git;protocol=https;branch=main \
-    file://0001-utils-version.py-use-usr-bin-env-in-shebang.patch \
-"
-PV = "1.2.1+git${SRCPV}"
-SRCREV = "1c1d1c1a2a86d70cf873edc8bb72d174f037973a"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "libcamera libexif jpeg tiff libpng boost"
-
-PACKAGECONFIG ??= "drm"
-PACKAGECONFIG[libav] = "-Denable_libav=true, -Denable_libav=false, libav"
-PACKAGECONFIG[drm] = "-Denable_drm=true, -Denable_drm=false, libdrm"
-PACKAGECONFIG[egl] = "-Denable_egl=true, -Denable_egl=false, virtual/egl"
-PACKAGECONFIG[qt] = "-Denable_qt=true, -Denable_qt=false, qtbase"
-PACKAGECONFIG[opencv] = "-Denable_opencv=true, -Denable_opencv=false, opencv"
-PACKAGECONFIG[tflite] = "-Denable_tflite=true, -Denable_tflite=false, tensorflow-lite"
-
-inherit meson pkgconfig
-
-NEON_FLAGS = ""
-NEON_FLAGS:aarch64 = "-Dneon_flags=arm64"
-NEON_FLAGS:arm:raspberrypi3 = "-Dneon_flags=armv8-neon"
-NEON_FLAGS:arm:raspberrypi4 = "-Dneon_flags=armv8-neon"
-EXTRA_OEMESON += "${NEON_FLAGS}"
-
-# QA Issue: /usr/bin/camera-bug-report contained in package libcamera-apps requires /usr/bin/python3
-do_install:append() {
-    rm -v ${D}/${bindir}/camera-bug-report
-}

dynamic-layers/multimedia-layer/recipes-multimedia/libcamera/libcamera_%.bbappend

@@ -1,2 +1,3 @@
-PACKAGECONFIG[raspberrypi] = "-Dpipelines=rpi/vc4 -Dipas=rpi/vc4 -Dcpp_args=-Wno-unaligned-access"
+EXTRA_OEMESON:append:rpi = " -Dipas=rpi/vc4,rpi/pisp"
 PACKAGECONFIG:append:rpi = " raspberrypi"
+CXXFLAGS:append:rpi = " -Wno-unaligned-access "

dynamic-layers/multimedia-layer/recipes-multimedia/libpisp/files/0001-ignore-lockf-return-value.patch

@@ -0,0 +1,34 @@
+From 230d9c127d45af11739214e78488a93255b832bb Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Tue, 16 Sep 2025 16:28:34 +0200
+Subject: [PATCH] ignore lockf() return value
+
+gcc15 returns an error otherwise:
+
+| ../sources/libpisp-1.2.1/src/helpers/media_device.cpp: In member function 'std::map<std::__cxx11::basic_string<char>, libpisp::helpers::DeviceFd>::iterator libpisp::helpers::MediaDevice::unlock(const std::string&)':
+| ../sources/libpisp-1.2.1/src/helpers/media_device.cpp:251:14: error: ignoring return value of 'int lockf(int, int, __off64_t)' declared with attribute 'warn_unused_result' [-Werror=unused-result]
+|   251 |         lockf(it->second.Get(), F_ULOCK, 0);
+|       |         ~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Upstream-Status: Submitted [https://github.com/raspberrypi/libpisp/pull/53]
+
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/helpers/media_device.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/helpers/media_device.cpp b/src/helpers/media_device.cpp
+index 0dd64d6..121ce79 100644
+--- a/src/helpers/media_device.cpp
++++ b/src/helpers/media_device.cpp
+@@ -248,6 +248,6 @@ std::map<std::string, DeviceFd>::iterator MediaDevice::unlock(const std::string
+ 	if (it == lock_map_.end())
+ 		return lock_map_.end();
+ 
+-	lockf(it->second.Get(), F_ULOCK, 0);
++	std::ignore = lockf(it->second.Get(), F_ULOCK, 0);
+ 	return lock_map_.erase(it);
+ }
+-- 
+2.51.0
+

dynamic-layers/multimedia-layer/recipes-multimedia/libpisp/libpisp_1.2.1.bb

@@ -0,0 +1,16 @@
+DESCRIPTION = "A helper library to generate run-time configuration for the Raspberry Pi \
+ISP (PiSP), consisting of the Frontend and Backend hardware components."
+HOMEPAGE = "https://github.com/raspberrypi/libpisp"
+LICENSE = "BSD-2-Clause & GPL-2.0-only & GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3417a46e992fdf62e5759fba9baef7a7 \
+                    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c"
+
+SRC_URI = "git://github.com/raspberrypi/libpisp.git;protocol=https;branch=main \
+           file://0001-ignore-lockf-return-value.patch"
+
+SRCREV = "981977ff21f32c8a97d2a0ecbdff3e39d42ccce3"
+
+DEPENDS = "nlohmann-json"
+
+inherit meson pkgconfig

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/rpidistro-vlc_3.0.17.bb

@@ -32,8 +32,6 @@ SRC_URI = "\
 
 SRCREV = "b276eb0d7bc3213363e97dbb681ef7c927be6c73"
 
-S = "${WORKDIR}/git"
-
 PROVIDES = "vlc"
 RPROVIDES:${PN} = "${PROVIDES}"
 DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \

dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb

@@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=660e614bc7efb0697cc793d8a22a55c2"
 SRC_URI = "git://github.com/adafruit/Adafruit_Blinka.git;branch=main;protocol=https"
 SRCREV = "dc688f354fe779c9267c208b99f310af87e79272"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += "python3-setuptools-scm-native"

dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb

@@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec69d6e9e6c85adfb7799d7f8cf044e"
 SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_BusDevice.git;branch=main;protocol=https"
 SRCREV = "1bfe8005293205e2f7b2cc498ab5a946f1133b40"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += "python3-setuptools-scm-native"

dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb

@@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b72678307cc7c10910b5ef460216af07"
 SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_Motor.git;branch=main;protocol=https"
 SRCREV = "2251bfc0501d0acfb96c0a43f4f2b4c6a10ca14e"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += "python3-setuptools-scm-native"

dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb

@@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6ad4a8854b39ad474755ef1aea813bac"
 SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_MotorKit.git;branch=main;protocol=https"
 SRCREV = "8c1462b4129b21f6db156d1517abb017bb74b982"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += "python3-setuptools-scm-native"

dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb

@@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e7eb6b599fb0cfb06485c64cd4242f62"
 SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_PCA9685.git;branch=main;protocol=https"
 SRCREV = "2780c4102f4c23fbab252aa1198b61ba7e2d1b2c"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += "python3-setuptools-scm-native"

kas-poky-rpi.yml

@@ -12,7 +12,7 @@ repos:
   poky:
     url: https://git.yoctoproject.org/git/poky
     path: layers/poky
-    refspec: master
+    branch: master
     layers:
       meta:
       meta-poky:
@@ -21,7 +21,7 @@ repos:
   meta-openembedded:
     url: http://git.openembedded.org/meta-openembedded
     path: layers/meta-openembedded
-    refspec: master
+    branch: master
     layers:
       meta-oe:
       meta-python:
@@ -31,7 +31,7 @@ repos:
   meta-qt5:
     url: https://github.com/meta-qt5/meta-qt5/
     path: layers/meta-qt5
-    refspec: master
+    branch: master
 
 bblayers_conf_header:
   standard: |
@@ -48,7 +48,7 @@ local_conf_header:
     USER_CLASSES = "buildstats"
     PATCHRESOLVE = "noop"
   debug-tweaks: |
-    EXTRA_IMAGE_FEATURES = "debug-tweaks"
+    IMAGE_FEATURES += "empty-root-password allow-empty-password allow-root-login post-install-logging"
   diskmon: |
     BB_DISKMON_DIRS = "\
         STOPTASKS,${TMPDIR},1G,100K \
@@ -59,3 +59,7 @@ local_conf_header:
         HALT,${DL_DIR},100M,1K \
         HALT,${SSTATE_DIR},100M,1K \
         HALT,/tmp,10M,1K"
+  license: |
+    # Uncomment next line to allow the license
+    # See: linux-firmware-rpidistro in docs/ipcompliance.md
+    #LICENSE_FLAGS_ACCEPTED = "synaptics-killswitch"

recipes-bsp/armstubs/armstubs.bb

@@ -11,14 +11,14 @@ COMPATIBLE_MACHINE = "^rpi$"
 
 S = "${RPITOOLS_S}/armstubs"
 
-export CC7="${CC}"
-export LD7="${LD}"
-export OBJCOPY7="${OBJCOPY}"
-export OBJDUMP7="${OBJDUMP}"
-export CC8="${CC}"
-export LD8="${LD}"
-export OBJCOPY8="${OBJCOPY}"
-export OBJDUMP8="${OBJDUMP} -maarch64"
+export CC7 = "${CC}"
+export LD7 = "${LD}"
+export OBJCOPY7 = "${OBJCOPY}"
+export OBJDUMP7 = "${OBJDUMP}"
+export CC8 = "${CC}"
+export LD8 = "${LD}"
+export OBJCOPY8 = "${OBJCOPY}"
+export OBJDUMP8 = "${OBJDUMP} -maarch64"
 
 do_compile() {
     [ -z "${ARMSTUB}" ] && bbfatal "No ARMSTUB defined for your machine."

recipes-bsp/bootfiles/rpi-bootfiles.bb

@@ -5,7 +5,16 @@ LIC_FILES_CHKSUM = "file://LICENCE.broadcom;md5=c403841ff2837657b2ed8e5bb474ac8d
 
 inherit deploy nopackages
 
-include recipes-bsp/common/raspberrypi-firmware.inc
+RPIFW_DATE ?= "20250801"
+SRCREV = "95be71b8c0f63f03dc06dd0e4c2e5535e6fb4a93"
+SHORTREV = "${@d.getVar("SRCREV", False).__str__()[:7]}"
+RPIFW_SRC_URI ?= "https://api.github.com/repos/raspberrypi/firmware/tarball/${SRCREV};downloadfilename=raspberrypi-firmware-${SHORTREV}.tar.gz"
+RPIFW_S ?= "${UNPACKDIR}/raspberrypi-firmware-${SHORTREV}"
+
+SRC_URI = "${RPIFW_SRC_URI}"
+SRC_URI[sha256sum] = "8b270b44b7702aae2d60e12b9bb4ea9ce0d9bc34662f7229092b8110d34ef7dd"
+
+PV = "${RPIFW_DATE}"
 
 INHIBIT_DEFAULT_DEPS = "1"
 

recipes-bsp/bootfiles/rpi-cmdline.bb

@@ -9,7 +9,9 @@ inherit deploy nopackages
 CMDLINE_DWC_OTG ?= "dwc_otg.lpm_enable=0"
 
 CMDLINE_ROOT_FSTYPE ?= "rootfstype=ext4"
-CMDLINE_ROOTFS ?= "root=/dev/mmcblk0p2 ${CMDLINE_ROOT_FSTYPE} rootwait"
+CMDLINE_ROOT_PARTITION ?= "/dev/mmcblk0p2"
+
+CMDLINE_ROOTFS ?= "root=${CMDLINE_ROOT_PARTITION} ${CMDLINE_ROOT_FSTYPE} rootwait"
 
 CMDLINE_SERIAL ?= "${@oe.utils.conditional("ENABLE_UART", "1", "console=serial0,115200", "", d)}"
 
@@ -44,6 +46,9 @@ CMDLINE_ISOL_CPUS ?= "${@setup_isolcpus(d)}"
 # if the MAC addresses are omitted, random values will be used
 CMDLINE_RNDIS ?= ""
 
+# That allows to keep the traditional network interface names
+CMDLINE_IFNAMES ?= "net.ifnames=0"
+
 CMDLINE = " \
     ${CMDLINE_ISOL_CPUS} \
     ${CMDLINE_DWC_OTG} \
@@ -55,6 +60,7 @@ CMDLINE = " \
     ${CMDLINE_PITFT} \
     ${CMDLINE_DEBUG} \
     ${CMDLINE_RNDIS} \
+    ${CMDLINE_IFNAMES} \
     "
 
 do_compile() {

recipes-bsp/bootfiles/rpi-config_git.bb

@@ -12,28 +12,28 @@ SRC_URI = "git://github.com/Evilpaul/RPi-config.git;protocol=https;branch=master
            file://0001-config.txt-reintroduce-start_x.patch \
           "
 
-S = "${WORKDIR}/git"
-
 PR = "r5"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
-PITFT22="${@bb.utils.contains("MACHINE_FEATURES", "pitft22", "1", "0", d)}"
-PITFT28r="${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "1", "0", d)}"
-PITFT28c="${@bb.utils.contains("MACHINE_FEATURES", "pitft28c", "1", "0", d)}"
-PITFT35r="${@bb.utils.contains("MACHINE_FEATURES", "pitft35r", "1", "0", d)}"
+PITFT = "${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
+PITFT22 = "${@bb.utils.contains("MACHINE_FEATURES", "pitft22", "1", "0", d)}"
+PITFT28r = "${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "1", "0", d)}"
+PITFT28c = "${@bb.utils.contains("MACHINE_FEATURES", "pitft28c", "1", "0", d)}"
+PITFT35r = "${@bb.utils.contains("MACHINE_FEATURES", "pitft35r", "1", "0", d)}"
 
-VC4GRAPHICS="${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}"
+VC4GRAPHICS = "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}"
 VC4DTBO ?= "vc4-kms-v3d"
 GPIO_IR ?= "18"
 GPIO_IR_TX ?= "17"
 
 CAN_OSCILLATOR ?= "16000000"
+CAN0_INTERRUPT_PIN ?= "25"
+CAN1_INTERRUPT_PIN ?= "24"
 
 ENABLE_UART ??= ""
 
-WM8960="${@bb.utils.contains("MACHINE_FEATURES", "wm8960", "1", "0", d)}"
+WM8960 = "${@bb.utils.contains("MACHINE_FEATURES", "wm8960", "1", "0", d)}"
 
 GPIO_SHUTDOWN_PIN ??= ""
 
@@ -268,15 +268,18 @@ do_deploy() {
     # ENABLE DUAL CAN
     if [ "${ENABLE_DUAL_CAN}" = "1" ]; then
         echo "# Enable DUAL CAN" >>$CONFIG
-        echo "dtoverlay=mcp2515-can0,oscillator=${CAN_OSCILLATOR},interrupt=25" >>$CONFIG
-        echo "dtoverlay=mcp2515-can1,oscillator=${CAN_OSCILLATOR},interrupt=24" >>$CONFIG
+        echo "dtoverlay=mcp2515-can0,oscillator=${CAN_OSCILLATOR},interrupt=${CAN0_INTERRUPT_PIN}" >>$CONFIG
+        echo "dtoverlay=mcp2515-can1,oscillator=${CAN_OSCILLATOR},interrupt=${CAN1_INTERRUPT_PIN}" >>$CONFIG
+    # Enable DUAL CAN FOR SEED CAN FD HAT V2
+    elif [ "${ENABLE_DUAL_CAN_SEED_FD_HAT_V2}" = "1" ]; then
+        echo "# Enable DUAL CAN FOR SEED CAN FD HAT V2" >>$CONFIG
+        echo "dtoverlay=seeed-can-fd-hat-v2" >>$CONFIG
     # ENABLE CAN
     elif [ "${ENABLE_CAN}" = "1" ]; then
         echo "# Enable CAN" >>$CONFIG
-        echo "dtoverlay=mcp2515-can0,oscillator=${CAN_OSCILLATOR},interrupt=25" >>$CONFIG
+        echo "dtoverlay=mcp2515-can0,oscillator=${CAN_OSCILLATOR},interrupt=${CAN0_INTERRUPT_PIN}" >>$CONFIG
     fi
 
-
     if [ "${ENABLE_GPIO_SHUTDOWN}" = "1" ]; then
         if ([ "${ENABLE_I2C}" = "1" ] || [ "${PITFT}" = "1" ]) && [ -z "${GPIO_SHUTDOWN_PIN}" ]; then
             # By default GPIO shutdown uses the same pin as the (master) I2C SCL.
@@ -317,6 +320,13 @@ do_deploy() {
         echo "# Enable One-Wire Interface" >> $CONFIG
         echo "dtoverlay=w1-gpio" >> $CONFIG
     fi
+
+    # Reduce config.txt file size to avoid corruption and
+    # to boot successfully Raspberry Pi 5. The issue has
+    # been reported to related projects:
+    # https://github.com/raspberrypi/firmware/issues/1848
+    # https://github.com/Evilpaul/RPi-config/issues/9
+    sed -i '/^##/d' $CONFIG
 }
 
 do_deploy:append:raspberrypi3-64() {

recipes-bsp/common/raspberrypi-firmware.inc

@@ -1,7 +1,7 @@
 RPIFW_DATE ?= "20230509~buster"
 
 RPIFW_SRC_URI ?= "https://archive.raspberrypi.com/debian/pool/main/r/raspberrypi-firmware/raspberrypi-firmware_1.${RPIFW_DATE}.orig.tar.xz"
-RPIFW_S ?= "${WORKDIR}/raspberrypi-firmware-1.${RPIFW_DATE}"
+RPIFW_S ?= "${UNPACKDIR}/raspberrypi-firmware-1.${RPIFW_DATE}"
 
 SRC_URI = "${RPIFW_SRC_URI}"
 SRC_URI[sha256sum] = "1d9eb83111826b708f461101766fd2000d45f1c171ad573936d000f623ca8098"

recipes-bsp/common/raspberrypi-tools.inc

@@ -1,7 +1,7 @@
 RPITOOLS_DATE ?= "20220711"
 SRCREV ?= "439b6198a9b340de5998dd14a26a0d9d38a6bcac"
 RPITOOLS_SRC_URI ?= "git://github.com/raspberrypi/tools;protocol=https;branch=master"
-RPITOOLS_S ?= "${WORKDIR}/git"
+RPITOOLS_S ?= "${UNPACKDIR}/${BP}"
 
 SRC_URI = "${RPITOOLS_SRC_URI}"
 

recipes-bsp/gpio-shutdown/gpio-shutdown.bb

@@ -6,6 +6,8 @@ SRC_URI = "file://bind_gpio_shutdown.tab \
     file://gpio-shutdown-keymap.sh \
 "
 
+S = "${UNPACKDIR}"
+
 inherit  update-rc.d
 
 INITSCRIPT_NAME = "gpio-shutdown-keymap.sh"
@@ -19,8 +21,8 @@ do_install() {
             ${D}${sysconfdir}/inittab.d \
             ${D}${sysconfdir}/init.d
 
-        install -m 0755 ${WORKDIR}/gpio-shutdown-keymap.sh ${D}${sysconfdir}/init.d/
-        install -m 0755 ${WORKDIR}/bind_gpio_shutdown.tab ${D}${sysconfdir}/inittab.d/
+        install -m 0755 ${UNPACKDIR}/gpio-shutdown-keymap.sh ${D}${sysconfdir}/init.d/
+        install -m 0755 ${UNPACKDIR}/bind_gpio_shutdown.tab ${D}${sysconfdir}/inittab.d/
     elif ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         # Systemd init does not require any configuration.
         # Note: cannot have an empty branch, hence the redundant dir install.

recipes-bsp/rpi-eeprom/rpi-eeprom_git.bb

@@ -1,17 +1,15 @@
 SUMMARY = "Installation scripts and binaries for the Raspberry Pi 4 EEPROM"
-DESCRIPTION = "This repository contains the rpi4 bootloader and scripts \
+DESCRIPTION = "This repository contains the rpi4/rpi5 bootloader and scripts \
 for updating it in the spi eeprom"
 LICENSE = "BSD-3-Clause & Broadcom-RPi"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f546ed4f47e9d4c1fe954ecc9d3ef4f3"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a6c5149578a16272119f3f9c13d6549b"
 
 SRC_URI = " \
     git://github.com/raspberrypi/rpi-eeprom.git;protocol=https;branch=master \
 "
 
-SRCREV = "f13b5789f56f65112e2b8aa58be43ebfcbedfe1d"
-PV = "v2023.10.18-2712"
-
-S = "${WORKDIR}/git"
+SRCREV = "2349daafacfb7a7abe2cfecf30a49ae837bdf2c6"
+PV = "v2025.07.17-2712"
 
 RDEPENDS:${PN} += " \
     coreutils \
@@ -34,22 +32,29 @@ do_install() {
     install -m 0755 ${S}/rpi-eeprom-digest ${D}${bindir}
 
     # copy firmware files
-    install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader/default
-    install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader/latest
+    install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader-2711/default
+    install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader-2711/latest
+    install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader-2712/default
+    install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader-2712/latest
 
-    install -m 644 ${S}/firmware-2711/default/* ${D}${base_libdir}/firmware/raspberrypi/bootloader/default
-    install -m 644 ${S}/firmware-2711/latest/* ${D}${base_libdir}/firmware/raspberrypi/bootloader/latest
+    install -m 644 ${S}/firmware-2711/default/* ${D}${base_libdir}/firmware/raspberrypi/bootloader-2711/default
+    install -m 644 ${S}/firmware-2711/latest/* ${D}${base_libdir}/firmware/raspberrypi/bootloader-2711/latest
+    install -m 644 ${S}/firmware-2712/default/* ${D}${base_libdir}/firmware/raspberrypi/bootloader-2712/default
+    install -m 644 ${S}/firmware-2712/latest/* ${D}${base_libdir}/firmware/raspberrypi/bootloader-2712/latest
 
-    ln -s default ${D}${base_libdir}/firmware/raspberrypi/bootloader/critical
-    ln -s latest ${D}${base_libdir}/firmware/raspberrypi/bootloader/stable
-    ln -s latest ${D}${base_libdir}/firmware/raspberrypi/bootloader/beta
+    ln -s default ${D}${base_libdir}/firmware/raspberrypi/bootloader-2711/critical
+    ln -s latest ${D}${base_libdir}/firmware/raspberrypi/bootloader-2711/stable
+    ln -s latest ${D}${base_libdir}/firmware/raspberrypi/bootloader-2711/beta
+    ln -s default ${D}${base_libdir}/firmware/raspberrypi/bootloader-2712/critical
+    ln -s latest ${D}${base_libdir}/firmware/raspberrypi/bootloader-2712/stable
+    ln -s latest ${D}${base_libdir}/firmware/raspberrypi/bootloader-2712/beta
 
     # copy default config
     install -d ${D}${sysconfdir}/default
     install -D ${S}/rpi-eeprom-update-default ${D}${sysconfdir}/default/rpi-eeprom-update
 }
 
-FILES:${PN} += "${base_libdir}/firmware/raspberrypi/bootloader/*"
+FILES:${PN} += "${base_libdir}/firmware/raspberrypi/bootloader-*"
 
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
@@ -59,4 +64,4 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 # need to disable arch check for it otherwise it cannot packed.
 QAPATHTEST[arch] = ""
 
-COMPATIBLE_MACHINE = "raspberrypi4|raspberrypi4-64"
+COMPATIBLE_MACHINE = "raspberrypi4|raspberrypi4-64|raspberrypi5"

recipes-bsp/rpi-u-boot-scr/files/boot.cmd.in

@@ -1,4 +1,4 @@
 fdt addr ${fdt_addr} && fdt get value bootargs /chosen bootargs
-fatload mmc 0:1 ${kernel_addr_r} @@KERNEL_IMAGETYPE@@
-if test ! -e mmc 0:1 uboot.env; then saveenv; fi;
+fatload @@BOOT_MEDIA@@ 0:1 ${kernel_addr_r} @@KERNEL_IMAGETYPE@@
+if test ! -e @@BOOT_MEDIA@@ 0:1 uboot.env; then saveenv; fi;
 @@KERNEL_BOOTCMD@@ ${kernel_addr_r} - ${fdt_addr}

recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb

@@ -9,15 +9,20 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 SRC_URI = "file://boot.cmd.in"
 
+BOOT_MEDIA ?= "mmc"
+
 do_compile() {
     sed -e 's/@@KERNEL_IMAGETYPE@@/${KERNEL_IMAGETYPE}/' \
         -e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/' \
-        "${WORKDIR}/boot.cmd.in" > "${WORKDIR}/boot.cmd"
+        -e 's/@@BOOT_MEDIA@@/${BOOT_MEDIA}/' \
+        "${UNPACKDIR}/boot.cmd.in" > "${WORKDIR}/boot.cmd"
     mkimage -A ${UBOOT_ARCH} -T script -C none -n "Boot script" -d "${WORKDIR}/boot.cmd" boot.scr
 }
 
 inherit kernel-arch deploy nopackages
 
+S = "${UNPACKDIR}"
+
 do_deploy() {
     install -d ${DEPLOYDIR}
     install -m 0644 boot.scr ${DEPLOYDIR}

recipes-bsp/u-boot/files/0001-rpi-always-set-fdt_addr-with-firmware-provided-FDT-address.patch

@@ -1,52 +0,0 @@
-From: Mauro Salvini <m.salvini@koansoftware.com>
-To: u-boot@lists.denx.de
-Subject: [PATCH] rpi: always set fdt_addr with firmware-provided FDT address
-Date: Wed, 12 May 2021 14:39:45 +0200	[thread overview]
-Message-ID: <20210512123945.25649-1-m.salvini@koansoftware.com> (raw)
-
-Raspberry firmware prepares the FDT blob in memory at an address
-that depends on both the memory size and the blob size [1].
-After commit ade243a211d6 ("rpi: passthrough of the firmware provided FDT
-blob") this FDT is passed to kernel through fdt_addr environment variable,
-handled in set_fdt_addr() function in board file.
-
-When u-boot environment is persistently saved, if a change happens
-in loaded FDT (e.g. for a new overlay applied), firmware produces a FDT
-address different from the saved one, but u-boot still use the saved
-one because set_fdt_addr() function does not overwrite the fdt_addr
-variable. So, for example, if there is a script that uses fdt commands for
-e.g. manipulate the bootargs, boot hangs with error
-
-libfdt fdt_check_header(): FDT_ERR_BADMAGIC
-
-Removing the fdt_addr variable in saved environment allows to boot.
-
-With this patch set_fdt_addr() function always overwrite fdt_addr value.
-
-[1] https://www.raspberrypi.org/forums//viewtopic.php?f=107&t=134018
-
-Signed-off-by: Mauro Salvini <m.salvini@koansoftware.com>
-Cc: C?dric Schieli <cschieli@gmail.com>
-Cc: Matthias Brugger <mbrugger@suse.com>
----
-Upstream-Status: Pending
-
- board/raspberrypi/rpi/rpi.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
-index df52a4689f..611013471e 100644
---- a/board/raspberrypi/rpi/rpi.c
-+++ b/board/raspberrypi/rpi/rpi.c
-@@ -318,9 +318,6 @@ static void set_fdtfile(void)
-  */
- static void set_fdt_addr(void)
- {
--	if (env_get("fdt_addr"))
--		return;
--
- 	if (fdt_magic(fw_dtb_pointer) != FDT_MAGIC)
- 		return;
- 
--- 
-2.17.1

recipes-bsp/u-boot/files/maxsize.cfg

@@ -0,0 +1 @@
+CONFIG_SYS_BOOTM_LEN=0x1000000

recipes-bsp/u-boot/u-boot_%.bbappend

@@ -4,11 +4,11 @@ SRC_URI:append:rpi = " \
     file://fw_env.config \
 "
 
-SRC_URI:append:rpi = " file://0001-rpi-always-set-fdt_addr-with-firmware-provided-FDT-address.patch"
+SRC_URI:append:raspberrypi4 = " file://maxsize.cfg"
 
 DEPENDS:append:rpi = " u-boot-default-script"
 
 do_install:append:rpi () {
     install -d ${D}${sysconfdir}
-    install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
+    install -m 0644 ${UNPACKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
 }

recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.19.bb

@@ -10,9 +10,7 @@ SRC_URI = "\
     git://github.com/RPi-Distro/pi-bluetooth;branch=master;protocol=https \
     file://0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch \
 "
-SRCREV = "fd4775bf90e037551532fc214a958074830bb80d"
-
-S = "${WORKDIR}/git"
+SRCREV = "87248a382d1a81b80a62730975135d87fffd7ef1"
 
 inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'update-rc.d', d)}
 # hciuart.service replaces what was brcm43438.service 

recipes-core/packagegroups/packagegroup-rpi-test.bb

@@ -16,7 +16,6 @@ RDEPENDS:${PN} = "\
     raspi-gpio \
     rpio \
     rpi-gpio \
-    pi-blaster \
     python3-adafruit-circuitpython-register \
     python3-adafruit-platformdetect \
     python3-adafruit-pureio \
@@ -27,6 +26,9 @@ RDEPENDS:${PN} = "\
     bluez5 \
 "
 
+RDEPENDS:${PN}:append:rpi:armv7a = " pi-blaster"
+RDEPENDS:${PN}:append:rpi:armv7ve = " pi-blaster"
+
 RRECOMMENDS:${PN} = "\
     ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-multimedia", "bigbuckbunny-1080p bigbuckbunny-480p bigbuckbunny-720p", "", d)} \
     ${MACHINE_EXTRA_RRECOMMENDS} \

recipes-core/psplash/psplash_%.bbappend

@@ -5,7 +5,7 @@ SRC_URI:append:rpi = " file://framebuf.conf"
 
 do_install:append:rpi() {
     if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then
-        install -Dm 0644 ${WORKDIR}/framebuf.conf ${D}${systemd_system_unitdir}/psplash-start.service.d/framebuf.conf
+        install -Dm 0644 ${UNPACKDIR}/framebuf.conf ${D}${systemd_system_unitdir}/psplash-start.service.d/framebuf.conf
     fi
 }
 

recipes-core/udev/udev-rules-rpi.bb

@@ -8,12 +8,10 @@ SRC_URI = " \
 	"
 SRCREV = "5ce3ef2b7f377c23fea440ca9df0e30f3f8447cf"
 
-S = "${WORKDIR}/git"
-
 INHIBIT_DEFAULT_DEPS = "1"
 
 do_install () {
     install -d ${D}${sysconfdir}/udev/rules.d
     install -m 0644 ${S}/etc.armhf/udev/rules.d/99-com.rules ${D}${sysconfdir}/udev/rules.d/
-    install -m 0644 ${WORKDIR}/can.rules ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${UNPACKDIR}/can.rules ${D}${sysconfdir}/udev/rules.d/
 }

recipes-core/udev/udev-rules-udisks-rpi_1.0.bb

@@ -3,11 +3,13 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 SRC_URI = "file://80-udisks-rpi.rules"
 
+S = "${UNPACKDIR}"
+
 INHIBIT_DEFAULT_DEPS = "1"
 
 do_install () {
 	install -d ${D}${base_libdir}/udev/rules.d
-	install -m 644 ${WORKDIR}/80-udisks-rpi.rules ${D}${base_libdir}/udev/rules.d
+	install -m 644 ${UNPACKDIR}/80-udisks-rpi.rules ${D}${base_libdir}/udev/rules.d
 }
 
 FILES:${PN} = "${base_libdir}/udev/rules.d"

recipes-devtools/bcm2835/bcm2835_1.73.bb

@@ -12,8 +12,7 @@ COMPATIBLE_MACHINE = "^rpi$"
 
 SRC_URI = "http://www.airspayce.com/mikem/bcm2835/bcm2835-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "9bd2d39bf4b3a9e81dce799ca51c826a"
-SRC_URI[sha256sum] = "564920d205977d7e2846e434947708455d468d3a952feca9faef643abd03a227"
+SRC_URI[sha256sum] = "e67a986462618988a5a86752e36e3ebdd7c5cae66940ff7330aea243b2762525"
 
 inherit autotools
 

recipes-devtools/pi-blaster/pi-blaster_git.bb

@@ -8,8 +8,6 @@ SRC_URI = "git://github.com/sarfata/pi-blaster;branch=master;protocol=https \
            file://remove-initscript-lsb-dependency.patch \
            "
 
-S = "${WORKDIR}/git"
-
 SRCREV = "fbba9a7dcef0f352a11f8a2a5f6cbc15b62c0829"
 
 inherit update-rc.d autotools
@@ -18,6 +16,10 @@ INITSCRIPT_PACKAGES = "${PN}"
 INITSCRIPT_NAME:${PN} = "${PN}.boot.sh"
 INITSCRIPT_PARAMS:${PN} = "defaults 15 85"
 
-COMPATIBLE_MACHINE = "^rpi$"
+# only works on 32-bit targets
+# https://github.com/sarfata/pi-blaster/issues/114
+COMPATIBLE_MACHINE = "(^$)"
+COMPATIBLE_MACHINE:rpi:armv7a = "(.*)"
+COMPATIBLE_MACHINE:rpi:armv7ve = "(.*)"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"

recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.10.bb

@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec69d6e9e6c85adfb7799d7f8cf044e"
 
 SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_Register.git;branch=main;protocol=https"
 SRCREV = "d1e8ac7ad9dcd65ab83749db3e5c96ffee80ebb7"
-S = "${WORKDIR}/git"
 
 DEPENDS += "python3-setuptools-scm-native"
 

recipes-devtools/python/python3-adafruit-platformdetect_3.27.0.bb

@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fccd531dce4b989c05173925f0bbb76c"
 
 SRC_URI = "git://github.com/adafruit/Adafruit_Python_PlatformDetect.git;branch=main;protocol=https"
 SRCREV = "e1460098eeca5ea573f92814691bb378e15530d9"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 

recipes-devtools/python/python3-adafruit-pureio_1.1.9.bb

@@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2a21fcca821a506d4c36f7bbecc0d009"
 SRC_URI = "git://github.com/adafruit/Adafruit_Python_PureIO.git;branch=main;protocol=https"
 SRCREV = "383b615ce9ff5bbefdf77652799f380016fda353"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += "python3-setuptools-scm-native"

recipes-devtools/python/python3-rtimu_7.2.1.bb

@@ -11,5 +11,5 @@ SRC_URI = "git://github.com/RPi-Distro/RTIMULib.git;protocol=http;branch=master;
           "
 SRCREV = "b949681af69b45f0f7f4bb53b6770037b5b02178"
 
-S = "${WORKDIR}/git/Linux/python"
+S = "${UNPACKDIR}/${BP}/Linux/python"
 inherit setuptools3

recipes-devtools/python/rpio_0.10.1.bb

@@ -9,7 +9,6 @@ SRC_URI = "\
     git://github.com/metachris/RPIO.git;protocol=https;branch=master \
     "
 SRCREV = "be1942a69b2592ddacd9dc833d2668a19aafd8d2"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 

recipes-devtools/raspi-gpio/raspi-gpio_git.bb

@@ -12,5 +12,3 @@ SRCREV = "22b44e4765b4b78dc5b22394fff484e353d5914d"
 SRC_URI = "git://github.com/RPi-Distro/raspi-gpio.git;protocol=https;branch=master \
           "
 
-S = "${WORKDIR}/git"
-

recipes-devtools/raspi-utils/raspi-utils_git.bb

@@ -0,0 +1,51 @@
+SUMMARY = "A collection of scripts and simple applications"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=4c01239e5c3a3d133858dedacdbca63c"
+
+RCONFLICTS:${PN} = "userland"
+DEPENDS:append = " dtc"
+PACKAGES =+ " ${PN}-raspinfo"
+PACKAGES =+ " ${PN}-ovmerge"
+RDEPENDS:${PN}-raspinfo += " bash"
+RDEPENDS:${PN}-ovmerge += " perl"
+
+PV = "1.0+git"
+
+SRC_URI = "git://github.com/raspberrypi/utils;protocol=https;branch=master"
+
+SRCREV = "e923ccad57d2a22f606c8fe0d1096e782a090fc9"
+
+FILES:${PN}:append = " \
+    ${datadir}/bash-completion/completions/pinctrl \
+    ${datadir}/bash-completion/completions/vcgencmd \
+"
+FILES:${PN}-raspinfo += "${bindir}/raspinfo"
+FILES:${PN}-ovmerge += "${bindir}/ovmerge"
+
+OECMAKE_TARGET_COMPILE = "\
+    dtmerge/all \
+    eeptools/all \
+    otpset/all \
+    overlaycheck/all \
+    ovmerge/all \
+    pinctrl/all \
+    raspinfo/all \
+    vcgencmd/all \
+    vclog/all \
+    vcmailbox/all \
+"
+
+OECMAKE_TARGET_INSTALL = "\
+    dtmerge/install \
+    eeptools/install \
+    otpset/install \
+    overlaycheck/install \
+    ovmerge/install \
+    pinctrl/install \
+    raspinfo/install \
+    vcgencmd/install \
+    vclog/install \
+    vcmailbox/install \
+"
+
+inherit cmake

recipes-graphics/mesa/mesa.bbappend

@@ -0,0 +1 @@
+PACKAGECONFIG:append:rpi = " gallium vc4 v3d ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'vulkan broadcom', '', d)}"

recipes-graphics/mesa/mesa_%.bbappend

@@ -1,6 +0,0 @@
-# DRI3 note:
-# With oe-core commit 8509e2e1a87578882b71948ccef3b50ccf1228b3 dri3 is set
-# as default. To state out clearly that Raspi needs dri3 and to avoid surprises
-# in case oe-core changes this default, we set dri3 explicitly.
-PACKAGECONFIG:append:rpi = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'vulkan broadcom', '', d)}"
-DRIDRIVERS:class-target:rpi = ""

recipes-graphics/raspidmx/raspidmx_git.bb

@@ -20,8 +20,6 @@ SRC_URI = "git://github.com/AndrewFromMelbourne/raspidmx;protocol=https;branch=m
 PV = "0.0+git${SRCPV}"
 SRCREV = "e2ee6faa0d01a5ece06bcc74a47f37d7e6837310"
 
-S = "${WORKDIR}/git"
-
 inherit pkgconfig
 
 DEPENDS += "libpng userland"

recipes-graphics/userland/files/0025-CMakeLists.txt-.pc-respect-CMAKE_INSTALL_LIBDIR.patch

@@ -0,0 +1,725 @@
+From 8f7fba136391e2020cd0fc9dca76932d3faa21eb Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Fri, 8 Mar 2024 16:29:22 +0100
+Subject: [PATCH] CMakeLists.txt, *.pc: respect CMAKE_INSTALL_LIBDIR
+
+* and CMAKE_INSTALL_BINDIR, CMAKE_INSTALL_INCLUDEDIR as well
+* fixes installation paths with multilib
+  lib32-userland fails with:
+
+ERROR: QA Issue: lib32-userland: Files/directories were installed but not shipped in any package:
+  /usr/lib/libbrcmEGL.so
+  /usr/lib/libvchiq_arm.so
+...
+  /usr/lib/pkgconfig/wayland-egl.pc
+Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
+lib32-userland: 66 installed and not shipped files. [installed-vs-shipped]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+Upstream-Status: Pending
+
+ CMakeLists.txt                                |  2 +-
+ containers/CMakeLists.txt                     |  2 +-
+ containers/test/CMakeLists.txt                | 24 +++++++++----------
+ helpers/dtoverlay/CMakeLists.txt              |  2 +-
+ .../linux/apps/dtmerge/CMakeLists.txt         |  2 +-
+ .../linux/apps/dtoverlay/CMakeLists.txt       |  6 ++---
+ .../linux/apps/gencmd/CMakeLists.txt          |  2 +-
+ .../apps/hello_pi/hello_audio/CMakeLists.txt  |  2 +-
+ .../hello_pi/hello_dispmanx/CMakeLists.txt    |  2 +-
+ .../apps/hello_pi/hello_encode/CMakeLists.txt |  2 +-
+ .../apps/hello_pi/hello_font/CMakeLists.txt   |  2 +-
+ .../apps/hello_pi/hello_jpeg/CMakeLists.txt   |  2 +-
+ .../apps/hello_pi/hello_teapot/CMakeLists.txt |  2 +-
+ .../apps/hello_pi/hello_tiger/CMakeLists.txt  |  2 +-
+ .../hello_pi/hello_triangle/CMakeLists.txt    |  2 +-
+ .../hello_pi/hello_triangle2/CMakeLists.txt   |  2 +-
+ .../apps/hello_pi/hello_video/CMakeLists.txt  |  2 +-
+ .../hello_pi/hello_videocube/CMakeLists.txt   |  2 +-
+ .../hello_pi/hello_wayland/CMakeLists.txt     |  2 +-
+ .../apps/hello_pi/hello_world/CMakeLists.txt  |  2 +-
+ .../linux/apps/raspicam/CMakeLists.txt        |  2 +-
+ .../linux/apps/smem/CMakeLists.txt            |  2 +-
+ .../linux/apps/tvservice/CMakeLists.txt       |  2 +-
+ .../linux/apps/vcmailbox/CMakeLists.txt       |  2 +-
+ .../linux/libs/bcm_host/CMakeLists.txt        |  2 +-
+ .../linux/libs/debug_sym/CMakeLists.txt       |  6 ++---
+ .../linux/libs/sm/CMakeLists.txt              |  4 ++--
+ interface/khronos/CMakeLists.txt              | 10 ++++----
+ interface/mmal/CMakeLists.txt                 |  4 ++--
+ interface/mmal/components/CMakeLists.txt      |  2 +-
+ interface/mmal/core/CMakeLists.txt            |  4 ++--
+ interface/mmal/util/CMakeLists.txt            |  4 ++--
+ interface/mmal/vc/CMakeLists.txt              |  6 ++---
+ interface/vchiq_arm/CMakeLists.txt            |  4 ++--
+ interface/vcos/CMakeLists.txt                 |  2 +-
+ interface/vcos/generic/CMakeLists.txt         |  2 +-
+ interface/vcos/pthreads/CMakeLists.txt        |  4 ++--
+ interface/vmcs_host/CMakeLists.txt            |  2 +-
+ makefiles/cmake/vmcs.cmake                    |  2 +-
+ middleware/openmaxil/CMakeLists.txt           |  2 +-
+ pkgconfig/bcm_host.pc.in                      |  2 +-
+ pkgconfig/brcmegl.pc.in                       |  2 +-
+ pkgconfig/brcmglesv2.pc.in                    |  2 +-
+ pkgconfig/brcmvg.pc.in                        |  2 +-
+ pkgconfig/mmal.pc.in                          |  2 +-
+ pkgconfig/vcsm.pc.in                          |  2 +-
+ 46 files changed, 73 insertions(+), 73 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3e3c90e..0bb54b7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -136,7 +136,7 @@ if(PKG_CONFIG_FOUND)
+ 	foreach(PCFILE bcm_host.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc openmaxil.pc)
+ 		configure_file("pkgconfig/${PCFILE}.in" "${PCFILE}" @ONLY)
+ 		install(FILES       "${CMAKE_CURRENT_BINARY_DIR}/${PCFILE}"
+-			DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
++			DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ 	endforeach()
+ endif()
+ # Remove cache entry, if one added by command line
+diff --git a/containers/CMakeLists.txt b/containers/CMakeLists.txt
+index 5570038..6c3d39c 100644
+--- a/containers/CMakeLists.txt
++++ b/containers/CMakeLists.txt
+@@ -66,7 +66,7 @@ set(packetizers_SRCS ${packetizers_SRCS} ${SOURCE_DIR}/h264/avc1_packetizer.c)
+ 
+ add_library(containers ${LIBRARY_TYPE} ${core_SRCS} ${io_SRCS} ${net_SRCS} ${packetizers_SRCS})
+ target_link_libraries(containers vcos)
+-install(TARGETS containers DESTINATION lib)
++install(TARGETS containers DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ set(container_readers)
+ set(container_writers)
+diff --git a/containers/test/CMakeLists.txt b/containers/test/CMakeLists.txt
+index 7d36352..832ad0f 100644
+--- a/containers/test/CMakeLists.txt
++++ b/containers/test/CMakeLists.txt
+@@ -1,17 +1,17 @@
+ # Generate test application
+ add_executable(containers_test test.c)
+ target_link_libraries(containers_test -Wl,--no-whole-archive containers)
+-install(TARGETS containers_test DESTINATION bin)
++install(TARGETS containers_test DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ # Generate test application
+ add_executable(containers_check_frame_int check_frame_int.c)
+ target_link_libraries(containers_check_frame_int -Wl,--no-whole-archive containers)
+-install(TARGETS containers_check_frame_int DESTINATION bin)
++install(TARGETS containers_check_frame_int DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ # Generate autotest application
+ #add_executable(containers_autotest autotest.cpp crc_32.c)
+ #target_link_libraries(containers_autotest -Wl,--no-whole-archive containers})
+-#install(TARGETS containers_autotest DESTINATION bin)
++#install(TARGETS containers_autotest DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ # Helper code to provide non-blocking console input
+ if (WIN32)
+@@ -28,39 +28,39 @@ add_dependencies(containers_test containers_test_extra)
+ # Generate net test applications
+ add_executable(containers_stream_client stream_client.c ${NB_IO_SOURCE})
+ target_link_libraries(containers_stream_client containers)
+-install(TARGETS containers_stream_client DESTINATION bin)
++install(TARGETS containers_stream_client DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ add_executable(containers_stream_server stream_server.c)
+ target_link_libraries(containers_stream_server containers)
+-install(TARGETS containers_stream_server DESTINATION bin)
++install(TARGETS containers_stream_server DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ add_executable(containers_datagram_sender datagram_sender.c)
+ target_link_libraries(containers_datagram_sender containers)
+-install(TARGETS containers_datagram_sender DESTINATION bin)
++install(TARGETS containers_datagram_sender DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ add_executable(containers_datagram_receiver datagram_receiver.c)
+ target_link_libraries(containers_datagram_receiver containers)
+-install(TARGETS containers_datagram_receiver DESTINATION bin)
++install(TARGETS containers_datagram_receiver DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ add_executable(containers_rtp_decoder rtp_decoder.c ${NB_IO_SOURCE})
+ target_link_libraries(containers_rtp_decoder containers)
+-install(TARGETS containers_rtp_decoder DESTINATION bin)
++install(TARGETS containers_rtp_decoder DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ # Generate URI test application
+ add_executable(containers_test_uri test_uri.c)
+ target_link_libraries(containers_test_uri containers)
+-install(TARGETS containers_test_uri DESTINATION bin)
++install(TARGETS containers_test_uri DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ # Generate URI pipe application
+ add_executable(containers_uri_pipe uri_pipe.c ${NB_IO_SOURCE})
+ target_link_libraries(containers_uri_pipe containers)
+-install(TARGETS containers_uri_pipe DESTINATION bin)
++install(TARGETS containers_uri_pipe DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ # Generate bit stream test application
+ add_executable(containers_test_bits test_bits.c)
+ target_link_libraries(containers_test_bits containers)
+-install(TARGETS containers_test_bits DESTINATION bin)
++install(TARGETS containers_test_bits DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ # Generate packet file dump application
+ add_executable(containers_dump_pktfile dump_pktfile.c)
+-install(TARGETS containers_dump_pktfile DESTINATION bin)
++install(TARGETS containers_dump_pktfile DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/helpers/dtoverlay/CMakeLists.txt b/helpers/dtoverlay/CMakeLists.txt
+index b3bd30f..7e83780 100644
+--- a/helpers/dtoverlay/CMakeLists.txt
++++ b/helpers/dtoverlay/CMakeLists.txt
+@@ -22,4 +22,4 @@ add_library (dtovl ${SHARED}
+ 
+ target_link_libraries(dtovl fdt)
+ 
+-install (TARGETS dtovl DESTINATION lib)
++install (TARGETS dtovl DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/host_applications/linux/apps/dtmerge/CMakeLists.txt b/host_applications/linux/apps/dtmerge/CMakeLists.txt
+index d3f7e36..daa91e5 100755
+--- a/host_applications/linux/apps/dtmerge/CMakeLists.txt
++++ b/host_applications/linux/apps/dtmerge/CMakeLists.txt
+@@ -17,5 +17,5 @@ include_directories (
+ add_executable(dtmerge dtmerge.c)
+ target_link_libraries(dtmerge dtovl)
+ 
+-install(TARGETS dtmerge RUNTIME DESTINATION bin)
++install(TARGETS dtmerge RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(FILES dtmerge.1 DESTINATION man/man1)
+diff --git a/host_applications/linux/apps/dtoverlay/CMakeLists.txt b/host_applications/linux/apps/dtoverlay/CMakeLists.txt
+index 97bcadc..238296d 100755
+--- a/host_applications/linux/apps/dtoverlay/CMakeLists.txt
++++ b/host_applications/linux/apps/dtoverlay/CMakeLists.txt
+@@ -16,12 +16,12 @@ include_directories (
+ 
+ add_executable(dtoverlay dtoverlay_main.c utils.c)
+ target_link_libraries(dtoverlay dtovl)
+-install(TARGETS dtoverlay RUNTIME DESTINATION bin)
++install(TARGETS dtoverlay RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(FILES dtoverlay.1 DESTINATION man/man1)
+ 
+ add_custom_command(TARGET dtoverlay POST_BUILD COMMAND ln;-sf;dtoverlay;dtparam)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION bin)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(FILES dtparam.1 DESTINATION man/man1)
+ 
+ set(DTOVERLAY_SCRIPTS dtoverlay-pre dtoverlay-post)
+-install(PROGRAMS ${DTOVERLAY_SCRIPTS} DESTINATION bin)
++install(PROGRAMS ${DTOVERLAY_SCRIPTS} DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/host_applications/linux/apps/gencmd/CMakeLists.txt b/host_applications/linux/apps/gencmd/CMakeLists.txt
+index 0c2c32a..fdd2f00 100644
+--- a/host_applications/linux/apps/gencmd/CMakeLists.txt
++++ b/host_applications/linux/apps/gencmd/CMakeLists.txt
+@@ -16,5 +16,5 @@ include_directories( ../../../..
+ 
+ add_executable(vcgencmd gencmd.c)
+ target_link_libraries(vcgencmd vcos vchiq_arm vchostif)
+-install(TARGETS vcgencmd RUNTIME DESTINATION bin)
++install(TARGETS vcgencmd RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(FILES vcgencmd.1 DESTINATION man/man1)
+diff --git a/host_applications/linux/apps/hello_pi/hello_audio/CMakeLists.txt b/host_applications/linux/apps/hello_pi/hello_audio/CMakeLists.txt
+index 03207c5..8f4d06c 100644
+--- a/host_applications/linux/apps/hello_pi/hello_audio/CMakeLists.txt
++++ b/host_applications/linux/apps/hello_pi/hello_audio/CMakeLists.txt
+@@ -5,4 +5,4 @@ add_executable(${EXEC} ${SRCS})
+ target_link_libraries(${EXEC} ${HELLO_PI_LIBS})
+ 
+ install(TARGETS ${EXEC}
+-        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/host_applications/linux/apps/hello_pi/hello_dispmanx/CMakeLists.txt b/host_applications/linux/apps/hello_pi/hello_dispmanx/CMakeLists.txt
+index 0471a1d..fd8b85e 100644
+--- a/host_applications/linux/apps/hello_pi/hello_dispmanx/CMakeLists.txt
++++ b/host_applications/linux/apps/hello_pi/hello_dispmanx/CMakeLists.txt
+@@ -5,4 +5,4 @@ add_executable(${EXEC} ${SRCS})
+ target_link_libraries(${EXEC} ${HELLO_PI_LIBS})
+ 
+ install(TARGETS ${EXEC}
+-        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/host_applications/linux/apps/hello_pi/hello_encode/CMakeLists.txt b/host_applications/linux/apps/hello_pi/hello_encode/CMakeLists.txt
+index 147623b..98a197a 100644
+--- a/host_applications/linux/apps/hello_pi/hello_encode/CMakeLists.txt
++++ b/host_applications/linux/apps/hello_pi/hello_encode/CMakeLists.txt
+@@ -5,4 +5,4 @@ add_executable(${EXEC} ${SRCS})
+ target_link_libraries(${EXEC} ${HELLO_PI_LIBS})
+ 
+ install(TARGETS ${EXEC}
+-        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/host_applications/linux/apps/hello_pi/hello_font/CMakeLists.txt b/host_applications/linux/apps/hello_pi/hello_font/CMakeLists.txt
+index 448d2cf..1d89f4c 100644
+--- a/host_applications/linux/apps/hello_pi/hello_font/CMakeLists.txt
++++ b/host_applications/linux/apps/hello_pi/hello_font/CMakeLists.txt
+@@ -6,4 +6,4 @@ target_link_libraries(${EXEC} ${HELLO_PI_LIBS})
+ target_link_libraries(${EXEC} vgfont freetype z)
+ 
+ install(TARGETS ${EXEC}
+-        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/host_applications/linux/apps/hello_pi/hello_jpeg/CMakeLists.txt b/host_applications/linux/apps/hello_pi/hello_jpeg/CMakeLists.txt
+index a56dda5..f611f8e 100644
+--- a/host_applications/linux/apps/hello_pi/hello_jpeg/CMakeLists.txt
++++ b/host_applications/linux/apps/hello_pi/hello_jpeg/CMakeLists.txt
+@@ -5,4 +5,4 @@ add_executable(${EXEC} ${SRCS})
+ target_link_libraries(${EXEC} ${HELLO_PI_LIBS})
+ 
+ install(TARGETS ${EXEC}
+-        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/host_applications/linux/apps/hello_pi/hello_teapot/CMakeLists.txt b/host_applications/linux/apps/hello_pi/hello_teapot/CMakeLists.txt
+index cdb8413..a60da3e 100644
+--- a/host_applications/linux/apps/hello_pi/hello_teapot/CMakeLists.txt
++++ b/host_applications/linux/apps/hello_pi/hello_teapot/CMakeLists.txt
+@@ -5,4 +5,4 @@ add_executable(${EXEC} ${SRCS})
+ target_link_libraries(${EXEC} ${HELLO_PI_LIBS})
+ 
+ install(TARGETS ${EXEC}
+-        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/host_applications/linux/apps/hello_pi/hello_tiger/CMakeLists.txt b/host_applications/linux/apps/hello_pi/hello_tiger/CMakeLists.txt
+index b253f3f..1104a8b 100644
+--- a/host_applications/linux/apps/hello_pi/hello_tiger/CMakeLists.txt
++++ b/host_applications/linux/apps/hello_pi/hello_tiger/CMakeLists.txt
+@@ -6,4 +6,4 @@ add_executable(${EXEC} ${SRCS})
+ target_link_libraries(${EXEC} ${HELLO_PI_LIBS})
+ 
+ install(TARGETS ${EXEC}
+-        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/host_applications/linux/apps/hello_pi/hello_triangle/CMakeLists.txt b/host_applications/linux/apps/hello_pi/hello_triangle/CMakeLists.txt
+index 4e8128e..4b738bb 100644
+--- a/host_applications/linux/apps/hello_pi/hello_triangle/CMakeLists.txt
++++ b/host_applications/linux/apps/hello_pi/hello_triangle/CMakeLists.txt
+@@ -5,4 +5,4 @@ add_executable(${EXEC} ${SRCS})
+ target_link_libraries(${EXEC} ${HELLO_PI_LIBS})
+ 
+ install(TARGETS ${EXEC}
+-        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/host_applications/linux/apps/hello_pi/hello_triangle2/CMakeLists.txt b/host_applications/linux/apps/hello_pi/hello_triangle2/CMakeLists.txt
+index 390980a..c8c534f 100644
+--- a/host_applications/linux/apps/hello_pi/hello_triangle2/CMakeLists.txt
++++ b/host_applications/linux/apps/hello_pi/hello_triangle2/CMakeLists.txt
+@@ -5,4 +5,4 @@ add_executable(${EXEC} ${SRCS})
+ target_link_libraries(${EXEC} ${HELLO_PI_LIBS})
+ 
+ install(TARGETS ${EXEC}
+-        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/host_applications/linux/apps/hello_pi/hello_video/CMakeLists.txt b/host_applications/linux/apps/hello_pi/hello_video/CMakeLists.txt
+index 42187af..6b15ca2 100644
+--- a/host_applications/linux/apps/hello_pi/hello_video/CMakeLists.txt
++++ b/host_applications/linux/apps/hello_pi/hello_video/CMakeLists.txt
+@@ -5,4 +5,4 @@ add_executable(${EXEC} ${SRCS})
+ target_link_libraries(${EXEC} ${HELLO_PI_LIBS})
+ 
+ install(TARGETS ${EXEC}
+-        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/host_applications/linux/apps/hello_pi/hello_videocube/CMakeLists.txt b/host_applications/linux/apps/hello_pi/hello_videocube/CMakeLists.txt
+index d7fb059..9612ffe 100644
+--- a/host_applications/linux/apps/hello_pi/hello_videocube/CMakeLists.txt
++++ b/host_applications/linux/apps/hello_pi/hello_videocube/CMakeLists.txt
+@@ -5,4 +5,4 @@ add_executable(${EXEC} ${SRCS})
+ target_link_libraries(${EXEC} ${HELLO_PI_LIBS})
+ 
+ install(TARGETS ${EXEC}
+-        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/host_applications/linux/apps/hello_pi/hello_wayland/CMakeLists.txt b/host_applications/linux/apps/hello_pi/hello_wayland/CMakeLists.txt
+index 9a2f75c..9a468a6 100644
+--- a/host_applications/linux/apps/hello_pi/hello_wayland/CMakeLists.txt
++++ b/host_applications/linux/apps/hello_pi/hello_wayland/CMakeLists.txt
+@@ -5,4 +5,4 @@ add_executable(${EXEC} ${SRCS})
+ target_link_libraries(${EXEC} ${HELLO_PI_LIBS} -lwayland-client -lwayland-egl)
+ 
+ install(TARGETS ${EXEC}
+-        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/host_applications/linux/apps/hello_pi/hello_world/CMakeLists.txt b/host_applications/linux/apps/hello_pi/hello_world/CMakeLists.txt
+index b0120fe..97d90f6 100644
+--- a/host_applications/linux/apps/hello_pi/hello_world/CMakeLists.txt
++++ b/host_applications/linux/apps/hello_pi/hello_world/CMakeLists.txt
+@@ -5,4 +5,4 @@ add_executable(${EXEC} ${SRCS})
+ target_link_libraries(${EXEC} ${HELLO_PI_LIBS})
+ 
+ install(TARGETS ${EXEC}
+-        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt
+index f73a4d0..4a9cd88 100644
+--- a/host_applications/linux/apps/raspicam/CMakeLists.txt
++++ b/host_applications/linux/apps/raspicam/CMakeLists.txt
+@@ -66,6 +66,6 @@ target_link_libraries(raspiyuv   ${MMAL_LIBS} vcos bcm_host m)
+ target_link_libraries(raspivid   ${MMAL_LIBS} vcos bcm_host m)
+ target_link_libraries(raspividyuv   ${MMAL_LIBS} vcos bcm_host m)
+ 
+-install(TARGETS raspistill raspiyuv raspivid raspividyuv RUNTIME DESTINATION bin)
++install(TARGETS raspistill raspiyuv raspivid raspividyuv RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(FILES raspistill.1 raspiyuv.1 raspivid.1 raspividyuv.1 DESTINATION man/man1)
+ install(FILES raspicam.7 DESTINATION man/man7)
+diff --git a/host_applications/linux/apps/smem/CMakeLists.txt b/host_applications/linux/apps/smem/CMakeLists.txt
+index 0fa8328..60c9c61 100644
+--- a/host_applications/linux/apps/smem/CMakeLists.txt
++++ b/host_applications/linux/apps/smem/CMakeLists.txt
+@@ -16,5 +16,5 @@ include_directories (
+ add_executable(vcsmem smem.c)
+ target_link_libraries(vcsmem vcos vcsm vchostif)
+ 
+-install(TARGETS vcsmem RUNTIME DESTINATION bin)
++install(TARGETS vcsmem RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+diff --git a/host_applications/linux/apps/tvservice/CMakeLists.txt b/host_applications/linux/apps/tvservice/CMakeLists.txt
+index 0190774..fad5a6b 100644
+--- a/host_applications/linux/apps/tvservice/CMakeLists.txt
++++ b/host_applications/linux/apps/tvservice/CMakeLists.txt
+@@ -3,5 +3,5 @@ add_executable(tvservice tvservice.c)
+ target_link_libraries(tvservice vchostif bcm_host)
+ 
+ install(TARGETS tvservice
+-        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(FILES tvservice.1 DESTINATION man/man1)
+diff --git a/host_applications/linux/apps/vcmailbox/CMakeLists.txt b/host_applications/linux/apps/vcmailbox/CMakeLists.txt
+index d153363..2731724 100644
+--- a/host_applications/linux/apps/vcmailbox/CMakeLists.txt
++++ b/host_applications/linux/apps/vcmailbox/CMakeLists.txt
+@@ -2,6 +2,6 @@ add_executable(vcmailbox vcmailbox.c)
+ target_link_libraries(vcmailbox vchostif)
+ 
+ install(TARGETS vcmailbox
+-        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(FILES vcmailbox.1 DESTINATION man/man1)
+ install(FILES vcmailbox.7 raspiotp.7 raspirev.7 DESTINATION man/man7)
+diff --git a/host_applications/linux/libs/bcm_host/CMakeLists.txt b/host_applications/linux/libs/bcm_host/CMakeLists.txt
+index 7a4ab06..3614943 100644
+--- a/host_applications/linux/libs/bcm_host/CMakeLists.txt
++++ b/host_applications/linux/libs/bcm_host/CMakeLists.txt
+@@ -19,5 +19,5 @@ add_library(bcm_host ${SHARED} bcm_host.c)
+ 
+ target_link_libraries(bcm_host vcos vchostif)
+ 
+-install(TARGETS bcm_host DESTINATION lib)
++install(TARGETS bcm_host DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+diff --git a/host_applications/linux/libs/debug_sym/CMakeLists.txt b/host_applications/linux/libs/debug_sym/CMakeLists.txt
+index d437b99..37eb759 100644
+--- a/host_applications/linux/libs/debug_sym/CMakeLists.txt
++++ b/host_applications/linux/libs/debug_sym/CMakeLists.txt
+@@ -11,6 +11,6 @@ include_directories (
+ add_library(debug_sym ${SHARED} debug_sym.c)
+ add_library(debug_sym_static STATIC debug_sym.c)
+ 
+-install(TARGETS debug_sym DESTINATION lib)
+-install(TARGETS debug_sym_static DESTINATION lib)
+-install(FILES debug_sym.h DESTINATION include/interface/debug_sym)
++install(TARGETS debug_sym DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS debug_sym_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(FILES debug_sym.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interface/debug_sym)
+diff --git a/host_applications/linux/libs/sm/CMakeLists.txt b/host_applications/linux/libs/sm/CMakeLists.txt
+index 5ce5aca..84d8123 100644
+--- a/host_applications/linux/libs/sm/CMakeLists.txt
++++ b/host_applications/linux/libs/sm/CMakeLists.txt
+@@ -14,5 +14,5 @@ add_library(vcsm ${SHARED} user-vcsm.c)
+ 
+ target_link_libraries(vcsm vcos)
+ 
+-install(TARGETS vcsm DESTINATION lib)
+-install(FILES user-vcsm.h DESTINATION include/interface/vcsm)
++install(TARGETS vcsm DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(FILES user-vcsm.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interface/vcsm)
+diff --git a/interface/khronos/CMakeLists.txt b/interface/khronos/CMakeLists.txt
+index 95c0e11..00316a5 100644
+--- a/interface/khronos/CMakeLists.txt
++++ b/interface/khronos/CMakeLists.txt
+@@ -94,11 +94,11 @@ if (BUILD_WAYLAND)
+    )
+ 
+    add_library(wayland-egl ${SHARED} ${WAYLAND_EGL_SOURCE})
+-   install(TARGETS wayland-egl DESTINATION lib)
++   install(TARGETS wayland-egl DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+    configure_file ("wayland-egl/wayland-egl.pc.in" "wayland-egl/wayland-egl.pc" @ONLY)
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/wayland-egl/wayland-egl.pc"
+-            DESTINATION lib/pkgconfig)
++            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ endif ()
+ 
+ add_library(EGL ${SHARED} ${EGL_SOURCE})
+@@ -126,8 +126,8 @@ target_link_libraries(GLESv2 EGL khrn_client vcos)
+ target_link_libraries(WFC EGL)
+ target_link_libraries(OpenVG EGL)
+ 
+-install(TARGETS EGL GLESv2 OpenVG WFC khrn_client DESTINATION lib)
+-install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION lib)
++install(TARGETS EGL GLESv2 OpenVG WFC khrn_client DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ # recommended names to use to avoid conflicts with mesa libs
+ add_library(brcmEGL ${SHARED} ${EGL_SOURCE})
+@@ -140,4 +140,4 @@ target_link_libraries(brcmGLESv2 brcmEGL khrn_client vcos)
+ target_link_libraries(brcmWFC brcmEGL)
+ target_link_libraries(brcmOpenVG brcmEGL)
+ 
+-install(TARGETS brcmEGL brcmGLESv2 brcmOpenVG brcmWFC DESTINATION lib)
++install(TARGETS brcmEGL brcmGLESv2 brcmOpenVG brcmWFC DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/interface/mmal/CMakeLists.txt b/interface/mmal/CMakeLists.txt
+index c5c1642..fe784e8 100644
+--- a/interface/mmal/CMakeLists.txt
++++ b/interface/mmal/CMakeLists.txt
+@@ -16,7 +16,7 @@ add_subdirectory(client)
+ 
+ target_link_libraries(mmal mmal_core mmal_util mmal_vc_client vcos mmal_components)
+ 
+-install(TARGETS mmal DESTINATION lib)
++install(TARGETS mmal DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(FILES
+    mmal.h
+    mmal_buffer.h
+@@ -36,7 +36,7 @@ install(FILES
+    mmal_pool.h mmal_port.h
+    mmal_queue.h
+    mmal_types.h
+-   DESTINATION include/interface/mmal
++   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interface/mmal
+ )
+ 
+ # Test apps
+diff --git a/interface/mmal/components/CMakeLists.txt b/interface/mmal/components/CMakeLists.txt
+index d65fa37..4c85de0 100644
+--- a/interface/mmal/components/CMakeLists.txt
++++ b/interface/mmal/components/CMakeLists.txt
+@@ -30,5 +30,5 @@ set(container_libs ${container_libs} containers)
+ target_link_libraries(mmal_components ${container_libs} mmal_util)
+ target_link_libraries(mmal_components mmal_core)
+ 
+-install(TARGETS mmal_components DESTINATION lib)
++install(TARGETS mmal_components DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+diff --git a/interface/mmal/core/CMakeLists.txt b/interface/mmal/core/CMakeLists.txt
+index efa14d9..4fe0779 100644
+--- a/interface/mmal/core/CMakeLists.txt
++++ b/interface/mmal/core/CMakeLists.txt
+@@ -13,7 +13,7 @@ add_library (mmal_core ${LIBRARY_TYPE}
+ 
+ target_link_libraries (mmal_core vcos mmal_vc_client)
+ 
+-install(TARGETS mmal_core DESTINATION lib)
++install(TARGETS mmal_core DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(FILES
+    mmal_buffer_private.h
+    mmal_clock_private.h
+@@ -21,5 +21,5 @@ install(FILES
+    mmal_core_private.h
+    mmal_port_private.h
+    mmal_events_private.h
+-   DESTINATION include/interface/mmal/core
++   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interface/mmal/core
+ )
+diff --git a/interface/mmal/util/CMakeLists.txt b/interface/mmal/util/CMakeLists.txt
+index b2a6858..e51afd0 100644
+--- a/interface/mmal/util/CMakeLists.txt
++++ b/interface/mmal/util/CMakeLists.txt
+@@ -12,7 +12,7 @@ add_library (mmal_util ${LIBRARY_TYPE}
+ 
+ target_link_libraries (mmal_util vcos)
+ 
+-install(TARGETS mmal_util DESTINATION lib)
++install(TARGETS mmal_util DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(FILES
+    mmal_component_wrapper.h
+    mmal_connection.h
+@@ -24,5 +24,5 @@ install(FILES
+    mmal_util.h
+    mmal_util_params.h
+    mmal_util_rational.h
+-   DESTINATION include/interface/mmal/util
++   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interface/mmal/util
+ )
+diff --git a/interface/mmal/vc/CMakeLists.txt b/interface/mmal/vc/CMakeLists.txt
+index d6e80db..3b9ec64 100644
+--- a/interface/mmal/vc/CMakeLists.txt
++++ b/interface/mmal/vc/CMakeLists.txt
+@@ -8,12 +8,12 @@ target_link_libraries(mmal_vc_client vchiq_arm vcos vcsm)
+ if(BUILD_MMAL_APPS)
+ add_executable(mmal_vc_diag mmal_vc_diag.c)
+ target_link_libraries(mmal_vc_diag mmal mmal_vc_client debug_sym vcos)
+-install(TARGETS mmal_vc_diag RUNTIME DESTINATION bin)
++install(TARGETS mmal_vc_diag RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif(BUILD_MMAL_APPS)
+ 
+ include_directories ( ../../../host_applications/linux/libs/sm )
+ 
+-install(TARGETS mmal_vc_client DESTINATION lib)
++install(TARGETS mmal_vc_client DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(FILES
+    mmal_vc_api.h
+    mmal_vc_api_drm.h
+@@ -22,5 +22,5 @@ install(FILES
+    mmal_vc_msgs.h
+    mmal_vc_opaque_alloc.h
+    mmal_vc_shm.h
+-   DESTINATION include/interface/mmal/vc
++   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interface/mmal/vc
+ )
+diff --git a/interface/vchiq_arm/CMakeLists.txt b/interface/vchiq_arm/CMakeLists.txt
+index 7af383d..e5a3224 100644
+--- a/interface/vchiq_arm/CMakeLists.txt
++++ b/interface/vchiq_arm/CMakeLists.txt
+@@ -5,7 +5,7 @@ add_library(vchiq_arm SHARED
+ # pull in VCHI cond variable emulation
+ target_link_libraries(vchiq_arm vcos)
+ 
+-install(TARGETS vchiq_arm DESTINATION lib)
++install(TARGETS vchiq_arm DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ #install(FILES etc/10-vchiq.rules DESTINATION /etc/udev/rules.d)
+ 
+ include_directories(../..)
+@@ -17,4 +17,4 @@ target_link_libraries(vchiq_test
+                       vchiq_arm
+                       vcos)
+ 
+-install(TARGETS vchiq_test RUNTIME DESTINATION bin)
++install(TARGETS vchiq_test RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/interface/vcos/CMakeLists.txt b/interface/vcos/CMakeLists.txt
+index 23a8d72..b0924a4 100644
+--- a/interface/vcos/CMakeLists.txt
++++ b/interface/vcos/CMakeLists.txt
+@@ -65,4 +65,4 @@ if (WIN32)
+    configure_file (build_all.bat.in build_all.bat @ONLY)
+ endif ()
+ 
+-#install (FILES ${HEADERS} DESTINATION include/interface/vcos)
++#install (FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interface/vcos)
+diff --git a/interface/vcos/generic/CMakeLists.txt b/interface/vcos/generic/CMakeLists.txt
+index c09f376..8af98fd 100644
+--- a/interface/vcos/generic/CMakeLists.txt
++++ b/interface/vcos/generic/CMakeLists.txt
+@@ -18,4 +18,4 @@ foreach (header ${HEADERS})
+    configure_file ("${header}" "${VCOS_HEADERS_BUILD_DIR}/generic/${header}" COPYONLY)
+ endforeach ()
+ 
+-install (FILES ${HEADERS} DESTINATION include/interface/vcos/generic)
++install (FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interface/vcos/generic)
+diff --git a/interface/vcos/pthreads/CMakeLists.txt b/interface/vcos/pthreads/CMakeLists.txt
+index d6cd415..821b3f3 100644
+--- a/interface/vcos/pthreads/CMakeLists.txt
++++ b/interface/vcos/pthreads/CMakeLists.txt
+@@ -50,5 +50,5 @@ else ()
+ endif ()
+ 
+ 
+-#install(FILES ${HEADERS} DESTINATION include)
+-install(TARGETS vcos DESTINATION lib)
++#install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS vcos DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt
+index 76813c9..0984d8a 100755
+--- a/interface/vmcs_host/CMakeLists.txt
++++ b/interface/vmcs_host/CMakeLists.txt
+@@ -35,5 +35,5 @@ target_link_libraries(vchostif vchiq_arm vcos)
+ 
+ #target_link_libraries(bufman WFC)
+ 
+-install(TARGETS ${INSTALL_TARGETS} DESTINATION lib)
++install(TARGETS ${INSTALL_TARGETS} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+diff --git a/makefiles/cmake/vmcs.cmake b/makefiles/cmake/vmcs.cmake
+index 7c97463..a1eb911 100644
+--- a/makefiles/cmake/vmcs.cmake
++++ b/makefiles/cmake/vmcs.cmake
+@@ -16,7 +16,7 @@ endif()
+ SET(CMAKE_INSTALL_PREFIX "${VMCS_INSTALL_PREFIX}" CACHE INTERNAL "Prefix
+     prepended to install directories" FORCE)
+ if(NOT DEFINED VMCS_PLUGIN_DIR)
+-  SET(VMCS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_SHARED_LIBRARY_PREFIX}/plugins)
++  SET(VMCS_PLUGIN_DIR ${CMAKE_INSTALL_LIBDIR}/plugins)
+ endif()
+ 
+ # What kind of system are we?
+diff --git a/middleware/openmaxil/CMakeLists.txt b/middleware/openmaxil/CMakeLists.txt
+index 3e9c5f9..c063740 100644
+--- a/middleware/openmaxil/CMakeLists.txt
++++ b/middleware/openmaxil/CMakeLists.txt
+@@ -49,4 +49,4 @@ else ()
+ 
+ endif ()
+ 
+-install (TARGETS openmaxil DESTINATION lib)
++install (TARGETS openmaxil DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/pkgconfig/bcm_host.pc.in b/pkgconfig/bcm_host.pc.in
+index c7237c5..2988b42 100644
+--- a/pkgconfig/bcm_host.pc.in
++++ b/pkgconfig/bcm_host.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+ 
+ Name: bcm_host
+diff --git a/pkgconfig/brcmegl.pc.in b/pkgconfig/brcmegl.pc.in
+index 5dd3d5b..a45bf22 100644
+--- a/pkgconfig/brcmegl.pc.in
++++ b/pkgconfig/brcmegl.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+ 
+ Name: brcmEGL
+diff --git a/pkgconfig/brcmglesv2.pc.in b/pkgconfig/brcmglesv2.pc.in
+index e0e36f5..902fbf3 100644
+--- a/pkgconfig/brcmglesv2.pc.in
++++ b/pkgconfig/brcmglesv2.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+ 
+ Name: brcmGLESv2
+diff --git a/pkgconfig/brcmvg.pc.in b/pkgconfig/brcmvg.pc.in
+index 763a44b..98489ee 100644
+--- a/pkgconfig/brcmvg.pc.in
++++ b/pkgconfig/brcmvg.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+ 
+ Name: brcmOpenVG
+diff --git a/pkgconfig/mmal.pc.in b/pkgconfig/mmal.pc.in
+index 37d344c..1ffa4f5 100644
+--- a/pkgconfig/mmal.pc.in
++++ b/pkgconfig/mmal.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+ 
+ Name: MMAL
+diff --git a/pkgconfig/vcsm.pc.in b/pkgconfig/vcsm.pc.in
+index b12c56f..6f762cb 100644
+--- a/pkgconfig/vcsm.pc.in
++++ b/pkgconfig/vcsm.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+ 
+ Name: VCSM

recipes-graphics/userland/userland_git.bb

@@ -46,12 +46,11 @@ SRC_URI = "\
     file://0022-all-host_applications-remove-non-existent-projects.patch \
     file://0023-hello_pi-optionally-build-wayland-specific-app.patch \
     file://0024-userland-Sync-needed-defines-for-weston-build.patch \
+    file://0025-CMakeLists.txt-.pc-respect-CMAKE_INSTALL_LIBDIR.patch \
 "
 
 SRC_URI:remove:toolchain-clang = "file://0021-cmake-Disable-format-overflow-warning-as-error.patch"
 
-S = "${WORKDIR}/git"
-
 inherit cmake pkgconfig
 
 ASNEEDED = ""
@@ -62,7 +61,6 @@ EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS='-Wl,--no-a
 
 EXTRA_OECMAKE:append:aarch64 = " -DARM64=ON "
 
-
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
 
 PACKAGECONFIG[wayland] = "-DBUILD_WAYLAND=TRUE -DWAYLAND_SCANNER_EXECUTABLE:FILEPATH=${STAGING_BINDIR_NATIVE}/wayland-scanner,,wayland-native wayland"

recipes-graphics/vc-graphics/vc-graphics.inc

@@ -33,10 +33,10 @@ do_install () {
   cp -R include/* ${D}${includedir}
 
   install -d ${D}${libdir}/pkgconfig
-  install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/
+  install -m 0644 ${UNPACKDIR}/egl.pc ${D}${libdir}/pkgconfig/
 
   install -d ${D}/${sysconfdir}/init.d
-  install -m 0755 ${WORKDIR}/vchiq.sh ${D}${sysconfdir}/init.d/
+  install -m 0755 ${UNPACKDIR}/vchiq.sh ${D}${sysconfdir}/init.d/
 }
 
 # These are proprietary binaries generated elsewhere so don't check ldflags

recipes-graphics/wayland/weston-init.bbappend

@@ -1,10 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-do_install:append:rpi() {
-    if [ -e ${D}/${sysconfdir}/init.d/weston ]; then
-        sed -i 's#weston-start --#weston-start -- --continue-without-input#' ${D}/${sysconfdir}/init.d/weston
-    fi
-    if [ -e ${D}${systemd_system_unitdir}/weston.service ]; then
-        sed -i 's#ExecStart=/usr/bin/weston#ExecStart=/usr/bin/weston --continue-without-input#' ${D}${systemd_system_unitdir}/weston.service
-    fi
-}

recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend

@@ -8,8 +8,8 @@ do_install:append:rpi () {
     PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
     if [ "${PITFT}" = "1" ]; then
         install -d ${D}/${sysconfdir}/X11/xorg.conf.d/
-        install -m 0644 ${WORKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
-        install -m 0644 ${WORKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
+        install -m 0644 ${UNPACKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
+        install -m 0644 ${UNPACKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
     fi
 }
 

recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb

@@ -16,7 +16,7 @@ SECTION = "kernel"
 # [^1]: https://github.com/RPi-Distro/bluez-firmware/issues/1
 LICENSE = "Firmware-cypress-rpidistro"
 LIC_FILES_CHKSUM = "\
-    file://LICENCE.cypress-rpidistro;md5=c5d12ae0b24ef7177902a8e288751a4e \
+    file://LICENCE.cypress-rpidistro;md5=be80828daf682762f392131141288a74 \
 "
 
 # These are not common licenses, set NO_GENERIC_LICENSE for them
@@ -24,12 +24,10 @@ LIC_FILES_CHKSUM = "\
 NO_GENERIC_LICENSE[Firmware-cypress-rpidistro] = "LICENCE.cypress-rpidistro"
 
 SRC_URI = " \
-    git://github.com/RPi-Distro/bluez-firmware;branch=master;protocol=https \
+    git://github.com/RPi-Distro/bluez-firmware;branch=bookworm;protocol=https \
 "
-SRCREV = "9556b08ace2a1735127894642cc8ea6529c04c90"
-PV = "1.2-4+rpt10"
-
-S = "${WORKDIR}/git"
+SRCREV = "78d6a07730e2d20c035899521ab67726dc028e1c"
+PV = "1.2-9+rpt3"
 
 inherit allarch
 
@@ -51,19 +49,21 @@ do_install() {
     install -d ${D}${nonarch_base_libdir}/firmware/brcm
 
     cp LICENCE.cypress-rpidistro ${D}${nonarch_base_libdir}/firmware
-    install -m 0644 broadcom/BCM434*.hcd ${D}${nonarch_base_libdir}/firmware/brcm/
+    install -m 0644 debian/firmware/broadcom/BCM434*.hcd ${D}${nonarch_base_libdir}/firmware/brcm/
 }
 
 PACKAGES = "\
     ${PN}-cypress-license \
     ${PN}-bcm43430a1-hcd \
     ${PN}-bcm43430b0-hcd \
+    ${PN}-bcm4343a2-hcd \
     ${PN}-bcm4345c0-hcd \
     ${PN}-bcm4345c5-hcd \
 "
 
 LICENSE:${PN}-bcm43430a1-hcd = "Firmware-cypress-rpidistro"
 LICENSE:${PN}-bcm43430b0-hcd = "Firmware-cypress-rpidistro"
+LICENSE:${PN}-bcm4343a2-hcd = "Firmware-cypress-rpidistro"
 LICENSE:${PN}-bcm4345c0-hcd = "Firmware-cypress-rpidistro"
 LICENSE:${PN}-bcm4345c5-hcd = "Firmware-cypress-rpidistro"
 LICENSE:${PN}-cypress-license = "Firmware-cypress-rpidistro"
@@ -77,6 +77,9 @@ FILES:${PN}-bcm43430a1-hcd = "\
 FILES:${PN}-bcm43430b0-hcd = "\
     ${nonarch_base_libdir}/firmware/brcm/BCM43430B0.hcd \
 "
+FILES:${PN}-bcm4343a2-hcd = "\
+    ${nonarch_base_libdir}/firmware/brcm/BCM4343A2.hcd \
+"
 FILES:${PN}-bcm4345c0-hcd = "\
     ${nonarch_base_libdir}/firmware/brcm/BCM4345C0.hcd \
 "
@@ -86,12 +89,15 @@ FILES:${PN}-bcm4345c5-hcd = "\
 
 RDEPENDS:${PN}-bcm43430a1-hcd += "${PN}-cypress-license"
 RDEPENDS:${PN}-bcm43430b0-hcd += "${PN}-cypress-license"
+RDEPENDS:${PN}-bcm4343a2-hcd += "${PN}-cypress-license"
 RDEPENDS:${PN}-bcm4345c0-hcd += "${PN}-cypress-license"
 RDEPENDS:${PN}-bcm4345c5-hcd += "${PN}-cypress-license"
 RCONFLICTS:${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd"
 RREPLACES:${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd"
 RCONFLICTS:${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd"
 RREPLACES:${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd"
+RCONFLICTS:${PN}-bcm4343a2-hcd = "linux-firmware-bcm4343a2-hcd"
+RREPLACES:${PN}-bcm4343a2-hcd = "linux-firmware-bcm4343a2-hcd"
 RCONFLICTS:${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd"
 RREPLACES:${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd"
 RCONFLICTS:${PN}-bcm43435c5-hcd = "linux-firmware-bcm4345c5-hcd"

recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro/0001-Default-43455-firmware-to-standard-variant.patch

@@ -1,28 +0,0 @@
-From b9db43e36ad0942d33cb4db5b394abd722862568 Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <andrei.gherzan@huawei.com>
-Date: Fri, 9 Sep 2022 20:28:06 +0200
-Subject: [PATCH] Default 43455 firmware to standard variant
-
-The firmware for 43455 is loaded as a symlink: brcmfmac43455-sdio.bin.
-This symlink is now broken as the debian package handles the right
-target of this symlink through a postinstall. We don't have that logic
-here so we default to the standard variant.
-
-Upstream-Status: Inappropriate [issue reported at https://github.com/RPi-Distro/firmware-nonfree/issues/26]
-Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
----
- debian/config/brcm80211/brcm/brcmfmac43455-sdio.bin | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/debian/config/brcm80211/brcm/brcmfmac43455-sdio.bin b/debian/config/brcm80211/brcm/brcmfmac43455-sdio.bin
-index 9c39208..b914838 120000
---- a/debian/config/brcm80211/brcm/brcmfmac43455-sdio.bin
-+++ b/debian/config/brcm80211/brcm/brcmfmac43455-sdio.bin
-@@ -1 +1 @@
--../cypress/cyfmac43455-sdio.bin
-\ No newline at end of file
-+../cypress/cyfmac43455-sdio-standard.bin
-\ No newline at end of file
--- 
-2.25.1
-

recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro/0002-Default-all-RPi-43455-boards-to-standard-variant.patch

@@ -0,0 +1,79 @@
+From 20741d848c32e0fb2e4841cf8bbc9ec3d198bb6b Mon Sep 17 00:00:00 2001
+From: Omri Sarig <omri.sarig@prevas.dk>
+Date: Thu, 9 Jan 2025 19:00:10 +0100
+Subject: [PATCH 2/2] Default all RPi 43455 boards to standard variant
+
+As the patch above explains, the symlink that is being used by the
+brcmfmac43455-sdio.* files is one that is created by the Debian system,
+which we do not have in our implementation. Therefore, when the system
+tries to load these files, an error message is generated.
+
+By changing the symlinks to be to the standard variant, the problem is
+solved for the build.
+
+The code is also working without this patch - when the driver is unable
+to load the board-specific file (such as
+brcmfmac43455-sdio.raspberrypi,3-model-a-plus.bin), it reverts to using
+the base file (brcmfmac43455-sdio.bin), which is a correct link (as it
+is fixed in the patch above). However, the driver is still generating an
+error message in this case, which is being solved by linking the
+board-specific files to the standard variant as well.
+
+Upstream-Status: Inappropriate [issue reported at https://github.com/RPi-Distro/firmware-nonfree/issues/26]
+Signed-off-by: Omri Sarig <omri.sarig@prevas.dk>
+---
+ .../brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.bin      | 2 +-
+ .../brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.bin      | 2 +-
+ .../brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.bin    | 2 +-
+ .../brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.bin | 2 +-
+ .../brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.bin | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.bin b/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.bin
+index 9c39208..b914838 120000
+--- a/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.bin
++++ b/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.bin
+@@ -1 +1 @@
+-../cypress/cyfmac43455-sdio.bin
+\ No newline at end of file
++../cypress/cyfmac43455-sdio-standard.bin
+\ No newline at end of file
+diff --git a/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.bin b/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.bin
+index 9c39208..b914838 120000
+--- a/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.bin
++++ b/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.bin
+@@ -1 +1 @@
+-../cypress/cyfmac43455-sdio.bin
+\ No newline at end of file
++../cypress/cyfmac43455-sdio-standard.bin
+\ No newline at end of file
+diff --git a/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.bin b/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.bin
+index 9c39208..b914838 120000
+--- a/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.bin
++++ b/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.bin
+@@ -1 +1 @@
+-../cypress/cyfmac43455-sdio.bin
+\ No newline at end of file
++../cypress/cyfmac43455-sdio-standard.bin
+\ No newline at end of file
+diff --git a/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.bin b/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.bin
+index 9c39208..b914838 120000
+--- a/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.bin
++++ b/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.bin
+@@ -1 +1 @@
+-../cypress/cyfmac43455-sdio.bin
+\ No newline at end of file
++../cypress/cyfmac43455-sdio-standard.bin
+\ No newline at end of file
+diff --git a/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.bin b/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.bin
+index 9c39208..b914838 120000
+--- a/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.bin
++++ b/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.bin
+@@ -1 +1 @@
+-../cypress/cyfmac43455-sdio.bin
+\ No newline at end of file
++../cypress/cyfmac43455-sdio-standard.bin
+\ No newline at end of file
+-- 
+2.34.1
+

recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb

@@ -7,7 +7,7 @@ SECTION = "kernel"
 
 LICENSE = "GPL-2.0-only & binary-redist-Cypress-rpidistro & Synaptics-rpidistro"
 LIC_FILES_CHKSUM = "\
-    file://debian/copyright;md5=03475efdcf4c53c8f2d8fb4bc1fc6965 \
+    file://debian/copyright;md5=454e44c688dc909e16223e4aee63568c \
 "
 # Where these are no common licenses, set NO_GENERIC_LICENSE so that the
 # license files will be copied from the fetched source.
@@ -15,18 +15,22 @@ NO_GENERIC_LICENSE[binary-redist-Cypress-rpidistro] = "debian/copyright"
 NO_GENERIC_LICENSE[Synaptics-rpidistro] = "debian/copyright"
 LICENSE_FLAGS = "synaptics-killswitch"
 
-SRC_URI = "git://github.com/RPi-Distro/firmware-nonfree;branch=bullseye;protocol=https \
-    file://0001-Default-43455-firmware-to-standard-variant.patch \
+SRC_URI = "git://github.com/RPi-Distro/firmware-nonfree;branch=bookworm;protocol=https \
+    file://0002-Default-all-RPi-43455-boards-to-standard-variant.patch \
 "
-SRCREV = "2c3a8701193ba23d0ef85cdf0d0c9e47baf03dfc"
-PV = "20230210-5_bpo11+1"
-S = "${WORKDIR}/git"
+SRCREV = "c9d3ae6584ab79d19a4f94ccf701e888f9f87a53"
+PV = "20240709-2~bpo12+1+rpt3"
 
 inherit allarch
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
 
+# The minimal firmware doesn't work with Raspberry Pi 5, so default to the
+# standard firmware
+CYFMAC43455_SDIO_FIRMWARE ??= "minimal"
+CYFMAC43455_SDIO_FIRMWARE:raspberrypi5 ??= "standard"
+
 do_install() {
     install -d ${D}${nonarch_base_libdir}/firmware/brcm ${D}${nonarch_base_libdir}/firmware/cypress
 
@@ -34,6 +38,7 @@ do_install() {
 
     for fw in \
             brcmfmac43430-sdio \
+            brcmfmac43430b0-sdio \
             brcmfmac43436-sdio \
             brcmfmac43436s-sdio \
             brcmfmac43455-sdio \
@@ -42,8 +47,12 @@ do_install() {
     done
 
     cp -R --no-dereference --preserve=mode,links -v debian/config/brcm80211/cypress/* ${D}${nonarch_base_libdir}/firmware/cypress/
+    ln -s cyfmac43455-sdio-${CYFMAC43455_SDIO_FIRMWARE}.bin ${D}${nonarch_base_libdir}/firmware/cypress/cyfmac43455-sdio.bin
 
     rm ${D}${nonarch_base_libdir}/firmware/cypress/README.txt
+
+    install -d ${D}${sysconfdir}/modprobe.d
+    install -m 0644 debian/rpi-brcmfmac.conf ${D}${sysconfdir}/modprobe.d/
 }
 
 PACKAGES = "\
@@ -54,6 +63,7 @@ PACKAGES = "\
     ${PN}-bcm43455 \
     ${PN}-bcm43456 \
     ${PN}-license \
+    ${PN}-module-conf \
 "
 
 LICENSE:${PN}-bcm43430 = "binary-redist-Cypress-rpidistro"
@@ -69,22 +79,29 @@ FILES:${PN}-bcm43430 = " \
     ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.bin \
     ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.clm_blob \
 "
-FILES:${PN}-bcm43436 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436-*"
+FILES:${PN}-bcm43436 = " \
+    ${nonarch_base_libdir}/firmware/brcm/brcmfmac43436-* \
+    ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430b0-* \
+"
 FILES:${PN}-bcm43436s = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436s*"
-FILES:${PN}-bcm43439 = "${nonarch_base_libdir}/firmware/cypress/43439A0-7.95.49.00.combined"
+FILES:${PN}-bcm43439 = " \
+    ${nonarch_base_libdir}/firmware/cypress/43439A0-7.95.49.00.combined \
+    ${nonarch_base_libdir}/firmware/cypress/cyfmac43439-sdio* \
+"
 FILES:${PN}-bcm43455 = " \
     ${nonarch_base_libdir}/firmware/brcm/brcmfmac43455* \
     ${nonarch_base_libdir}/firmware/cypress/cyfmac43455-sdio* \
 "
 FILES:${PN}-bcm43456 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43456*"
 FILES:${PN}-license = "${nonarch_base_libdir}/firmware/copyright.firmware-nonfree-rpidistro"
+FILES:${PN}-module-conf = "${sysconfdir}/modprobe.d"
 
-RDEPENDS:${PN}-bcm43430 += "${PN}-license"
-RDEPENDS:${PN}-bcm43436 += "${PN}-license"
-RDEPENDS:${PN}-bcm43436s += "${PN}-license"
-RDEPENDS:${PN}-bcm43439 += "${PN}-license"
-RDEPENDS:${PN}-bcm43455 += "${PN}-license"
-RDEPENDS:${PN}-bcm43456 += "${PN}-license"
+RDEPENDS:${PN}-bcm43430 += "${PN}-license ${PN}-module-conf"
+RDEPENDS:${PN}-bcm43436 += "${PN}-license ${PN}-module-conf"
+RDEPENDS:${PN}-bcm43436s += "${PN}-license ${PN}-module-conf"
+RDEPENDS:${PN}-bcm43439 += "${PN}-license ${PN}-module-conf"
+RDEPENDS:${PN}-bcm43455 += "${PN}-license ${PN}-module-conf"
+RDEPENDS:${PN}-bcm43456 += "${PN}-license ${PN}-module-conf"
 
 RCONFLICTS:${PN}-bcm43430 = "linux-firmware-raspbian-bcm43430"
 RCONFLICTS:${PN}-bcm43436 = "linux-firmware-bcm43436"

recipes-kernel/linux/files/0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch

@@ -1,50 +0,0 @@
-From 32f53700aeef2f5c7797ddda66348fc0b29e1047 Mon Sep 17 00:00:00 2001
-From: Kees Cook <keescook@chromium.org>
-Date: Wed, 18 Jan 2023 12:21:35 -0800
-Subject: [PATCH] gcc-plugins: Reorganize gimple includes for GCC 13
-
-The gimple-iterator.h header must be included before gimple-fold.h
-starting with GCC 13. Reorganize gimple headers to work for all GCC
-versions.
-
-Reported-by: Palmer Dabbelt <palmer@rivosinc.com>
-Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
-Link: https://lore.kernel.org/all/20230113173033.4380-1-palmer@rivosinc.com/
-Cc: linux-hardening@vger.kernel.org
-Signed-off-by: Kees Cook <keescook@chromium.org>
----
-Upstream-Status: Pending
-
- scripts/gcc-plugins/gcc-common.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
-index 0c087614fc3e..27770c31214c 100644
---- a/scripts/gcc-plugins/gcc-common.h
-+++ b/scripts/gcc-plugins/gcc-common.h
-@@ -77,8 +77,10 @@
- #include "varasm.h"
- #include "stor-layout.h"
- #include "internal-fn.h"
-+#include "gimple.h"
- #include "gimple-expr.h"
- #include "gimple-fold.h"
-+#include "gimple-iterator.h"
- #include "context.h"
- #include "tree-ssa-alias.h"
- #include "tree-ssa.h"
-@@ -91,11 +93,9 @@
- #include "tree-eh.h"
- #include "stmt.h"
- #include "gimplify.h"
--#include "gimple.h"
- #include "tree-ssa-operands.h"
- #include "tree-phinodes.h"
- #include "tree-cfg.h"
--#include "gimple-iterator.h"
- #include "gimple-ssa.h"
- #include "ssa-iterators.h"
- 
--- 
-2.39.1
-

recipes-kernel/linux/files/android-drivers.cfg

@@ -1,8 +1,3 @@
-CONFIG_ANDROID=y
-
 #CONFIG_ANDROID_BINDERFS is not set
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDER_DEVICES="binder"
-
-CONFIG_ASHMEM=y
-

recipes-kernel/linux/files/raspberrypi4-64/rpi4-64-kernel-misc.cfg

@@ -1,2 +0,0 @@
-# see emmc node
-CONFIG_MMC_SDHCI_IPROC=y

recipes-kernel/linux/files/rpi.scc

@@ -1 +0,0 @@
-patch 0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch

recipes-kernel/linux/files/vc4graphics.cfg

@@ -1,4 +1,5 @@
 CONFIG_I2C_BCM2835=y
+CONFIG_I2C_BRCMSTB=y
 CONFIG_DRM=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_VC4=y

recipes-kernel/linux/linux-raspberrypi-v7_6.12.bb

@@ -3,4 +3,4 @@
 # SPDX-License-Identifier: MIT
 
 require linux-raspberrypi-v7.inc
-require linux-raspberrypi_5.15.bb
+require linux-raspberrypi_6.12.bb

recipes-kernel/linux/linux-raspberrypi-v7_6.6.bb

@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
+#
+# SPDX-License-Identifier: MIT
+
+require linux-raspberrypi-v7.inc
+require linux-raspberrypi_6.6.bb

recipes-kernel/linux/linux-raspberrypi.inc

@@ -28,11 +28,12 @@ KBUILD_DEFCONFIG:raspberrypi ?= "bcmrpi_defconfig"
 KBUILD_DEFCONFIG:raspberrypi-cm3 ?= "bcm2709_defconfig"
 KBUILD_DEFCONFIG:raspberrypi2 ?= "bcm2709_defconfig"
 KBUILD_DEFCONFIG:raspberrypi3 ?= "bcm2709_defconfig"
-KBUILD_DEFCONFIG:raspberrypi3-64 ?= "bcmrpi3_defconfig"
+KBUILD_DEFCONFIG:raspberrypi3-64 ?= "bcm2711_defconfig"
 KBUILD_DEFCONFIG:raspberrypi4 ?= "bcm2711_defconfig"
 KBUILD_DEFCONFIG:raspberrypi4-64 ?= "bcm2711_defconfig"
 KBUILD_DEFCONFIG:raspberrypi-armv7 ?= "bcm2711_defconfig"
 KBUILD_DEFCONFIG:raspberrypi-armv8 ?= "bcm2711_defconfig"
+KBUILD_DEFCONFIG:raspberrypi5 ?= "bcm2712_defconfig"
 
 LINUX_VERSION_EXTENSION ?= ""
 

recipes-kernel/linux/linux-raspberrypi_6.1.bb

@@ -1,9 +1,9 @@
-LINUX_VERSION ?= "6.1.61"
+LINUX_VERSION ?= "6.1.77"
 LINUX_RPI_BRANCH ?= "rpi-6.1.y"
 LINUX_RPI_KMETA_BRANCH ?= "yocto-6.1"
 
-SRCREV_machine = "f364e0eb8f973e1aa24a3c451d18e84247a8efcd"
-SRCREV_meta = "29ec3dc6f4f59b731badcc864b212767023cc40c"
+SRCREV_machine = "77fc1fbcb5c013329af9583307dd1ff3cd4752aa"
+SRCREV_meta = "43d1723dbe0ce7b341cf32feeb35ecbe6b0ce29a"
 
 KMETA = "kernel-meta"
 

recipes-kernel/linux/linux-raspberrypi_6.12.bb

@@ -1,16 +1,15 @@
-LINUX_VERSION ?= "5.15.92"
-LINUX_RPI_BRANCH ?= "rpi-5.15.y"
-LINUX_RPI_KMETA_BRANCH ?= "yocto-5.15"
+LINUX_VERSION ?= "6.12.41"
+LINUX_RPI_BRANCH ?= "rpi-6.12.y"
+LINUX_RPI_KMETA_BRANCH ?= "yocto-6.12"
 
-SRCREV_machine = "14b35093ca68bf2c81bbc90aace5007142b40b40"
-SRCREV_meta = "509f4b9d68337f103633d48b621c1c9aa0dc975d"
+SRCREV_machine = "11d5d0d30abe08fddc8a0e856d0e333ca6e22114"
+SRCREV_meta = "57f788e849d9b04dd6aa28b896546c56b45f69e7"
 
 KMETA = "kernel-meta"
 
 SRC_URI = " \
     git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH};protocol=https \
     git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA} \
-    file://rpi.scc \
     file://powersave.cfg \
     file://android-drivers.cfg \
     "

recipes-kernel/linux/linux-raspberrypi_6.6.bb

@@ -0,0 +1,31 @@
+LINUX_VERSION ?= "6.6.63"
+LINUX_RPI_BRANCH ?= "rpi-6.6.y"
+LINUX_RPI_KMETA_BRANCH ?= "yocto-6.6"
+
+SRCREV_machine = "e442e5c1ab6bff5b5460b4fc949beb72aaf77970"
+SRCREV_meta = "52ff0d75713ce61962b325a2090bd55e216f0cf3"
+
+KMETA = "kernel-meta"
+
+SRC_URI = " \
+    git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH};protocol=https \
+    git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA} \
+    file://powersave.cfg \
+    file://android-drivers.cfg \
+    "
+
+require linux-raspberrypi.inc
+
+KERNEL_DTC_FLAGS += "-@ -H epapr"
+
+RDEPENDS:${KERNEL_PACKAGE_NAME}:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-base"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-image:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-image"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-dev:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-dev"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-vmlinux:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-vmlinux"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-modules:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-modules"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-dbg:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-dbg"
+
+DEPLOYDEP = ""
+DEPLOYDEP:raspberrypi-armv7 = "${RASPBERRYPI_v7_KERNEL}:do_deploy"
+do_deploy[depends] += "${DEPLOYDEP}"

recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch

@@ -1,50 +0,0 @@
-From 160181edf5fc73288abfe99fa04de4a550cd9c65 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 11 Feb 2016 12:53:20 -0800
-Subject: [PATCH] Don't try to acquire buffer when src pad isn't active
-
-From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?= <eocanha@igalia.com>
-
-This solves a race condition when setting the pipeline from PAUSE to
-NULL while the decoder loop is still running. Without this patch, the
-thread which interacts with the decode sink pad gets blocked here:
-
-  gst_element_change_state()
-  gst_element_change_state_func()
-  gst_element_pads_activate() --> Deactivating pads
-  activate_pads()
-  gst_pad_set_active()
-  gst_pad_activate_mode()
-  post_activate()
-  GST_PAD_STREAM_LOCK()
-
-while gst_omx_port_acquire_buffer() gets stalled forever in
-gst_omx_component_wait_message() waiting for a message that will never
-arrive:
-
-  gst_omx_video_dec_loop()
-  gst_omx_port_acquire_buffer()
-  gst_omx_component_wait_message()
-
----
-Upstream-Status: Pending
-
- omx/gstomxvideodec.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
-index abe6e30..c4dc33f 100644
---- a/omx/gstomxvideodec.c
-+++ b/omx/gstomxvideodec.c
-@@ -1598,6 +1598,11 @@ gst_omx_video_dec_loop (GstOMXVideoDec * self)
-   GstOMXAcquireBufferReturn acq_return;
-   OMX_ERRORTYPE err;
- 
-+  if (!gst_pad_is_active(GST_VIDEO_DECODER_SRC_PAD (self))) {
-+    GST_DEBUG_OBJECT (self, "Src pad not active, not acquiring buffer and flushing instead");
-+      goto flushing;
-+  }
-+
- #if defined (USE_OMX_TARGET_RPI) && defined (HAVE_GST_GL)
-   port = self->eglimage ? self->egl_out_port : self->dec_out_port;
- #else

recipes-multimedia/gstreamer/gstreamer1.0-omx/0003-no-timeout-on-get-state.patch

@@ -1,26 +0,0 @@
-From 21f776bff596bc0bd09708efa6497f8bdcd065c0 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 13 Feb 2016 11:42:29 -0800
-
----
-Upstream-Status: Pending
-
- omx/gstomxvideodec.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
-index c4dc33f..ba5304f 100644
---- a/omx/gstomxvideodec.c
-+++ b/omx/gstomxvideodec.c
-@@ -2021,9 +2021,9 @@ gst_omx_video_dec_stop (GstVideoDecoder * decoder)
-   g_cond_broadcast (&self->drain_cond);
-   g_mutex_unlock (&self->drain_lock);
- 
--  gst_omx_component_get_state (self->dec, 5 * GST_SECOND);
-+  gst_omx_component_get_state (self->dec, 0);
- #if defined (USE_OMX_TARGET_RPI) && defined (HAVE_GST_GL)
--  gst_omx_component_get_state (self->egl_render, 1 * GST_SECOND);
-+  gst_omx_component_get_state (self->egl_render, 0);
- #endif
- 
-   gst_buffer_replace (&self->codec_data, NULL);

recipes-multimedia/gstreamer/gstreamer1.0-omx/0004-Properly-handle-drain-requests-while-flushing.patch

@@ -1,32 +0,0 @@
-From 140bf8548843a98b0af2ddc1765ab59c16c8994c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?= <eocanha@igalia.com>
-Date: Tue, 17 Nov 2015 16:51:27 +0000
-Subject: [PATCH] Properly handle drain requests while flushing
-
-Without this commit the decoder streaming thread stops without ever attending
-the drain request, leaving the decoder input thread waiting forever.
-
----
-Upstream-Status: Pending
-
- omx/gstomx.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/omx/gstomx.c b/omx/gstomx.c
-index 038ce32..5202d33 100644
---- a/omx/gstomx.c
-+++ b/omx/gstomx.c
-@@ -1011,6 +1011,13 @@ gst_omx_component_new (GstObject * parent, const gchar * core_name,
- 
-   g_mutex_lock (&comp->lock);
-   gst_omx_component_handle_messages (comp);
-+
-+  if (err != OMX_ErrorNone && comp->last_error == OMX_ErrorNone) {
-+    GST_ERROR_OBJECT (comp->parent,
-+        "Last operation returned an error. Setting last_error manually.");
-+    comp->last_error = err;
-+  }
-+
-   g_mutex_unlock (&comp->lock);
- 
-   return comp;

recipes-multimedia/gstreamer/gstreamer1.0-omx/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch

@@ -1,36 +0,0 @@
-From cf6cf2060c5a7a7ddc0396a0c20c234fc56c79b6 Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <andrei@gherzan.ro>
-Date: Tue, 28 May 2019 18:02:24 +0100
-Subject: [PATCH] Don't abort gst_omx_video_dec_set_format() if there's a
- timeout releasing the buffers taken by the egl_render out port
-
-From 0d2ad639e6158c8023c157e206ef3ff7abdc089c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?=
-<eocanha@igalia.com>
-Date: Fri, 4 Dec 2015 18:39:59 +0100
-Subject: [PATCH] Don't abort gst_omx_video_dec_set_format() if there's a
-timeout releasing the buffers taken by the egl_render out port
-
-Upstream-Status: Pending
-Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
----
- omx/gstomxvideodec.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
-index ba5304f..8bd5d3d 100644
---- a/omx/gstomxvideodec.c
-+++ b/omx/gstomxvideodec.c
-@@ -2229,7 +2229,9 @@ gst_omx_video_dec_disable (GstOMXVideoDec * self)
-       return FALSE;
-     if (gst_omx_port_wait_buffers_released (out_port,
-             1 * GST_SECOND) != OMX_ErrorNone)
-+#if !(defined (USE_OMX_TARGET_RPI) && defined (HAVE_GST_GL))
-       return FALSE;
-+#endif
-     if (!gst_omx_video_dec_deallocate_output_buffers (self))
-       return FALSE;
-     if (gst_omx_port_wait_enabled (out_port, 1 * GST_SECOND) != OMX_ErrorNone)
--- 
-2.17.1
-

recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend

@@ -1,12 +0,0 @@
-FILESEXTRAPATHS:prepend:rpi := "${THISDIR}/${PN}:"
-
-SRC_URI:append:rpi = " \
-    file://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \
-    file://0003-no-timeout-on-get-state.patch \
-    file://0004-Properly-handle-drain-requests-while-flushing.patch \
-    file://0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch \
-"
-
-GSTREAMER_1_0_OMX_TARGET:rpi = "rpi"
-GSTREAMER_1_0_OMX_CORE_NAME:rpi = "${libdir}/libopenmaxil.so"
-EXTRA_OEMESON:append:rpi = " -Dheader_path=${STAGING_DIR_TARGET}/usr/include/IL"

recipes-multimedia/omxplayer/omxplayer_git.bb

@@ -25,7 +25,7 @@ SRCREV_default = "1f1d0ccd65d3a1caa86dc79d2863a8f067c8e3f8"
 SRCREV_ffmpeg = "fcbd117df3077bad495e99e20f01cf93737bce76"
 
 SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=https;branch=master \
-           git://github.com/FFmpeg/FFmpeg;branch=release/4.0;protocol=https;depth=1;name=ffmpeg;destsuffix=git/ffmpeg \
+           git://github.com/FFmpeg/FFmpeg;branch=release/4.0;protocol=https;depth=1;name=ffmpeg;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/ffmpeg \
            file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \
            file://0003-Remove-strip-step-in-Makefile.patch \
            file://0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch \
@@ -40,8 +40,6 @@ SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=https;branch=maste
 
 SRC_URI:append = "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " file://0001-Fix-build-with-vc4-driver.patch ", "", d)}"
 
-S = "${WORKDIR}/git"
-
 COMPATIBLE_MACHINE = "^rpi$"
 COMPATIBLE_HOST:aarch64 = "null"
 

recipes-multimedia/picamera-libs/picamera-libs.bb

@@ -6,11 +6,12 @@ LIC_FILES_CHKSUM = "file://opt/vc/LICENCE;md5=86e53f5f5909ee66900418028de11780"
 
 include recipes-bsp/common/raspberrypi-firmware.inc
 
-S = "${WORKDIR}/raspberrypi-firmware-1.${PV}"
+S = "${RPIFW_S}"
 
 do_install(){
     install -m 0755 -d ${D}${libdir}
     install -m 0755 ${S}/opt/vc/lib/*.so ${D}${libdir}
+    rm -f ${D}${libdir}/libGLES* ${D}${libdir}/libEGL* ${D}${libdir}/libWFC.so ${D}${libdir}/libOpenVG.so
 }
 
 FILES:${PN} = "${libdir}"

recipes-multimedia/python3-picamera/python3-picamera_git.bb

@@ -14,8 +14,6 @@ RDEPENDS:${PN} = "python3-numbers   \
 SRC_URI = "git://git@github.com/waveform80/picamera.git;protocol=ssh;branch=master"
 SRCREV = "7e4f1d379d698c44501fb84b886fadf3fc164b70"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 COMPATIBLE_HOST = "null"

recipes-multimedia/rpidistro-ffmpeg/files/0001-avcodec-arm-sbcenc-avoid-callee-preserved-vfp-regist.patch

@@ -1,292 +0,0 @@
-From: James Cowgill <jcowgill@debian.org>
-Date: Sun, 11 Aug 2019 16:50:56 +0100
-Subject: avcodec/arm/sbcenc: avoid callee preserved vfp registers
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo clones original ffmpeg and applies patches to enable
-raspiberry pi support.
-
-When compiling FFmpeg with GCC-9, some very random segfaults were
-observed in code which had previously called down into the SBC encoder
-NEON assembly routines. This was caused by these functions clobbering
-some of the vfp callee saved registers (d8 - d15 aka q4 - q7). GCC was
-using these registers to save local variables, but after these
-functions returned, they would contain garbage.
-
-Fix by reallocating the registers in the two affected functions in
-the following way:
- ff_sbc_analyze_4_neon: q2-q5 => q8-q11, then q1-q4 => q8-q11
- ff_sbc_analyze_8_neon: q2-q9 => q8-q15
-
-The reason for using these replacements is to keep closely related
-sets of registers consecutively numbered which hopefully makes the
-code more easy to follow. Since this commit only reallocates
-registers, it should have no performance impact.
-
-Signed-off-by: James Cowgill <jcowgill@debian.org>
----
- libavcodec/arm/sbcdsp_neon.S | 220 +++++++++++++++++++++----------------------
- 1 file changed, 110 insertions(+), 110 deletions(-)
-
-diff --git a/libavcodec/arm/sbcdsp_neon.S b/libavcodec/arm/sbcdsp_neon.S
-index d83d21d..914abfb 100644
---- a/libavcodec/arm/sbcdsp_neon.S
-+++ b/libavcodec/arm/sbcdsp_neon.S
-@@ -38,49 +38,49 @@ function ff_sbc_analyze_4_neon, export=1
-         /* TODO: merge even and odd cases (or even merge all four calls to this
-          * function) in order to have only aligned reads from 'in' array
-          * and reduce number of load instructions */
--        vld1.16         {d4, d5}, [r0, :64]!
--        vld1.16         {d8, d9}, [r2, :128]!
-+        vld1.16         {d16, d17}, [r0, :64]!
-+        vld1.16         {d20, d21}, [r2, :128]!
- 
--        vmull.s16       q0, d4, d8
--        vld1.16         {d6,  d7}, [r0, :64]!
--        vmull.s16       q1, d5, d9
--        vld1.16         {d10, d11}, [r2, :128]!
-+        vmull.s16       q0, d16, d20
-+        vld1.16         {d18, d19}, [r0, :64]!
-+        vmull.s16       q1, d17, d21
-+        vld1.16         {d22, d23}, [r2, :128]!
- 
--        vmlal.s16       q0, d6, d10
--        vld1.16         {d4, d5}, [r0, :64]!
--        vmlal.s16       q1, d7, d11
--        vld1.16         {d8, d9}, [r2, :128]!
-+        vmlal.s16       q0, d18, d22
-+        vld1.16         {d16, d17}, [r0, :64]!
-+        vmlal.s16       q1, d19, d23
-+        vld1.16         {d20, d21}, [r2, :128]!
- 
--        vmlal.s16       q0, d4, d8
--        vld1.16         {d6,  d7}, [r0, :64]!
--        vmlal.s16       q1, d5, d9
--        vld1.16         {d10, d11}, [r2, :128]!
-+        vmlal.s16       q0, d16, d20
-+        vld1.16         {d18, d19}, [r0, :64]!
-+        vmlal.s16       q1, d17, d21
-+        vld1.16         {d22, d23}, [r2, :128]!
- 
--        vmlal.s16       q0, d6, d10
--        vld1.16         {d4, d5}, [r0, :64]!
--        vmlal.s16       q1, d7, d11
--        vld1.16         {d8, d9}, [r2, :128]!
-+        vmlal.s16       q0, d18, d22
-+        vld1.16         {d16, d17}, [r0, :64]!
-+        vmlal.s16       q1, d19, d23
-+        vld1.16         {d20, d21}, [r2, :128]!
- 
--        vmlal.s16       q0, d4, d8
--        vmlal.s16       q1, d5, d9
-+        vmlal.s16       q0, d16, d20
-+        vmlal.s16       q1, d17, d21
- 
-         vpadd.s32       d0, d0, d1
-         vpadd.s32       d1, d2, d3
- 
-         vrshrn.s32      d0, q0, SBC_PROTO_FIXED_SCALE
- 
--        vld1.16         {d2, d3, d4, d5}, [r2, :128]!
-+        vld1.16         {d16, d17, d18, d19}, [r2, :128]!
- 
-         vdup.i32        d1, d0[1]  /* TODO: can be eliminated */
-         vdup.i32        d0, d0[0]  /* TODO: can be eliminated */
- 
--        vmull.s16       q3, d2, d0
--        vmull.s16       q4, d3, d0
--        vmlal.s16       q3, d4, d1
--        vmlal.s16       q4, d5, d1
-+        vmull.s16       q10, d16, d0
-+        vmull.s16       q11, d17, d0
-+        vmlal.s16       q10, d18, d1
-+        vmlal.s16       q11, d19, d1
- 
--        vpadd.s32       d0, d6, d7 /* TODO: can be eliminated */
--        vpadd.s32       d1, d8, d9 /* TODO: can be eliminated */
-+        vpadd.s32       d0, d20, d21 /* TODO: can be eliminated */
-+        vpadd.s32       d1, d22, d23 /* TODO: can be eliminated */
- 
-         vst1.32         {d0, d1}, [r1, :128]
- 
-@@ -91,57 +91,57 @@ function ff_sbc_analyze_8_neon, export=1
-         /* TODO: merge even and odd cases (or even merge all four calls to this
-          * function) in order to have only aligned reads from 'in' array
-          * and reduce number of load instructions */
--        vld1.16         {d4, d5}, [r0, :64]!
--        vld1.16         {d8, d9}, [r2, :128]!
--
--        vmull.s16       q6, d4, d8
--        vld1.16         {d6,  d7}, [r0, :64]!
--        vmull.s16       q7, d5, d9
--        vld1.16         {d10, d11}, [r2, :128]!
--        vmull.s16       q8, d6, d10
--        vld1.16         {d4, d5}, [r0, :64]!
--        vmull.s16       q9, d7, d11
--        vld1.16         {d8, d9}, [r2, :128]!
--
--        vmlal.s16       q6, d4, d8
--        vld1.16         {d6,  d7}, [r0, :64]!
--        vmlal.s16       q7, d5, d9
--        vld1.16         {d10, d11}, [r2, :128]!
--        vmlal.s16       q8, d6, d10
--        vld1.16         {d4, d5}, [r0, :64]!
--        vmlal.s16       q9, d7, d11
--        vld1.16         {d8, d9}, [r2, :128]!
--
--        vmlal.s16       q6, d4, d8
--        vld1.16         {d6,  d7}, [r0, :64]!
--        vmlal.s16       q7, d5, d9
--        vld1.16         {d10, d11}, [r2, :128]!
--        vmlal.s16       q8, d6, d10
--        vld1.16         {d4, d5}, [r0, :64]!
--        vmlal.s16       q9, d7, d11
--        vld1.16         {d8, d9}, [r2, :128]!
--
--        vmlal.s16       q6, d4, d8
--        vld1.16         {d6,  d7}, [r0, :64]!
--        vmlal.s16       q7, d5, d9
--        vld1.16         {d10, d11}, [r2, :128]!
--        vmlal.s16       q8, d6, d10
--        vld1.16         {d4, d5}, [r0, :64]!
--        vmlal.s16       q9, d7, d11
--        vld1.16         {d8, d9}, [r2, :128]!
--
--        vmlal.s16       q6, d4, d8
--        vld1.16         {d6,  d7}, [r0, :64]!
--        vmlal.s16       q7, d5, d9
--        vld1.16         {d10, d11}, [r2, :128]!
--
--        vmlal.s16       q8, d6, d10
--        vmlal.s16       q9, d7, d11
--
--        vpadd.s32       d0, d12, d13
--        vpadd.s32       d1, d14, d15
--        vpadd.s32       d2, d16, d17
--        vpadd.s32       d3, d18, d19
-+        vld1.16         {d16, d17}, [r0, :64]!
-+        vld1.16         {d20, d21}, [r2, :128]!
-+
-+        vmull.s16       q12, d16, d20
-+        vld1.16         {d18, d19}, [r0, :64]!
-+        vmull.s16       q13, d17, d21
-+        vld1.16         {d22, d23}, [r2, :128]!
-+        vmull.s16       q14, d18, d22
-+        vld1.16         {d16, d17}, [r0, :64]!
-+        vmull.s16       q15, d19, d23
-+        vld1.16         {d20, d21}, [r2, :128]!
-+
-+        vmlal.s16       q12, d16, d20
-+        vld1.16         {d18, d19}, [r0, :64]!
-+        vmlal.s16       q13, d17, d21
-+        vld1.16         {d22, d23}, [r2, :128]!
-+        vmlal.s16       q14, d18, d22
-+        vld1.16         {d16, d17}, [r0, :64]!
-+        vmlal.s16       q15, d19, d23
-+        vld1.16         {d20, d21}, [r2, :128]!
-+
-+        vmlal.s16       q12, d16, d20
-+        vld1.16         {d18, d19}, [r0, :64]!
-+        vmlal.s16       q13, d17, d21
-+        vld1.16         {d22, d23}, [r2, :128]!
-+        vmlal.s16       q14, d18, d22
-+        vld1.16         {d16, d17}, [r0, :64]!
-+        vmlal.s16       q15, d19, d23
-+        vld1.16         {d20, d21}, [r2, :128]!
-+
-+        vmlal.s16       q12, d16, d20
-+        vld1.16         {d18, d19}, [r0, :64]!
-+        vmlal.s16       q13, d17, d21
-+        vld1.16         {d22, d23}, [r2, :128]!
-+        vmlal.s16       q14, d18, d22
-+        vld1.16         {d16, d17}, [r0, :64]!
-+        vmlal.s16       q15, d19, d23
-+        vld1.16         {d20, d21}, [r2, :128]!
-+
-+        vmlal.s16       q12, d16, d20
-+        vld1.16         {d18, d19}, [r0, :64]!
-+        vmlal.s16       q13, d17, d21
-+        vld1.16         {d22, d23}, [r2, :128]!
-+
-+        vmlal.s16       q14, d18, d22
-+        vmlal.s16       q15, d19, d23
-+
-+        vpadd.s32       d0, d24, d25
-+        vpadd.s32       d1, d26, d27
-+        vpadd.s32       d2, d28, d29
-+        vpadd.s32       d3, d30, d31
- 
-         vrshr.s32       q0, q0, SBC_PROTO_FIXED_SCALE
-         vrshr.s32       q1, q1, SBC_PROTO_FIXED_SCALE
-@@ -153,38 +153,38 @@ function ff_sbc_analyze_8_neon, export=1
-         vdup.i32        d1, d0[1]  /* TODO: can be eliminated */
-         vdup.i32        d0, d0[0]  /* TODO: can be eliminated */
- 
--        vld1.16         {d4, d5}, [r2, :128]!
--        vmull.s16       q6, d4, d0
--        vld1.16         {d6, d7}, [r2, :128]!
--        vmull.s16       q7, d5, d0
--        vmull.s16       q8, d6, d0
--        vmull.s16       q9, d7, d0
--
--        vld1.16         {d4, d5}, [r2, :128]!
--        vmlal.s16       q6, d4, d1
--        vld1.16         {d6, d7}, [r2, :128]!
--        vmlal.s16       q7, d5, d1
--        vmlal.s16       q8, d6, d1
--        vmlal.s16       q9, d7, d1
--
--        vld1.16         {d4, d5}, [r2, :128]!
--        vmlal.s16       q6, d4, d2
--        vld1.16         {d6, d7}, [r2, :128]!
--        vmlal.s16       q7, d5, d2
--        vmlal.s16       q8, d6, d2
--        vmlal.s16       q9, d7, d2
--
--        vld1.16         {d4, d5}, [r2, :128]!
--        vmlal.s16       q6, d4, d3
--        vld1.16         {d6, d7}, [r2, :128]!
--        vmlal.s16       q7, d5, d3
--        vmlal.s16       q8, d6, d3
--        vmlal.s16       q9, d7, d3
--
--        vpadd.s32       d0, d12, d13 /* TODO: can be eliminated */
--        vpadd.s32       d1, d14, d15 /* TODO: can be eliminated */
--        vpadd.s32       d2, d16, d17 /* TODO: can be eliminated */
--        vpadd.s32       d3, d18, d19 /* TODO: can be eliminated */
-+        vld1.16         {d16, d17}, [r2, :128]!
-+        vmull.s16       q12, d16, d0
-+        vld1.16         {d18, d19}, [r2, :128]!
-+        vmull.s16       q13, d17, d0
-+        vmull.s16       q14, d18, d0
-+        vmull.s16       q15, d19, d0
-+
-+        vld1.16         {d16, d17}, [r2, :128]!
-+        vmlal.s16       q12, d16, d1
-+        vld1.16         {d18, d19}, [r2, :128]!
-+        vmlal.s16       q13, d17, d1
-+        vmlal.s16       q14, d18, d1
-+        vmlal.s16       q15, d19, d1
-+
-+        vld1.16         {d16, d17}, [r2, :128]!
-+        vmlal.s16       q12, d16, d2
-+        vld1.16         {d18, d19}, [r2, :128]!
-+        vmlal.s16       q13, d17, d2
-+        vmlal.s16       q14, d18, d2
-+        vmlal.s16       q15, d19, d2
-+
-+        vld1.16         {d16, d17}, [r2, :128]!
-+        vmlal.s16       q12, d16, d3
-+        vld1.16         {d18, d19}, [r2, :128]!
-+        vmlal.s16       q13, d17, d3
-+        vmlal.s16       q14, d18, d3
-+        vmlal.s16       q15, d19, d3
-+
-+        vpadd.s32       d0, d24, d25 /* TODO: can be eliminated */
-+        vpadd.s32       d1, d26, d27 /* TODO: can be eliminated */
-+        vpadd.s32       d2, d28, d29 /* TODO: can be eliminated */
-+        vpadd.s32       d3, d30, d31 /* TODO: can be eliminated */
- 
-         vst1.32         {d0, d1, d2, d3}, [r1, :128]
- 

recipes-multimedia/rpidistro-ffmpeg/files/0002-Fix-build-on-powerpc-and-ppc64.patch

@@ -1,34 +0,0 @@
-From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
-Date: Tue, 19 Jan 2021 20:35:29 +0100
-Subject: Fix build on powerpc and ppc64
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo clones original ffmpeg and applies patches to enable
-raspiberry pi support.
-
----
- libswscale/ppc/yuv2rgb_altivec.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c
-index 5365452..930ef6b 100644
---- a/libswscale/ppc/yuv2rgb_altivec.c
-+++ b/libswscale/ppc/yuv2rgb_altivec.c
-@@ -283,6 +283,16 @@ static inline void cvtyuvtoRGB(SwsContext *c, vector signed short Y,
-  * ------------------------------------------------------------------------------
-  */
- 
-+#if !HAVE_VSX
-+static inline vector unsigned char vec_xl(signed long long offset, const ubyte *addr)
-+{
-+    const vector unsigned char *v_addr = (const vector unsigned char *) (addr + offset);
-+    vector unsigned char align_perm = vec_lvsl(offset, addr);
-+
-+    return (vector unsigned char) vec_perm(v_addr[0], v_addr[1], align_perm);
-+}
-+#endif /* !HAVE_VSX */
-+
- #define DEFCSP420_CVT(name, out_pixels)                                       \
- static int altivec_ ## name(SwsContext *c, const unsigned char **in,          \
-                             int *instrides, int srcSliceY, int srcSliceH,     \

recipes-multimedia/rpidistro-ffmpeg/files/0003-avcodec-pngenc-remove-monowhite-from-apng-formats.patch

@@ -1,30 +0,0 @@
-From: Paul B Mahol <onemda@gmail.com>
-Date: Sun, 14 Feb 2021 17:20:03 +0100
-Subject: avcodec/pngenc: remove monowhite from apng formats
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo clones original ffmpeg and applies patches to enable
-raspiberry pi support.
-
-Monowhite pixel format is not supported, and it does not make sense
-to add support for it.
-
-Fixes #7989
----
- libavcodec/pngenc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c
-index efcae8c..eebb164 100644
---- a/libavcodec/pngenc.c
-+++ b/libavcodec/pngenc.c
-@@ -1174,7 +1174,7 @@ AVCodec ff_apng_encoder = {
-         AV_PIX_FMT_PAL8,
-         AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8A,
-         AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_YA16BE,
--        AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE
-+        AV_PIX_FMT_NONE
-     },
-     .priv_class     = &apngenc_class,
- };