Merge branch 'master' into feature/6.18-stable

embetrix · web-flow · commit 39dcf4fbfa11 · 2026-06-08T10:20:53.000+02:00
diff --git a/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh b/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh
@@ -24,9 +24,9 @@ TEMP_DIR="$(mktemp -d)"
 cd "$TEMP_DIR"
 
 REPOS=" \
-    git://git.openembedded.org/openembedded-core \
-    git://git.openembedded.org/bitbake \
-    git://git.yoctoproject.org/meta-yocto \
+    https://git.openembedded.org/openembedded-core \
+    https://git.openembedded.org/bitbake \
+    https://git.yoctoproject.org/meta-yocto \
 "
 for repo in $REPOS; do
     log "Cloning $repo on branch $BASE_REF..."
@@ -44,12 +44,6 @@ printf "\n# ------ ci ------\n" >> conf/local.conf
 cat <<EOCONF >>conf/local.conf
 BB_NUMBER_THREADS = "6"
 PARALLEL_MAKE = "-j 6"
-# 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"
 LICENSE_FLAGS_ACCEPTED = "synaptics-killswitch"
 EOCONF
 
diff --git a/.github/workflows/docker-images/yocto-builder/entrypoint-yocto-check-layer.sh b/.github/workflows/docker-images/yocto-builder/entrypoint-yocto-check-layer.sh
@@ -20,8 +20,8 @@ TEMP_DIR="$(mktemp -d)"
 cd "$TEMP_DIR"
 
 REPOS=" \
-    git://git.openembedded.org/openembedded-core \
-    git://git.openembedded.org/bitbake \
+    https://git.openembedded.org/openembedded-core \
+    https://git.openembedded.org/bitbake \
 "
 for repo in $REPOS; do
     log "Cloning $repo on branch $BASE_REF..."
diff --git a/conf/layer.conf b/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "raspberrypi"
 BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/"
 BBFILE_PRIORITY_raspberrypi = "9"
 
-LAYERSERIES_COMPAT_raspberrypi = "whinlatter"
+LAYERSERIES_COMPAT_raspberrypi = "wrynose"
 LAYERDEPENDS_raspberrypi = "core"
 
 # Additional license directories.
diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
@@ -126,10 +126,10 @@ KERNEL_IMAGETYPE_DIRECT ??= "zImage"
 KERNEL_IMAGETYPE ?= "${@bb.utils.contains('RPI_USE_U_BOOT', '1', \
         '${KERNEL_IMAGETYPE_UBOOT}', '${KERNEL_IMAGETYPE_DIRECT}', d)}"
 
-MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio ${@bb.utils.contains('DISABLE_VC4GRAPHICS', '1', '', 'vc4graphics', d)}"
+MACHINE_FEATURES_DEFAULTS:append = " apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio ${@bb.utils.contains('DISABLE_VC4GRAPHICS', '1', '', 'vc4graphics', d)}"
 
 # Raspberry Pi has no hardware clock
-MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
+MACHINE_FEATURES_OPTED_OUT:append = " rtc"
 
 MACHINE_EXTRA_RRECOMMENDS += "kernel-modules udev-rules-rpi"
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "${@oe.utils.conditional('ENABLE_I2C', '1', 'kernel-module-i2c-dev kernel-module-i2c-bcm2708', '', d)}"
diff --git a/docs/extra-build-config.md b/docs/extra-build-config.md
@@ -186,12 +186,6 @@ It means that, for those boards, `RPI_USE_U_BOOT = "1"` is not compatible with
 
 To build an initramfs image:
 
-* Set this 3 kernel variables (in kernel's do_configure:prepend in linux-raspberrypi.inc after the line kernel_configure_variable LOCALVERSION "\"\""
-)
-  - kernel_configure_variable BLK_DEV_INITRD y
-  - kernel_configure_variable INITRAMFS_SOURCE ""
-  - kernel_configure_variable RD_GZIP y
-
 * Set the yocto variables (e.g. in local.conf)
   - `INITRAMFS_IMAGE = "<name for your initramfs image>"`
   - `INITRAMFS_IMAGE_BUNDLE = "1"`
diff --git a/files/wic/sdimage-raspberrypi.wks b/files/wic/sdimage-raspberrypi.wks
diff --git a/recipes-graphics/wayland/weston/0001-Adapt-weston-to-64-bit-plane-IDs.patch b/recipes-graphics/wayland/weston/0001-Adapt-weston-to-64-bit-plane-IDs.patch
diff --git a/recipes-graphics/wayland/weston_%.bbappend b/recipes-graphics/wayland/weston_%.bbappend
@@ -1,4 +1 @@
 PACKAGECONFIG:remove:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'egl clients', d)}"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/weston:"
