11 files changed, 54 insertions, 146 deletions

diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst
index a2c2432db1..4762d2637a 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst
@@ -436,8 +436,8 @@ This fetcher supports the following parameters:
    "nobranch" is set to "1", this is a mandatory parameter. The number of
    branch parameters must match the number of name parameters.
 
--  *"rev":* The revision to use for the checkout. The default is
-   "master".
+-  *"rev":* The revision to use for the checkout. If :term:`SRCREV` is also set,
+   this parameter must match its value.
 
 -  *"tag":* Specifies a tag to use for the checkout. To correctly
    resolve tags, BitBake must access the network. For that reason, tags
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index fe33a4f34c..0ad79bd53e 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -2241,9 +2241,9 @@ class CookerParser(object):
                     profiles.append(logfile)
 
             if profiles:
-                pout = "profile-parse.log.processed"
-                bb.utils.process_profilelog(profiles, pout = pout)
-                print("Processed parsing statistics saved to %s" % (pout))
+                fn_out = "profile-parse.log.report"
+                bb.utils.process_profilelog(profiles, fn_out=fn_out)
+                print("Processed parsing statistics saved to %s" % (fn_out))
 
     def final_cleanup(self):
         if self.syncthread:
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index f688f7dd68..c288c826c0 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -1441,29 +1441,43 @@ def profile_function(profile, function, output_fn, process=True):
         prof.dump_stats(output_fn)
         if process:
             process_profilelog(output_fn)
-            serverlog("Raw profiling information saved to %s and processed statistics to %s.processed" % (output_fn, output_fn))
+            serverlog("Raw profiling information saved to %s and processed statistics to %s.report*" % (output_fn, output_fn))
         return ret
     else:
         return function()
 
-def process_profilelog(fn, pout = None):
+def process_profilelog(fn, fn_out = None):
     # Either call with a list of filenames and set pout or a filename and optionally pout.
-    if not pout:
-        pout = fn + '.processed'
+    import pstats
 
-    with open(pout, 'w') as pout:
-        import pstats
+    if not fn_out:
+        fn_out = fn + '.report'
+
+    def pstatopen():
         if isinstance(fn, list):
-            p = pstats.Stats(*fn, stream=pout)
-        else:
-            p = pstats.Stats(fn, stream=pout)
+            return pstats.Stats(*fn, stream=pout)
+        return pstats.Stats(fn, stream=pout)
+
+    with open(fn_out + '.time', 'w') as pout:
+        p = pstatopen()
         p.sort_stats('time')
         p.print_stats()
+
+    with open(fn_out + '.time-callers', 'w') as pout:
+        p = pstatopen()
+        p.sort_stats('time')
         p.print_callers()
+
+    with open(fn_out + '.cumulative', 'w') as pout:
+        p = pstatopen()
         p.sort_stats('cumulative')
         p.print_stats()
 
-        pout.flush()
+    with open(fn_out + '.cumulative-callers', 'w') as pout:
+        p = pstatopen()
+        p.sort_stats('cumulative')
+        p.print_callers()
+
 
 #
 # Was present to work around multiprocessing pool bugs in python < 2.7.3
@@ -2226,6 +2240,15 @@ def path_is_descendant(descendant, ancestor):
 
     return False
 
+# Recomputing the sets in signal.py is expensive (bitbake -pP idle)
+# so try and use _signal directly to avoid it
+valid_signals = signal.valid_signals()
+try:
+    import _signal
+    sigmask = _signal.pthread_sigmask
+except ImportError:
+    sigmask = signal.pthread_sigmask
+
 # If we don't have a timeout of some kind and a process/thread exits badly (for example
 # OOM killed) and held a lock, we'd just hang in the lock futex forever. It is better
 # we exit at some point than hang. 5 minutes with no progress means we're probably deadlocked.
@@ -2235,7 +2258,7 @@ def path_is_descendant(descendant, ancestor):
 @contextmanager
 def lock_timeout(lock):
     try:
-        s = signal.pthread_sigmask(signal.SIG_BLOCK, signal.valid_signals())
+        s = sigmask(signal.SIG_BLOCK, valid_signals)
         held = lock.acquire(timeout=5*60)
         if not held:
             bb.server.process.serverlog("Couldn't get the lock for 5 mins, timed out, exiting.\n%s" % traceback.format_stack())
@@ -2243,17 +2266,17 @@ def lock_timeout(lock):
         yield held
     finally:
         lock.release()
-        signal.pthread_sigmask(signal.SIG_SETMASK, s)
+        sigmask(signal.SIG_SETMASK, s)
 
 # A version of lock_timeout without the check that the lock was locked and a shorter timeout
 @contextmanager
 def lock_timeout_nocheck(lock):
     l = False
     try:
-        s = signal.pthread_sigmask(signal.SIG_BLOCK, signal.valid_signals())
+        s = sigmask(signal.SIG_BLOCK, valid_signals)
         l = lock.acquire(timeout=10)
         yield l
     finally:
         if l:
             lock.release()
-        signal.pthread_sigmask(signal.SIG_SETMASK, s)
+        sigmask(signal.SIG_SETMASK, s)
diff --git a/meta/classes/ccache.bbclass b/meta/classes/ccache.bbclass
index 262db6672c..fc014bf71d 100644
--- a/meta/classes/ccache.bbclass
+++ b/meta/classes/ccache.bbclass
@@ -37,9 +37,6 @@ CCACHE_NATIVE_RECIPES_ALLOWED ?= ""
 # in different builds.
 export CCACHE_BASEDIR ?= "${TMPDIR}"
 
-# Used for sharing cache files after compiler is rebuilt
-export CCACHE_COMPILERCHECK ?= "%compiler% -dumpspecs"
-
 export CCACHE_CONFIGPATH ?= "${COREBASE}/meta/conf/ccache.conf"
 
 export CCACHE_DIR ?= "${CCACHE_TOP_DIR}/${MULTIMACH_TARGET_SYS}/${PN}"
diff --git a/meta/recipes-core/systemd/systemd_257.6.bb b/meta/recipes-core/systemd/systemd_257.6.bb
index 9092d02c51..f1064f07c5 100644
--- a/meta/recipes-core/systemd/systemd_257.6.bb
+++ b/meta/recipes-core/systemd/systemd_257.6.bb
@@ -92,7 +92,6 @@ PACKAGECONFIG ??= " \
     quotacheck \
     randomseed \
     resolved \
-    serial-getty-generator \
     set-time-epoch \
     sysusers \
     timedated \
@@ -125,11 +124,6 @@ TARGET_CC_ARCH:append:libc-musl = " -D__UAPI_DEF_ETHHDR=0 -D_LARGEFILE64_SOURCE"
 # Some of the dependencies are weak-style recommends - if not available at runtime,
 # systemd won't fail but the library-related feature will be skipped with a warning.
 
-# Use the upstream systemd serial-getty@.service and rely on
-# systemd-getty-generator instead of using the OE-core specific
-# systemd-serialgetty.bb - not enabled by default.
-PACKAGECONFIG[serial-getty-generator] = ""
-
 PACKAGECONFIG[acl] = "-Dacl=enabled,-Dacl=disabled,acl"
 PACKAGECONFIG[audit] = "-Daudit=enabled,-Daudit=disabled,audit"
 PACKAGECONFIG[apparmor] = "-Dapparmor=enabled,-Dapparmor=disabled,apparmor"
