Merge branch 'master' into sandbox/support-usbboot

.github/workflows/docker-images/yocto-builder/entrypoint-build.sh

@@ -42,7 +42,9 @@ printf "\n# ------ ci ------\n" >> conf/local.conf
 cat <<EOCONF >>conf/local.conf
 BB_NUMBER_THREADS = "6"
 PARALLEL_MAKE = "-j 6"
-DISTRO_FEATURES:append = " systemd"
+# unmerged-usr is deprecated
+# https://lore.kernel.org/all/3f2f03085301d22854e5429019fb010f27d98bc7.camel@linuxfoundation.org/t/
+DISTRO_FEATURES:append = " systemd usrmerge"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
 VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"

conf/machine/include/rpi-base.inc

@@ -18,6 +18,7 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
     overlays/overlay_map.dtb \
     overlays/at86rf233.dtbo \
     overlays/disable-bt.dtbo \
+    overlays/disable-wifi.dtbo \
     overlays/dwc2.dtbo \
     overlays/gpio-ir.dtbo \
     overlays/gpio-ir-tx.dtbo \
@@ -112,9 +113,6 @@ SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}"
 # This variable is referred to by recipes fetching / generating the files.
 BOOTFILES_DIR_NAME ?= "bootfiles"
 
-# Set Raspberrypi splash image
-SPLASH ?= "psplash-raspberrypi"
-
 def make_dtb_boot_files(d):
     # Generate IMAGE_BOOT_FILES entries for device tree files listed in
     # KERNEL_DEVICETREE.

docs/conf.py

@@ -30,7 +30,10 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['myst_parser']
+extensions = [
+    'myst_parser',
+    'sphinx_rtd_theme'
+]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -121,6 +124,7 @@
 # a list of builtin themes.
 #
 # html_theme = 'alabaster'
+html_theme = "sphinx_rtd_theme"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

docs/requirements.txt

@@ -1 +1,2 @@
 myst_parser
+sphinx_rtd_theme

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

@@ -0,0 +1,40 @@
+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,2 @@
-PACKAGECONFIG[raspberrypi] = "-Dpipelines=raspberrypi -Dipas=raspberrypi -Dcpp_args=-Wno-unaligned-access"
+PACKAGECONFIG[raspberrypi] = "-Dpipelines=rpi/vc4 -Dipas=rpi/vc4 -Dcpp_args=-Wno-unaligned-access"
 PACKAGECONFIG:append:rpi = " raspberrypi"

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0009-demux-dash-include-cstdint-needed-for-uint64_t.patch

@@ -0,0 +1,30 @@
+From 6fca76ebd76bf8fce9b111e31bda64015cdc770f Mon Sep 17 00:00:00 2001
+From: Johannes Kauffmann <[email protected]>
+Date: Mon, 11 Jul 2022 19:35:57 +0000
+Subject: [PATCH] demux: dash: include cstdint, needed for uint64_t
+
+Fixes #27077.
+
+Upstream-Status: Backport
+
+https://github.com/videolan/vlc/commit/6fca76ebd76bf8fce9b111e31bda64015cdc770f
+
+---
+ modules/demux/dash/mpd/TemplatedUri.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/demux/dash/mpd/TemplatedUri.hpp b/modules/demux/dash/mpd/TemplatedUri.hpp
+index 1eeb70cbb6..7f7264a9c8 100644
+--- a/modules/demux/dash/mpd/TemplatedUri.hpp
++++ b/modules/demux/dash/mpd/TemplatedUri.hpp
+@@ -21,6 +21,7 @@
+ #ifndef TEMPLATEDURI_HPP
+ #define TEMPLATEDURI_HPP
+
++#include <cstdint>
+ #include <string>
+
+ namespace dash
+-- 
+2.34.1
+

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

@@ -15,6 +15,7 @@ SRC_URI = "\
     file://0006-mmal_chain.patch \
     file://0007-armv6.patch \
     file://0008-configure-Disable-incompatible-function-pointer-type.patch \
+    file://0009-demux-dash-include-cstdint-needed-for-uint64_t.patch \
     file://2001-fix-luaL-checkint.patch \
     file://2002-use-vorbisidec.patch \
     file://3001-configure.ac-setup-for-OE-usage.patch \