-SRC_URI:append:rpi = " file://0001-Adapt-weston-to-64-bit-plane-IDs.patch"
diff --git a/recipes-kernel/linux/linux-raspberrypi-dev.bb b/recipes-kernel/linux/linux-raspberrypi-dev.bb
@@ -21,7 +21,7 @@ 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} \
+    git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA};protocol=https \
     file://powersave.cfg \
     file://android-drivers.cfg \
     "
diff --git a/recipes-kernel/linux/linux-raspberrypi-v7_6.18.bb b/recipes-kernel/linux/linux-raspberrypi-v7_6.18.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.18.bb
diff --git a/recipes-kernel/linux/linux-raspberrypi_6.1.bb b/recipes-kernel/linux/linux-raspberrypi_6.1.bb
@@ -9,7 +9,7 @@ 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} \
+    git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA};protocol=https \
     file://powersave.cfg \
     file://android-drivers.cfg \
     "
diff --git a/recipes-kernel/linux/linux-raspberrypi_6.12.bb b/recipes-kernel/linux/linux-raspberrypi_6.12.bb
@@ -1,15 +1,15 @@
-LINUX_VERSION ?= "6.12.58"
+LINUX_VERSION ?= "6.12.87"
 LINUX_RPI_BRANCH ?= "rpi-6.12.y"
 LINUX_RPI_KMETA_BRANCH ?= "yocto-6.12"
 
-SRCREV_machine = "cf8f90deed1491b7ed365944b2a10799595373a6"
-SRCREV_meta = "6a551cd6cf63d4199bc51ef778692f23730dbcca"
+SRCREV_machine = "ae4d75fb36deba0fe1a986d9bfae65755e082dd0"
+SRCREV_meta = "921317ea8b9096f403af3f5a4ec32bc7cf62b0dd"
 
 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} \
+    git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA};protocol=https \
     file://powersave.cfg \
     file://android-drivers.cfg \
     "
diff --git a/recipes-kernel/linux/linux-raspberrypi_6.18.bb b/recipes-kernel/linux/linux-raspberrypi_6.18.bb
@@ -0,0 +1,31 @@
+LINUX_VERSION ?= "6.18.33"
+LINUX_RPI_BRANCH ?= "rpi-6.18.y"
+LINUX_RPI_KMETA_BRANCH ?= "yocto-6.18"
+
+SRCREV_machine = "95b85bebbedcaedfa7ca79116ed38b7376fba412"
+SRCREV_meta = "6d012fbc35201ba081efcc19c9519c1dc7b64c43"
+
+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}"
diff --git a/recipes-kernel/linux/linux-raspberrypi_6.6.bb b/recipes-kernel/linux/linux-raspberrypi_6.6.bb
@@ -9,7 +9,7 @@ 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} \
+    git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA};protocol=https \
     file://powersave.cfg \
     file://android-drivers.cfg \
     "
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -1,2 +1,2 @@
-PACKAGECONFIG:append:rpi = " hls \
+PACKAGECONFIG:append:rpi = " hls v4l2codecs \
                    ${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'faad', '', d)}"
diff --git a/recipes-multimedia/rpidistro-ffmpeg/files/2001-configure-setup-for-OE-core-usage.patch b/recipes-multimedia/rpidistro-ffmpeg/files/2001-configure-setup-for-OE-core-usage.patch
@@ -1,4 +1,4 @@
-From 702742f9575c87ac8c496d76daf51af7d4aaebd7 Mon Sep 17 00:00:00 2001
+From 465e6fd630f406f662b344f4092ceeb402b26bcb Mon Sep 17 00:00:00 2001
 From: Vincent Davis Jr <vince@underview.tech>
 Date: Sun, 9 Jun 2024 18:09:25 -0400
 Subject: [PATCH] configure: setup for OE-core usage
@@ -25,10 +25,10 @@ Signed-off-by: Vincent Davis Jr <vince@underview.tech>
  1 file changed, 9 insertions(+), 5 deletions(-)
 
 diff --git a/configure b/configure
-index 7214c221..7a541e63 100755
+index e4b48ee1..664b31fb 100755
 --- a/configure
 +++ b/configure
