summaryrefslogtreecommitdiff
path: root/meta-raspberrypi
diff options
context:
space:
mode:
Diffstat (limited to 'meta-raspberrypi')
-rw-r--r--meta-raspberrypi/README.md4
-rw-r--r--meta-raspberrypi/SECURITY.md20
-rw-r--r--meta-raspberrypi/conf/layer.conf12
-rw-r--r--meta-raspberrypi/conf/machine/include/rpi-base.inc14
-rw-r--r--meta-raspberrypi/conf/machine/include/rpi-default-providers.inc4
-rw-r--r--meta-raspberrypi/docs/extra-build-config.md16
-rw-r--r--meta-raspberrypi/kas-poky-rpi.yml6
-rw-r--r--meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb3
-rw-r--r--meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb2
-rw-r--r--meta-raspberrypi/recipes-core/udev/udev-rules-rpi/fb.rules1
-rw-r--r--meta-raspberrypi/recipes-devtools/raspi-utils/raspi-utils_git.bb22
-rw-r--r--meta-raspberrypi/recipes-graphics/mesa/mesa-gl.bbappend (renamed from meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend)0
-rw-r--r--meta-raspberrypi/recipes-graphics/mesa/mesa.bbappend (renamed from meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend)0
-rw-r--r--meta-raspberrypi/recipes-graphics/wayland/weston-init.bbappend10
-rw-r--r--meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb4
-rw-r--r--meta-raspberrypi/recipes-kernel/linux/files/android-drivers.cfg5
-rw-r--r--meta-raspberrypi/recipes-kernel/linux/files/vc4graphics.cfg1
-rw-r--r--meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.6.bb6
-rw-r--r--meta-raspberrypi/recipes-multimedia/picamera-libs/picamera-libs.bb1
19 files changed, 85 insertions, 46 deletions
diff --git a/meta-raspberrypi/README.md b/meta-raspberrypi/README.md
index f00d15147c..6b160819c2 100644
--- a/meta-raspberrypi/README.md
+++ b/meta-raspberrypi/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
@@ -81,7 +81,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.
diff --git a/meta-raspberrypi/SECURITY.md b/meta-raspberrypi/SECURITY.md
new file mode 100644
index 0000000000..ca3ad0a848
--- /dev/null
+++ b/meta-raspberrypi/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.
diff --git a/meta-raspberrypi/conf/layer.conf b/meta-raspberrypi/conf/layer.conf
index 76f9e92d3b..cdf81125c9 100644
--- a/meta-raspberrypi/conf/layer.conf
+++ b/meta-raspberrypi/conf/layer.conf
@@ -9,11 +9,8 @@ BBFILE_COLLECTIONS += "raspberrypi"
BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/"
BBFILE_PRIORITY_raspberrypi = "9"
-LAYERSERIES_COMPAT_raspberrypi = "styhead"
+LAYERSERIES_COMPAT_raspberrypi = "styhead walnascar"
LAYERDEPENDS_raspberrypi = "core"
-# Recommended for u-boot support for raspberrypi5
-# https://git.yoctoproject.org/meta-lts-mixins 'scarthgap/u-boot' branch
-LAYERRECOMMENDS_raspberrypi = "lts-u-boot-mixin"
# Additional license directories.
LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
@@ -23,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 \
@@ -37,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"
diff --git a/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc
index a5fd1a4578..9923133977 100644
--- a/meta-raspberrypi/conf/machine/include/rpi-base.inc
+++ b/meta-raspberrypi/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 \
@@ -58,6 +60,17 @@ 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 \
@@ -86,7 +99,6 @@ RPI_KERNEL_DEVICETREE ?= " \
broadcom/bcm2710-rpi-cm3.dtb \
broadcom/bcm2711-rpi-cm4.dtb \
broadcom/bcm2711-rpi-cm4s.dtb \
- broadcom/bcm2712-rpi-5-b.dtb \
"
KERNEL_DEVICETREE ??= " \
diff --git a/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc b/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc
index 3f810264b3..c02d24879e 100644
--- a/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc
+++ b/meta-raspberrypi/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"
diff --git a/meta-raspberrypi/docs/extra-build-config.md b/meta-raspberrypi/docs/extra-build-config.md
index dfb86f1699..fa971574a6 100644
--- a/meta-raspberrypi/docs/extra-build-config.md
+++ b/meta-raspberrypi/docs/extra-build-config.md
@@ -178,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"`.
@@ -487,14 +488,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.
diff --git a/meta-raspberrypi/kas-poky-rpi.yml b/meta-raspberrypi/kas-poky-rpi.yml
index ce59eca6d8..5298c9e222 100644
--- a/meta-raspberrypi/kas-poky-rpi.yml
+++ b/meta-raspberrypi/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: |
diff --git a/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb b/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb
index bbd8736295..d035d6e404 100644
--- a/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb
+++ b/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb
@@ -21,6 +21,9 @@ do_compile() {
inherit kernel-arch deploy nopackages
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
do_deploy() {
install -d ${DEPLOYDIR}
install -m 0644 boot.scr ${DEPLOYDIR}
diff --git a/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb b/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb
index 3ca34f443e..2dba4de2be 100644
--- a/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb
+++ b/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
SRC_URI = " \
git://github.com/RPi-Distro/raspberrypi-sys-mods;protocol=https;branch=master \
file://can.rules \
+ file://fb.rules \
"
SRCREV = "5ce3ef2b7f377c23fea440ca9df0e30f3f8447cf"
@@ -16,4 +17,5 @@ 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 ${UNPACKDIR}/can.rules ${D}${sysconfdir}/udev/rules.d/
+ install -m 0644 ${UNPACKDIR}/fb.rules ${D}${sysconfdir}/udev/rules.d/
}
diff --git a/meta-raspberrypi/recipes-core/udev/udev-rules-rpi/fb.rules b/meta-raspberrypi/recipes-core/udev/udev-rules-rpi/fb.rules
new file mode 100644
index 0000000000..dcaa129c94
--- /dev/null
+++ b/meta-raspberrypi/recipes-core/udev/udev-rules-rpi/fb.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="graphics", KERNEL=="fb[0-9]*", TAG+="systemd"
diff --git a/meta-raspberrypi/recipes-devtools/raspi-utils/raspi-utils_git.bb b/meta-raspberrypi/recipes-devtools/raspi-utils/raspi-utils_git.bb
new file mode 100644
index 0000000000..8b979a49f1
--- /dev/null
+++ b/meta-raspberrypi/recipes-devtools/raspi-utils/raspi-utils_git.bb
@@ -0,0 +1,22 @@
+SUMMARY = "A collection of scripts and simple applications"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=4c01239e5c3a3d133858dedacdbca63c"
+
+DEPENDS:append = " dtc"
+
+PV = "1.0+git"
+
+SRC_URI = "git://github.com/raspberrypi/utils;protocol=https;branch=master"
+
+SRCREV = "b9c63214c535d7df2b0fa6743b7b3e508363c25a"
+
+S = "${WORKDIR}/git"
+
+FILES:${PN}:append = " \
+ ${datadir}/bash-completion/completions/pinctrl \
+"
+
+OECMAKE_TARGET_COMPILE = "pinctrl/all dtmerge/all"
+OECMAKE_TARGET_INSTALL = "pinctrl/install dtmerge/install"
+
+inherit cmake
diff --git a/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend b/meta-raspberrypi/recipes-graphics/mesa/mesa-gl.bbappend
index edb75f59bc..edb75f59bc 100644
--- a/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend
+++ b/meta-raspberrypi/recipes-graphics/mesa/mesa-gl.bbappend
diff --git a/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend b/meta-raspberrypi/recipes-graphics/mesa/mesa.bbappend
index 7000ead0f3..7000ead0f3 100644
--- a/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend
+++ b/meta-raspberrypi/recipes-graphics/mesa/mesa.bbappend
diff --git a/meta-raspberrypi/recipes-graphics/wayland/weston-init.bbappend b/meta-raspberrypi/recipes-graphics/wayland/weston-init.bbappend
deleted file mode 100644
index b6d6f2e8a7..0000000000
--- a/meta-raspberrypi/recipes-graphics/wayland/weston-init.bbappend
+++ /dev/null
@@ -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
-}
diff --git a/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb b/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb
index 1b4305820e..0409ba3fec 100644
--- a/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb
+++ b/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb
@@ -18,8 +18,8 @@ LICENSE_FLAGS = "synaptics-killswitch"
SRC_URI = "git://github.com/RPi-Distro/firmware-nonfree;branch=bookworm;protocol=https \
file://0001-Default-43455-firmware-to-standard-variant.patch \
"
-SRCREV = "223ccf3a3ddb11b3ea829749fbbba4d65b380897"
-PV = "20230625-2+rpt2"
+SRCREV = "4b356e134e8333d073bd3802d767a825adec3807"
+PV = "20230625-2+rpt3"
S = "${WORKDIR}/git"
inherit allarch
diff --git a/meta-raspberrypi/recipes-kernel/linux/files/android-drivers.cfg b/meta-raspberrypi/recipes-kernel/linux/files/android-drivers.cfg
index f74ac0e1c7..f1259a1653 100644
--- a/meta-raspberrypi/recipes-kernel/linux/files/android-drivers.cfg
+++ b/meta-raspberrypi/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
-
diff --git a/meta-raspberrypi/recipes-kernel/linux/files/vc4graphics.cfg b/meta-raspberrypi/recipes-kernel/linux/files/vc4graphics.cfg
index 0b4ba48434..3e5c19b7b8 100644
--- a/meta-raspberrypi/recipes-kernel/linux/files/vc4graphics.cfg
+++ b/meta-raspberrypi/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
diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.6.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.6.bb
index b4d9953e1e..3b67f16542 100644
--- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.6.bb
+++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.6.bb
@@ -1,9 +1,9 @@
-LINUX_VERSION ?= "6.6.22"
+LINUX_VERSION ?= "6.6.63"
LINUX_RPI_BRANCH ?= "rpi-6.6.y"
LINUX_RPI_KMETA_BRANCH ?= "yocto-6.6"
-SRCREV_machine = "c04af98514c26014a4f29ec87b3ece95626059bd"
-SRCREV_meta = "6a24861d6504575a4a9f92366285332d47c7e111"
+SRCREV_machine = "e442e5c1ab6bff5b5460b4fc949beb72aaf77970"
+SRCREV_meta = "52ff0d75713ce61962b325a2090bd55e216f0cf3"
KMETA = "kernel-meta"
diff --git a/meta-raspberrypi/recipes-multimedia/picamera-libs/picamera-libs.bb b/meta-raspberrypi/recipes-multimedia/picamera-libs/picamera-libs.bb
index f873a19903..2860442855 100644
--- a/meta-raspberrypi/recipes-multimedia/picamera-libs/picamera-libs.bb
+++ b/meta-raspberrypi/recipes-multimedia/picamera-libs/picamera-libs.bb
@@ -11,6 +11,7 @@ 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}"
generated by cgit v1.2.3 (git 2.39.0) at 2025-09-14 20:01:23 +0300