6 files changed, 9 insertions, 75 deletions

diff --git a/meta/classes/ccache.bbclass b/meta/classes/ccache.bbclass
index fc014bf71d..262db6672c 100644
--- a/meta/classes/ccache.bbclass
+++ b/meta/classes/ccache.bbclass
@@ -37,6 +37,9 @@ 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/classes/toolchain/clang.bbclass b/meta/classes/toolchain/clang.bbclass
index d729182d2a..7c6ed57fb3 100644
--- a/meta/classes/toolchain/clang.bbclass
+++ b/meta/classes/toolchain/clang.bbclass
@@ -33,9 +33,5 @@ TUNE_CCARGS += "${@bb.utils.contains("DISTRO_FEATURES", "usrmerge", " --dyld-pre
 
 LDFLAGS:append:class-nativesdk:x86-64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-x86-64.so.2"
 LDFLAGS:append:class-nativesdk:aarch64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-aarch64.so.1"
-LDFLAGS:append:class-nativesdk = " -Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.."
-
-# do_populate_sysroot needs STRIP
-POPULATESYSROOTDEPS:append:class-target = " ${MLPREFIX}clang-cross-${TARGET_ARCH}:do_populate_sysroot"
 
 TCOVERRIDE = "toolchain-clang"
diff --git a/meta/recipes-core/dbus/dbus_1.16.2.bb b/meta/recipes-core/dbus/dbus_1.16.2.bb
index aabc4c3efb..65f7028b4f 100644
--- a/meta/recipes-core/dbus/dbus_1.16.2.bb
+++ b/meta/recipes-core/dbus/dbus_1.16.2.bb
@@ -28,7 +28,7 @@ EXTRA_OEMESON = "-Dxml_docs=disabled \
                 "
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \
-                   traditional-activation user-session \
+                   user-session \
                   ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
                   "
 PACKAGECONFIG:class-native = ""
@@ -36,7 +36,6 @@ PACKAGECONFIG:class-nativesdk = ""
 
 PACKAGECONFIG[systemd] = "-Dsystemd=enabled -Dsystemd_system_unitdir=${systemd_system_unitdir},-Dsystemd=disabled,systemd"
 PACKAGECONFIG[x11] = "-Dx11_autolaunch=enabled,-Dx11_autolaunch=disabled, virtual/libx11 libsm"
-PACKAGECONFIG[traditional-activation] = "-Dtraditional_activation=true,-Dtraditional_activation=false"
 PACKAGECONFIG[user-session] = "-Duser_session=true -Dsystemd_user_unitdir=${systemd_user_unitdir},-Duser_session=false"
 PACKAGECONFIG[verbose-mode] = "-Dverbose_mode=true,-Dverbose_mode=false,,"
 PACKAGECONFIG[audit] = "-Dlibaudit=enabled,-Dlibaudit=disabled,audit"
@@ -153,11 +152,8 @@ do_install:append:class-target() {
 
         chown messagebus:messagebus ${D}${localstatedir}/lib/dbus
 
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'traditional-activation', '1', '0', d)}" = "1" ]
-        then
-                chown root:messagebus ${D}${libexecdir}/dbus-daemon-launch-helper
-                chmod 4755 ${D}${libexecdir}/dbus-daemon-launch-helper
-        fi
+        chown root:messagebus ${D}${libexecdir}/dbus-daemon-launch-helper
+        chmod 4755 ${D}${libexecdir}/dbus-daemon-launch-helper
 
         # Remove Red Hat initscript
         rm -rf ${D}${sysconfdir}/rc.d
