similarity index 100%
rename from meta/recipes-core/systemd/systemd-boot-native_262.bb
rename to meta/recipes-core/systemd/systemd-boot-native_262.2.bb
similarity index 100%
rename from meta/recipes-core/systemd/systemd-boot_262.bb
rename to meta/recipes-core/systemd/systemd-boot_262.2.bb
similarity index 100%
rename from meta/recipes-core/systemd/systemd-tools-native_262.bb
rename to meta/recipes-core/systemd/systemd-tools-native_262.2.bb
@@ -13,7 +13,7 @@ LICENSE:libsystemd = "LGPL-2.1-or-later"
LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=c09786363500a9acc29b147e6e72d2c6 \
file://LICENSE.LGPL2.1;md5=be0aaf4a380f73f7e00b420a007368f2"
-SRCREV = "8cc40e0c5e9234bf45084751ac53b1fbfe70b492"
+SRCREV = "63511d7283d7d0e2a2fc28075481afaf1a7be8f5"
SRCBRANCH = "v262-stable"
SRC_URI = "git://github.com/systemd/systemd.git;protocol=https;branch=${SRCBRANCH};tag=v${PV}"
deleted file mode 100644
@@ -1,63 +0,0 @@
-From 492b3f38c3cea1054bffe5f9e203dcf73ee8e981 Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Wed, 21 Oct 2026 05:09:48 +0900
-Subject: [PATCH] journal: prepend the sysroot to libaudit's includedir if
- pkg-config did not
-
-The audit type list generator builds its -I flag from the includedir
-variable of audit.pc. When cross-compiling, that variable is not
-necessarily relocated into the sysroot: with the freedesktop.org
-sysroot rules, pkg-config applies PKG_CONFIG_SYSROOT_DIR only to the
--I/-L flags in Cflags/Libs, and returns variables as is. pkgconf
-follows these rules when PKG_CONFIG_FDO_SYSROOT_RULES is set, which
-OpenEmbedded does in its pkg-config wrapper.
-
-The includedir then yields the unprefixed /usr/include. GCC does not
-apply --sysroot to a plain -I, so the build host's headers get picked
-up, and toolchains built with -Werror=poison-system-directories, as
-OpenEmbedded's is, reject it:
-
- cc1: error: include location "/usr/include" is unsafe for cross-compilation [-Werror=poison-system-directories]
-
-Query pc_sysrootdir, which pkgconf sets from PKG_CONFIG_SYSROOT_DIR,
-and prepend it to includedir unless includedir is already under it
-(pkgconf's default mode already relocates variables). This does not
-single out any particular directory, so a customized includedir is
-handled the same way.
-
-Follow-up for 0d06dbabc364fe58e4bd1b9696f3c5b823620dbc (v262).
-
-Co-authored-by: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>
-
-Upstream-Status: Backport [https://github.com/systemd/systemd/commit/492b3f38c3cea1054bffe5f9e203dcf73ee8e981]
-Signed-off-by: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>
----
- src/journal/meson.build | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/journal/meson.build b/src/journal/meson.build
-index a27b359b61..d6bc742b3d 100644
---- a/src/journal/meson.build
-+++ b/src/journal/meson.build
-@@ -33,9 +33,17 @@ systemd_journald_export_sources += journald_gperf_c
- generate_audit_type_list = files('generate-audit_type-list.sh')
- generate_audit_type_command = [env, 'bash', generate_audit_type_list, cpp]
- if libaudit.found()
-+ # With the freedesktop.org sysroot rules (e.g. PKG_CONFIG_FDO_SYSROOT_RULES=1, as set by
-+ # OpenEmbedded), pkg-config does not prepend the sysroot to variables. Do it ourselves.
-+ libaudit_includedir = libaudit.get_variable('includedir')
-+ libaudit_sysroot = libaudit.get_variable(pkgconfig : 'pc_sysrootdir', default_value : '')
-+ if libaudit_sysroot not in ['', '/'] and not libaudit_includedir.startswith(libaudit_sysroot + '/')
-+ libaudit_includedir = libaudit_sysroot + libaudit_includedir
-+ endif
-+
- generate_audit_type_command += [
- '-include', 'libaudit.h',
-- '-I' + libaudit.get_variable('includedir'),
-+ '-I' + libaudit_includedir,
- ]
- endif
- generate_audit_type_command += system_include_args
-2.43.0
-
@@ -22,27 +22,34 @@ Upstream-Status: Inappropriate [oe specific]
Assisted-by: kiro:claude-opus-4.6
Signed-off-by: Daniel Turull <daniel.turull@ericsson.com>
---
- src/basic/chase.c | 21 +++++++++++++++-
- src/basic/fd-util.c | 61 +++++++++++++++++++++++++++++++++++++++++++--
+ src/basic/chase.c | 21 +++++++++++++--
+ src/basic/fd-util.c | 63 +++++++++++++++++++++++++++++++++++++++++++--
src/basic/fd-util.h | 1 +
- 3 files changed, 80 insertions(+), 3 deletions(-)
+ 3 files changed, 81 insertions(+), 4 deletions(-)
diff --git a/src/basic/chase.c b/src/basic/chase.c
-index 23a523798e..08ef95b3dd 100644
+index ff879aefa5..1d6199d17b 100644
--- a/src/basic/chase.c
+++ b/src/basic/chase.c
-@@ -40,7 +40,9 @@
+@@ -45,7 +45,7 @@
(CHASE_MUST_BE_DIRECTORY|CHASE_MUST_BE_REGULAR|CHASE_MUST_BE_SOCKET)
- static int chase_statx(int fd, struct statx *ret) {
+ static int chase_statx(int fd, ChaseFlags chase_flags, struct statx *ret) {
+- int statx_flags = 0;
++ int statx_flags = 0, r;
+
+ /* Querying fresh attributes of a mount point root on a network file system (e.g. NFS) makes
+ * the kernel revalidate them with the server, which blocks if the server is unreachable.
+@@ -53,7 +53,7 @@ static int chase_statx(int fd, ChaseFlags chase_flags, struct statx *ret) {
+ if (FLAGS_SET(chase_flags, CHASE_NO_SYNC))
+ statx_flags |= AT_STATX_DONT_SYNC;
+
- return xstatx_full(fd,
-+ int r;
-+
+ r = xstatx_full(fd,
/* path= */ NULL,
- /* statx_flags= */ 0,
+ statx_flags,
XSTATX_MNT_ID_BEST,
-@@ -48,6 +50,23 @@ static int chase_statx(int fd, struct statx *ret) {
+@@ -61,6 +61,23 @@ static int chase_statx(int fd, ChaseFlags chase_flags, struct statx *ret) {
/* optional_mask= */ 0,
/* mandatory_attributes= */ 0,
ret);
@@ -50,7 +57,7 @@ index 23a523798e..08ef95b3dd 100644
+ uint64_t mnt_id;
+
+ /* Kernel lacks STATX_MNT_ID; fall back to /proc/self/fdinfo. */
-+ r = xstatx(fd, /* path= */ NULL, /* statx_flags= */ 0,
++ r = xstatx(fd, /* path= */ NULL, statx_flags,
+ STATX_TYPE|STATX_UID|STATX_INO,
+ ret);
+ if (r < 0)
@@ -65,12 +72,24 @@ index 23a523798e..08ef95b3dd 100644
+ return r;
}
- static int chase_openat2(int root_fd, int dir_fd, const char *path, ChaseFlags chase_flags) {
+ static int chase_statx_is_root(const struct statx *stx, const struct statx *root_stx) {
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
-index c6e78c59b6..7f33d900e5 100644
+index 5c07983782..a4dc9f04e6 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
-@@ -1082,6 +1082,38 @@ int path_is_root_at(int dir_fd, const char *path) {
+@@ -12,9 +12,11 @@
+ #include "dirent-util.h"
+ #include "errno-util.h"
+ #include "fd-util.h"
++#include "fileio.h"
+ #include "format-util.h"
+ #include "fs-util.h"
+ #include "log.h"
++#include "parse-util.h"
+ #include "path-util.h"
+ #include "process-util.h"
+ #include "sort-util.h"
+@@ -1107,6 +1109,38 @@ int path_is_root_at(int dir_fd, const char *path) {
return fds_inode_and_mount_same(dir_fd, XAT_FDROOT);
}
@@ -109,7 +128,7 @@ index c6e78c59b6..7f33d900e5 100644
int fds_inode_and_mount_same(int fd1, int fd2) {
struct statx sx1, sx2;
int r;
-@@ -1092,7 +1124,20 @@ int fds_inode_and_mount_same(int fd1, int fd2) {
+@@ -1117,7 +1151,20 @@ int fds_inode_and_mount_same(int fd1, int fd2) {
r = xstatx(fd1, /* path = */ NULL, AT_EMPTY_PATH,
STATX_TYPE|STATX_INO|STATX_MNT_ID,
&sx1);
@@ -131,7 +150,7 @@ index c6e78c59b6..7f33d900e5 100644
return r;
if (fd1 == fd2) /* Shortcut things if fds are the same (only after validating the fd) */
-@@ -1101,7 +1146,19 @@ int fds_inode_and_mount_same(int fd1, int fd2) {
+@@ -1126,7 +1173,19 @@ int fds_inode_and_mount_same(int fd1, int fd2) {
r = xstatx(fd2, /* path = */ NULL, AT_EMPTY_PATH,
STATX_TYPE|STATX_INO|STATX_MNT_ID,
&sx2);
@@ -153,7 +172,7 @@ index c6e78c59b6..7f33d900e5 100644
r = statx_mount_same(&sx1, &sx2);
diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h
-index 86bddb6dac..34370c8943 100644
+index caf948a218..0d7b89e6c2 100644
--- a/src/basic/fd-util.h
+++ b/src/basic/fd-util.h
@@ -188,6 +188,7 @@ static inline int dir_fd_is_root_or_cwd(int dir_fd) {
similarity index 99%
rename from meta/recipes-core/systemd/systemd_262.bb
rename to meta/recipes-core/systemd/systemd_262.2.bb
@@ -37,7 +37,6 @@ SRC_URI += "file://touchscreen.rules \
file://coredumpd-kernel-version.conf \
file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
file://0003-Do-not-create-var-log-README.patch \
- file://0004-journal-prepend-the-sysroot-to-libaudit-s-includedir.patch \
"
PAM_PLUGINS = " \
- Drop 0004-journal-prepend-the-sysroot-to-libaudit-s-includedir.patch [1] - Refresh patches for v262.2 [1] https://github.com/systemd/systemd/commit/546e9270a0 Compare Log: https://github.com/systemd/systemd/compare/v262...v262.2 AI Generated: Uses Klaus EDV (Claude Opus 5.5) Signed-off-by: Tan Siewert <tan.siewert@9elements.com> --- ...-native_262.bb => systemd-boot-native_262.2.bb} | 0 .../{systemd-boot_262.bb => systemd-boot_262.2.bb} | 0 ...native_262.bb => systemd-tools-native_262.2.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...pend-the-sysroot-to-libaudit-s-includedir.patch | 63 ---------------------- ...dle-missing-STATX_MNT_ID-on-older-kernels.patch | 53 ++++++++++++------ .../systemd/{systemd_262.bb => systemd_262.2.bb} | 1 - 7 files changed, 37 insertions(+), 82 deletions(-) --- base-commit: 9518ce9aa2a6cbce678895ef9a95cd27939dae2a change-id: 20261118-systemd-update-e060ef3a8bca Best regards, -- Tan Siewert <tan.siewert@9elements.com>