kas-poky-rpi.yml

@@ -55,7 +55,7 @@ local_conf_header:
         STOPTASKS,${DL_DIR},1G,100K \
         STOPTASKS,${SSTATE_DIR},1G,100K \
         STOPTASKS,/tmp,100M,100K \
-        ABORT,${TMPDIR},100M,1K \
-        ABORT,${DL_DIR},100M,1K \
-        ABORT,${SSTATE_DIR},100M,1K \
-        ABORT,/tmp,10M,1K"
+        HALT,${TMPDIR},100M,1K \
+        HALT,${DL_DIR},100M,1K \
+        HALT,${SSTATE_DIR},100M,1K \
+        HALT,/tmp,10M,1K"

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

@@ -29,6 +29,8 @@ Signed-off-by: Mauro Salvini <[email protected]>
 Cc: C?dric Schieli <[email protected]>
 Cc: Matthias Brugger <[email protected]>
 ---
+Upstream-Status: Pending
+
  board/raspberrypi/rpi/rpi.c | 3 ---
  1 file changed, 3 deletions(-)
 

recipes-connectivity/bluez5/bluez5/0001-bcm43xx-Add-bcm43xx-3wire-variant.patch

@@ -4,6 +4,8 @@ Date: Tue, 16 Feb 2016 16:40:46 +0000
 Subject: [PATCH] bcm43xx: Add bcm43xx-3wire variant
 
 ---
+Upstream-Status: Pending
+
  tools/hciattach.c | 3 +++
  1 file changed, 3 insertions(+)
 

recipes-connectivity/bluez5/bluez5/0002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch

@@ -5,6 +5,8 @@ Subject: [PATCH] bcm43xx: The UART speed must be reset after the firmware
  download
 
 ---
+Upstream-Status: Pending
+
  tools/hciattach_bcm43xx.c | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 

recipes-connectivity/bluez5/bluez5/0003-Increase-firmware-load-timeout-to-30s.patch

@@ -4,6 +4,8 @@ Date: Wed, 20 Jan 2016 16:00:37 +0000
 Subject: [PATCH] Increase firmware load timeout to 30s
 
 ---
+Upstream-Status: Pending
+
  tools/hciattach.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 

recipes-connectivity/bluez5/bluez5/0004-Move-the-hciattach-firmware-into-lib-firmware.patch

@@ -11,6 +11,8 @@ Subject: [PATCH] Move the hciattach firmware into /lib/firmware
 
 Signed-off-by: Martin Jansa <[email protected]>
 ---
+Upstream-Status: Pending
+
  tools/hciattach.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 

recipes-graphics/userland/files/0001-Allow-applications-to-set-next-resource-handle.patch

@@ -7,6 +7,8 @@ This patch adds provisions in userland to
 let apps callers set the next rendereing dispmanx resource.
 It's useful for implementing, say, a buffer carousel.
 ---
+Upstream-Status: Pending
+
  interface/khronos/common/khrn_client_rpc.h |  2 ++
  interface/khronos/common/khrn_int_ids.h    |  2 ++
  interface/khronos/egl/egl_client.c         | 30 +++++++++++++++++++---

recipes-graphics/userland/files/0002-wayland-Add-support-for-the-Wayland-winsys.patch

@@ -19,6 +19,8 @@ vc_vchi_dispmanx.h
 
 Signed-off-by: Khem Raj <[email protected]>
 ---
+Upstream-Status: Pending
+
  .gitignore                                    |   1 +
  CMakeLists.txt                                |  11 +
  README.md                                     |   4 +

recipes-graphics/userland/files/0003-wayland-Add-Wayland-example.patch

@@ -4,6 +4,8 @@ Date: Tue, 1 Oct 2013 13:19:20 +0200
 Subject: [PATCH] wayland: Add Wayland example
 
 ---