-@@ -5898,6 +5898,9 @@ enable_weak_pic() {
+@@ -6178,6 +6178,9 @@ enable_weak_pic() {
  }
  
  enabled pic && enable_weak_pic
@@ -38,7 +38,7 @@ index 7214c221..7a541e63 100755
  
  test_cc <<EOF || die "Symbol mangling check failed."
  int ff_extern;
-@@ -6716,8 +6719,8 @@ enabled mbedtls           && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt
+@@ -7117,8 +7120,8 @@ enabled mbedtls           && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt
  enabled mediacodec        && { enabled jni || die "ERROR: mediacodec requires --enable-jni"; }
  enabled mmal              && { check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host ||
                                 { ! enabled cross_compile &&
@@ -49,11 +49,11 @@ index 7214c221..7a541e63 100755
                                   check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host; } ||
                                 die "ERROR: mmal not found" &&
                                 check_func_headers interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"; }
-@@ -6737,12 +6740,13 @@ enabled opengl            && { check_lib opengl GL/glx.h glXGetProcAddress "-lGL
+@@ -7139,12 +7142,13 @@ enabled opengl            && { check_lib opengl GL/glx.h glXGetProcAddress "-lGL
                                 check_lib opengl windows.h wglGetProcAddress "-lopengl32 -lgdi32" ||
-                                check_lib opengl OpenGL/gl3.h glGetError "-Wl,-framework,OpenGL" ||
-                                check_lib opengl ES2/gl.h glGetError "-isysroot=${sysroot} -Wl,-framework,OpenGLES" ||
-+			       check_lib opengl GLES2/gl2.h glGetError "-lGLESv2" ||
+                                check_lib opengl OpenGL/gl3.h glGetError "-framework OpenGL" ||
+                                check_lib opengl ES2/gl.h glGetError "-isysroot=${sysroot} -framework OpenGLES" ||
++                              check_lib opengl GLES2/gl2.h glGetError "-lGLESv2" ||
                                 die "ERROR: opengl not found."
                               }
  enabled omx_rpi           && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoRequestIFrame ||
@@ -65,7 +65,7 @@ index 7214c221..7a541e63 100755
                                 die "ERROR: OpenMAX IL headers from raspberrypi/firmware not found"; } &&
                               enable omx
  enabled omx               && require_headers OMX_Core.h
-@@ -6788,7 +6792,7 @@ fi
+@@ -7190,7 +7194,7 @@ fi
  
  if enabled sdl2; then
      SDL2_CONFIG="${cross_prefix}sdl2-config"
@@ -74,6 +74,3 @@ index 7214c221..7a541e63 100755
      if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
          sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
          sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
--- 
-2.34.1
-
diff --git a/recipes-multimedia/rpidistro-ffmpeg/files/2004-libavcodec-omx-replace-opt-vc-path-with-usr-lib.patch b/recipes-multimedia/rpidistro-ffmpeg/files/2004-libavcodec-omx-replace-opt-vc-path-with-usr-lib.patch
@@ -1,4 +1,4 @@
-From 0dfb56e12fa709794525cda1471091f6699905d5 Mon Sep 17 00:00:00 2001
+From 53f736cdb4d85633286287594675e5f3c7fa8df9 Mon Sep 17 00:00:00 2001
 From: Vincent Davis Jr <vince@underview.tech>
 Date: Thu, 8 Dec 2022 10:49:03 -0600
 Subject: [PATCH] libavcodec: omx replace /opt/vc path with /usr/lib
@@ -18,10 +18,10 @@ Signed-off-by: Vincent Davis Jr <vince@underview.tech>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libavcodec/omx.c b/libavcodec/omx.c
-index 0a6a3083..8c6e9193 100644
+index 2c386550..f0e75216 100644
 --- a/libavcodec/omx.c
 +++ b/libavcodec/omx.c
-@@ -141,7 +141,7 @@ static av_cold OMXContext *omx_init(void *logctx, const char *libname, const cha
+@@ -143,7 +143,7 @@ static av_cold OMXContext *omx_init(void *logctx, const char *libname, const cha
  {
      static const char * const libnames[] = {
  #if CONFIG_OMX_RPI
@@ -30,6 +30,3 @@ index 0a6a3083..8c6e9193 100644
  #else
          "libOMX_Core.so", NULL,
          "libOmxCore.so", NULL,
--- 
-2.38.1
-
diff --git a/recipes-multimedia/rpidistro-ffmpeg/files/2024-fix-compile-newer-binutils.patch b/recipes-multimedia/rpidistro-ffmpeg/files/2024-fix-compile-newer-binutils.patch
diff --git a/recipes-multimedia/rpidistro-ffmpeg/files/ffmpeg-7.1.2-rpi_28.patch b/recipes-multimedia/rpidistro-ffmpeg/files/ffmpeg-7.1.2-rpi_28.patch
diff --git a/recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_7.1.13.bb b/recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_7.1.13.bb

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ KMETA = "kernel-meta"`
`21`	`21`
`22`	`22`	`SRC_URI = " \`
`23`	`23`	`git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH};protocol=https \`
`24`		`- git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA} \`
	`24`	`+ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA};protocol=https \`
`25`	`25`	`file://powersave.cfg \`
`26`	`26`	`file://android-drivers.cfg \`
`27`	`27`	`"`