diff --git a/meta/recipes-core/systemd/systemd/0001-meson-Add-libmount-feature.patch b/meta/recipes-core/systemd/systemd/0001-meson-Add-libmount-feature.patch
deleted file mode 100644
index b593e5cc7d..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-meson-Add-libmount-feature.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 821c809e1e1e449f5a2fe591d6aae1343b141b6c Mon Sep 17 00:00:00 2001
-From: Daan De Meyer <daan.j.demeyer@gmail.com>
-Date: Thu, 5 Jun 2025 11:05:08 +0200
-Subject: [PATCH 1/2] meson: Add libmount feature
-
-Let's reduce the dependencies required to build just libsystemd by
-making libmount optional. The meson disabler feature makes this quite
-trivial.
-
-Upstream-Status: Backport [d1ee3889cf8e8a9edc82e41d306155fb4c531c8f]
-Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
----
- meson.build       | 4 +++-
- meson_options.txt | 2 ++
- tools/oss-fuzz.sh | 2 +-
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 957e00ecad..594fadbb37 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1179,7 +1179,9 @@ else
- endif
- 
- libmount = dependency('mount',
--                      version : fuzzer_build ? '>= 0' : '>= 2.30')
-+                      version : fuzzer_build ? '>= 0' : '>= 2.30',
-+                      disabler : true,
-+                      required : get_option('libmount'))
- 
- libfdisk = dependency('fdisk',
-                       version : '>= 2.32',
-diff --git a/meson_options.txt b/meson_options.txt
-index f30b3f5238..f292732d62 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -471,6 +471,8 @@ option('dbus', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'd
-        description : 'libdbus support (for tests only)')
- option('libarchive', type : 'feature',
-        description : 'libarchive support')
-+option('libmount', type : 'feature',
-+       description : 'libmount support')
- 
- option('bootloader', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
-        description : 'sd-boot/stub and userspace tools')
-diff --git a/tools/oss-fuzz.sh b/tools/oss-fuzz.sh
-index df3d39eba6..b7a70207df 100755
---- a/tools/oss-fuzz.sh
-+++ b/tools/oss-fuzz.sh
-@@ -32,7 +32,7 @@ meson_args=("-Db_lundef=false")
- if [ -z "$FUZZING_ENGINE" ]; then
-     meson_args+=("-Dllvm-fuzz=true")
- else
--    meson_args+=("-Doss-fuzz=true" "--auto-features=disabled")
-+    meson_args+=("-Doss-fuzz=true" "--auto-features=disabled" "-Dlibmount=enabled")
- 
-     apt-get update
-     apt-get install -y gperf m4 gettext python3-pip \
diff --git a/meta/recipes-core/systemd/systemd_257.6.bb b/meta/recipes-core/systemd/systemd_257.6.bb
index 85165b7c25..3229583683 100644
--- a/meta/recipes-core/systemd/systemd_257.6.bb
+++ b/meta/recipes-core/systemd/systemd_257.6.bb
@@ -4,7 +4,7 @@ PROVIDES = "udev"
 
 PE = "1"
 
-DEPENDS = "gperf-native libcap python3-jinja2-native"
+DEPENDS = "gperf-native libcap util-linux python3-jinja2-native"
 
 SECTION = "base/shell"
 
@@ -29,7 +29,6 @@ SRC_URI += " \
            file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
            file://0002-implment-systemd-sysv-install-for-OE.patch \
            file://0001-Do-not-create-var-log-README.patch \
-           file://0001-meson-Add-libmount-feature.patch \
            "
 
 # patches needed by musl
@@ -83,7 +82,6 @@ PACKAGECONFIG ??= " \
     idn \
     ima \
     kmod \
-    libmount \
     localed \
     logind \
     machined \
@@ -171,7 +169,6 @@ PACKAGECONFIG[kmod] = "-Dkmod=enabled,-Dkmod=disabled,kmod,libkmod"
 PACKAGECONFIG[ldconfig] = "-Dldconfig=true,-Dldconfig=false,,ldconfig"
 PACKAGECONFIG[libidn] = "-Dlibidn=enabled,-Dlibidn=disabled,libidn,,libidn"
 PACKAGECONFIG[libidn2] = "-Dlibidn2=enabled,-Dlibidn2=disabled,libidn2,,libidn2"
-PACKAGECONFIG[libmount] = "-Dlibmount=enabled,-Dlibmount=disabled,util-linux,util-linux-mount util-linux-umount"
 # Link udev shared with systemd helper library.
 # If enabled the udev package depends on the systemd package (which has the needed shared library).
 PACKAGECONFIG[link-udev-shared] = "-Dlink-udev-shared=true,-Dlink-udev-shared=false"
@@ -736,7 +733,7 @@ FILES:${PN} = " ${base_bindir}/* \
 
 FILES:${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd"
 
-RDEPENDS:${PN} += "kmod ${VIRTUAL-RUNTIME_dbus} udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck util-linux-swaponoff util-linux-mkswap"
+RDEPENDS:${PN} += "kmod ${VIRTUAL-RUNTIME_dbus} util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck util-linux-swaponoff util-linux-mkswap"
 RDEPENDS:${PN} += "systemd-serialgetty"
 RDEPENDS:${PN} += "volatile-binds"
 
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.16.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.18.bb
index 38c81f2372..14c45be432 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.16.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.18.bb
@@ -3,7 +3,7 @@ require xserver-xorg.inc
 SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
            file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
            "
-SRC_URI[sha256sum] = "b14a116d2d805debc5b5b2aac505a279e69b217dae2fae2dfcb62400471a9970"
+SRC_URI[sha256sum] = "c878d1930d87725d4a5bf498c24f4be8130d5b2646a9fd0f2994deff90116352"
 
 # These extensions are now integrated into the server, so declare the migration
 # path for in-place upgrades.