+Upstream-Status: Pending
+
  .../linux/apps/hello_pi/CMakeLists.txt        |   1 +
  .../linux/apps/hello_pi/Makefile              |   2 +
  .../hello_pi/hello_wayland/CMakeLists.txt     |   8 +

recipes-graphics/userland/files/0004-wayland-egl-Add-bcm_host-to-dependencies.patch

@@ -9,6 +9,8 @@ lets add the dependency on bcm_host module which should do it
 
 Signed-off-by: Khem Raj <[email protected]>
 ---
+Upstream-Status: Pending
+
  interface/khronos/wayland-egl/wayland-egl.pc.in | 1 +
  1 file changed, 1 insertion(+)
 

recipes-graphics/userland/files/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch

@@ -9,6 +9,8 @@ This was removed after a discussion on IRC with the weston guys
 
 Signed-off-by: "Yann E. MORIN" <[email protected]>
 ---
+Upstream-Status: Pending
+
  interface/vmcs_host/vc_vchi_dispmanx.c | 1 -
  1 file changed, 1 deletion(-)
 

recipes-graphics/userland/files/0006-zero-out-wl-buffers-in-egl_surface_free.patch

@@ -7,6 +7,8 @@ origins from buildroot
 
 Signed-off-by: Khem Raj <[email protected]>
 ---
+Upstream-Status: Pending
+
  interface/khronos/egl/egl_client_surface.c | 2 ++
  1 file changed, 2 insertions(+)
 

recipes-graphics/userland/files/0007-initialize-front-back-wayland-buffers.patch

@@ -7,6 +7,8 @@ origins from metrological wayland support
 
 Signed-off-by: Khem Raj <[email protected]>
 ---
+Upstream-Status: Pending
+
  interface/khronos/egl/egl_client_surface.c | 3 +++
  1 file changed, 3 insertions(+)
 

recipes-graphics/userland/files/0008-Remove-RPC_FLUSH.patch

@@ -7,6 +7,8 @@ Origins from buildroot
 
 Signed-off-by: Khem Raj <[email protected]>
 ---
+Upstream-Status: Pending
+
  interface/khronos/ext/gl_oes_egl_image_client.c | 1 -
  1 file changed, 1 deletion(-)
 

recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch

@@ -17,6 +17,8 @@ make[2]: ***
 
 Signed-off-by: Khem Raj <[email protected]>
 ---
+Upstream-Status: Pending
+
  interface/vcos/pthreads/CMakeLists.txt | 8 ++++++++
  interface/vmcs_host/CMakeLists.txt     | 8 --------
  interface/vmcs_host/vc_vchi_dispmanx.h | 2 +-

recipes-graphics/userland/files/0010-Fix-for-framerate-with-nested-composition.patch

@@ -7,6 +7,8 @@ frame rate appears irregular and lower than expected when using nested compositi
 
 Signed-off-by: Khem Raj <[email protected]>
 ---
+Upstream-Status: Pending
+
  interface/khronos/egl/egl_client.c | 8 ++++++++
  1 file changed, 8 insertions(+)
 

recipes-graphics/userland/files/0011-build-shared-library-for-vchostif.patch

@@ -7,6 +7,8 @@ Fixes #149
 
 Signed-off-by: Khem Raj <[email protected]>
 ---
+Upstream-Status: Pending
+
  interface/vmcs_host/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 

recipes-graphics/userland/files/0012-implement-buffer-wrapping-interface-for-dispmanx.patch

@@ -7,6 +7,8 @@ Courtesy: Zan Dobersek
 
 Signed-off-by: Khem Raj <[email protected]>
 ---
+Upstream-Status: Pending
+
  interface/khronos/ext/egl_wayland.c | 42 +++++++++++++++++++++++++++++
  interface/wayland/dispmanx.xml      | 10 +++++++
  2 files changed, 52 insertions(+)

recipes-graphics/userland/files/0013-Implement-triple-buffering-for-wayland.patch

@@ -12,6 +12,8 @@ to two vertical intervals
 Signed-off-by: Jeff Wannamaker <[email protected]>
 Signed-off-by: Khem Raj <[email protected]>
 ---