@@ -290,12 +284,6 @@ do_install() {
         fi
         install -d ${D}/${base_sbindir}
 
-        if ! ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 'true', 'false', d)}; then
-                # Remove the serial-getty generator and instead use explicit services
-                # created by the systemd-serialgetty recipe
-                find ${D} -name \*getty-generator\* -delete
-        fi
-
         # Provide support for initramfs
         [ ! -e ${D}/init ] && ln -s ${nonarch_libdir}/systemd/systemd ${D}/init
         [ ! -e ${D}/${base_sbindir}/udevd ] && ln -s ${nonarch_libdir}/systemd/systemd-udevd ${D}/${base_sbindir}/udevd
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.18.12.bb b/meta/recipes-extended/stress-ng/stress-ng_0.19.02.bb
index 85a0d6a709..dd8d3a8406 100644
--- a/meta/recipes-extended/stress-ng/stress-ng_0.18.12.bb
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.19.02.bb
@@ -5,9 +5,8 @@ HOMEPAGE = "https://github.com/ColinIanKing/stress-ng#readme"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master;tag=V${PV} \
-           "
-SRCREV = "d4eef982dc98fe915aa82303c0a24070d0a51b00"
+SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master;tag=V${PV}"
+SRCREV = "8d5399b282225f758606cd2b522382f65d947a8d"
 
 DEPENDS = "coreutils-native libbsd"
 
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Use-Os-to-compile-hb-subset-plan-layout.cc.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Use-Os-to-compile-hb-subset-plan-layout.cc.patch
deleted file mode 100644
index 38ff58fce5..0000000000
--- a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Use-Os-to-compile-hb-subset-plan-layout.cc.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From a4325b6f6ddbebf3ecaee8f3825a2f03096adb6d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 27 Apr 2025 15:26:09 -0700
-Subject: [PATCH] Use -Os to compile hb-subset-plan-layout.cc
-
-This helps compiling with GCC 15
-
-Reported upstream with GH Issues [1]
-
-[1] https://github.com/harfbuzz/harfbuzz/issues/5306
-
-Upstream-Status: Inappropriate [GCC-15 workaround]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/meson.build | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index cbe5d9e..d7fc764 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -398,7 +398,6 @@ hb_subset_sources = files(
-   'hb-subset-instancer-solver.hh',
-   'hb-subset-instancer-solver.cc',
-   'hb-subset-plan.cc',
--  'hb-subset-plan-layout.cc',
-   'hb-subset-plan-var.cc',
-   'hb-subset-plan.hh',
-   'hb-subset-plan-member-list.hh',
-@@ -415,6 +414,10 @@ hb_subset_sources = files(
-   'hb-subset.hh',
- )
- 
-+hb_subset_sources_os = files(
-+  'hb-subset-plan-layout.cc',
-+)
-+
- hb_subset_headers = files(
-   'hb-subset.h',
-   'hb-subset-serialize.h'
-@@ -629,6 +632,12 @@ endif
- 
- darwin_versions = [hb_version_int, '@0@.0.0'.format(hb_version_int)]
- 
-+special_subset_layout_lib = static_library('special_subset_layout',
-+  'hb-subset-plan-layout.cc',
-+  include_directories: incconfig,
-+  cpp_args: cpp_args + extra_hb_cpp_args + ['-Os'], # <== compile this one with -Os
-+)
-+
- libharfbuzz = library('harfbuzz', hb_sources,
-   include_directories: incconfig,
-   dependencies: harfbuzz_deps,
-@@ -656,7 +665,7 @@ defs_list += [harfbuzz_subset_def]
- libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources,
-   include_directories: incconfig,
-   dependencies: [m_dep],
--  link_with: [libharfbuzz],
-+  link_with: [libharfbuzz] + [special_subset_layout_lib],
-   cpp_args: cpp_args + extra_hb_cpp_args,
-   soversion: hb_so_version,
-   version: version,
-@@ -668,7 +677,7 @@ libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources,
- custom_target('harfbuzz-subset.cc',
-   build_by_default: true,
-   output: 'harfbuzz-subset.cc',
--  input: hb_base_sources + hb_subset_sources,
-+  input: hb_base_sources + hb_subset_sources + hb_subset_sources_os,
-   command: [find_program('gen-harfbuzzcc.py'),
-             '@OUTPUT@', meson.current_source_dir(), '@INPUT@'],
- )
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_11.2.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_11.2.1.bb
index 71eada7f28..2c8a1363d0 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_11.2.1.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_11.2.1.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b98429b8e8e3c2a67cfef01e99e4893d \
                     "
 
 SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz"
-SRC_URI += "file://0001-Use-Os-to-compile-hb-subset-plan-layout.cc.patch"
 SRC_URI[sha256sum] = "093714c8548a285094685f0bdc999e202d666b59eeb3df2ff921ab68b8336a49"
 
 DEPENDS += "glib-2.0-native"
@@ -21,6 +20,11 @@ GIR_MESON_DISABLE_FLAG = 'disabled'
 GTKDOC_MESON_ENABLE_FLAG = 'enabled'
 GTKDOC_MESON_DISABLE_FLAG = 'disabled'
 
+# As per upstream CONFIG.md, it is recommended to always build with -Os.
+FULL_OPTIMIZATION = "-Os ${DEBUG_LEVELFLAG}"
+
+EXTRA_OEMESON = "-Dtests=disabled"
+
 PACKAGECONFIG ??= "cairo freetype glib icu"
 PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo"
 PACKAGECONFIG[chafa] = "-Dchafa=enabled,-Dchafa=disabled,chafa"
diff --git a/meta/recipes-multimedia/gstreamer/gst-examples_1.26.3.bb b/meta/recipes-multimedia/gstreamer/gst-examples_1.26.3.bb
index 8835b7d97b..df8fd4bd26 100644
--- a/meta/recipes-multimedia/gstreamer/gst-examples_1.26.3.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-examples_1.26.3.bb
@@ -18,6 +18,9 @@ S = "${UNPACKDIR}/${BP}/subprojects/gst-examples"
 
 inherit meson pkgconfig features_check
 
+# gtk-play has runtime errors otherwise
+TARGET_LDFLAGS += "-rdynamic"
+
 UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
diff --git a/meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch b/meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch
deleted file mode 100644
index ae48524e0d..0000000000
--- a/meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8ca35649c33d0d2fcdcd573ce6a9edd91c77e4da Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Tue, 7 Jan 2025 18:56:19 +0100
-Subject: [PATCH] src/libgit2/CMakeLists.txt: install cmake files into
- configured libdir
-
-libdir can be something else than /usr/lib, e.g. /usr/lib64 or similar.
-
-Upstream-Status: Submitted [https://github.com/libgit2/libgit2/pull/7004]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- src/libgit2/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt
-index a7d3c7ca4..16b3a23d9 100644
---- a/src/libgit2/CMakeLists.txt
-+++ b/src/libgit2/CMakeLists.txt
-@@ -119,11 +119,11 @@ configure_file(config.cmake.in
- install(FILES
-        "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake"
-        "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake"
--       DESTINATION "lib/cmake/${PROJECT_NAME}")
-+       DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
- install(
-        EXPORT ${LIBGIT2_TARGETS_EXPORT_NAME}
-        NAMESPACE "${PROJECT_NAME}::"
--       DESTINATION "lib/cmake/${PROJECT_NAME}")
-+       DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
- 
- # Install
- 
diff --git a/meta/recipes-support/libgit2/libgit2_1.9.0.bb b/meta/recipes-support/libgit2/libgit2_1.9.1.bb
index 66ec62f17a..43957a2087 100644
--- a/meta/recipes-support/libgit2/libgit2_1.9.0.bb
+++ b/meta/recipes-support/libgit2/libgit2_1.9.1.bb
@@ -5,10 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8eacfdc17c8f4d219e131a073973b97d"
 
 DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2"
 
-SRC_URI = "git://github.com/libgit2/libgit2.git;branch=main;protocol=https \
-           file://0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch \
-           "
-SRCREV = "338e6fb681369ff0537719095e22ce9dc602dbf0"
+SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.9;protocol=https;tag=v${PV}"
+SRCREV = "0060d9cf5666f015b1067129bd874c6cc4c9c7ac"
 
 inherit cmake