+Upstream-Status: Pending
+
  interface/khronos/egl/egl_client.c         |  3 ++-
  interface/khronos/egl/egl_client_surface.c |  8 ++++++++
  interface/khronos/egl/egl_client_surface.h | 11 +++++++++++

recipes-graphics/userland/files/0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch

@@ -13,6 +13,8 @@ via embedded composition e.g. westeros
 Signed-off-by: Jeff Wannamaker <[email protected]>
 Signed-off-by: Khem Raj <[email protected]>
 ---
+Upstream-Status: Pending
+
  interface/khronos/common/khrn_client.c |  2 +-
  interface/khronos/common/khrn_client.h | 11 +++++-
  interface/khronos/ext/egl_wayland.c    | 50 ++++++++++++++++++++++----

recipes-graphics/userland/files/0018-Add-EGL_IMG_context_priority-related-defines.patch

@@ -8,6 +8,8 @@ taken from Khronos headers
 
 Signed-off-by: Khem Raj <[email protected]>
 ---
+Upstream-Status: Pending
+
  interface/khronos/include/EGL/eglext.h | 8 ++++++++
  1 file changed, 8 insertions(+)
 

recipes-graphics/userland/files/0019-libfdt-Undefine-__wordsize-if-already-defined.patch

@@ -8,6 +8,8 @@ for multiple versions of glibc even ones which does not have this define
 
 Signed-off-by: Khem Raj <[email protected]>
 ---
+Upstream-Status: Pending
+
  opensrc/helpers/libfdt/libfdt_env.h | 4 ++++
  1 file changed, 4 insertions(+)
 

recipes-graphics/userland/files/0020-openmaxil-add-pkg-config-file.patch

@@ -4,6 +4,8 @@ Date: Wed, 13 Jun 2018 18:22:22 +0000
 Subject: [PATCH] openmaxil: add pkg-config file
 
 ---
+Upstream-Status: Pending
+
  CMakeLists.txt            |  2 +-
  pkgconfig/openmaxil.pc.in | 10 ++++++++++
  2 files changed, 11 insertions(+), 1 deletion(-)

recipes-graphics/userland/files/0024-userland-Sync-needed-defines-for-weston-build.patch

@@ -8,6 +8,8 @@ therefore import needed defines and typedefs from latest mesa
 
 Signed-off-by: Khem Raj <[email protected]>
 ---
+Upstream-Status: Pending
+
  interface/khronos/include/EGL/eglext.h | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 

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

@@ -13,6 +13,8 @@ Link: https://lore.kernel.org/all/[email protected]/
 Cc: [email protected]
 Signed-off-by: Kees Cook <[email protected]>
 ---
+Upstream-Status: Pending
+
  scripts/gcc-plugins/gcc-common.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 

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

@@ -1,9 +1,9 @@
-LINUX_VERSION ?= "6.1.20"
+LINUX_VERSION ?= "6.1.38"
 LINUX_RPI_BRANCH ?= "rpi-6.1.y"
 LINUX_RPI_KMETA_BRANCH ?= "yocto-6.1"
 
-SRCREV_machine = "a1cd5351f431caf7cf472825aff0e1c66bf31de4"
-SRCREV_meta = "1a97a82e62ebf4ef3787768a1f5937e2d2f280ce"
+SRCREV_machine = "31dbf25138831241f31f7eee835b83a607eaa179"
+SRCREV_meta = "2eaed50911009f9ddbc74460093e17b22ef7daa0"
 
 KMETA = "kernel-meta"
 

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

@@ -27,6 +27,8 @@ arrive:
   gst_omx_component_wait_message()
 
 ---
+Upstream-Status: Pending
+
  omx/gstomxvideodec.c | 5 +++++
  1 file changed, 5 insertions(+)
 

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

@@ -3,6 +3,8 @@ From: Khem Raj <[email protected]>
 Date: Sat, 13 Feb 2016 11:42:29 -0800
 
 ---
+Upstream-Status: Pending
+
  omx/gstomxvideodec.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)