diff --git a/meta/recipes-core/systemd/systemd-boot-native_261.1.bb b/meta/recipes-core/systemd/systemd-boot-native_261.2.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot-native_261.1.bb rename to meta/recipes-core/systemd/systemd-boot-native_261.2.bb diff --git a/meta/recipes-core/systemd/systemd-boot_261.1.bb b/meta/recipes-core/systemd/systemd-boot_261.2.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_261.1.bb rename to meta/recipes-core/systemd/systemd-boot_261.2.bb diff --git a/meta/recipes-core/systemd/systemd-tools-native_261.1.bb b/meta/recipes-core/systemd/systemd-tools-native_261.2.bb similarity index 95% rename from meta/recipes-core/systemd/systemd-tools-native_261.1.bb rename to meta/recipes-core/systemd/systemd-tools-native_261.2.bb index d13d2f2cad..bffaf5a2f0 100644 --- a/meta/recipes-core/systemd/systemd-tools-native_261.1.bb +++ b/meta/recipes-core/systemd/systemd-tools-native_261.2.bb @@ -4,8 +4,6 @@ require systemd.inc SUMMARY = "native tools from systemd" -SRC_URI += "file://0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch" - # TODO: Remove STATX_MNT_ID patch once minimum supported build host kernel is >= 5.8 (RHEL 8 EOL: 2029) SRC_URI += "file://Handle-missing-STATX_MNT_ID-on-older-kernels.patch" diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 0348f9f08d..70c5ac758d 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -15,7 +15,7 @@ LICENSE:libsystemd = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=c09786363500a9acc29b147e6e72d2c6 \ file://LICENSE.LGPL2.1;md5=be0aaf4a380f73f7e00b420a007368f2" -SRCREV = "eff9446d505d62c075bed37d606860b38cfe51fb" +SRCREV = "4925d9f07fc697efccd98a93046ff535b8832445" SRCBRANCH = "v261-stable" SRC_URI = "git://github.com/systemd/systemd.git;protocol=https;branch=${SRCBRANCH};tag=v${PV}" diff --git a/meta/recipes-core/systemd/systemd/0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch b/meta/recipes-core/systemd/systemd/0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch deleted file mode 100644 index f11199c553..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0031715c560e8138cc320f017a0a2c7160b1f7fe Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Fri, 17 Jul 2026 17:25:31 +0100 -Subject: [PATCH] hwdb: strip the root from filenames when generating hwdb.bin - -The modern hwdb.bin format contains the filenames of the input data that -makes up the database. This is useful but in offline builds where ---root is used, the filenames are the full build paths including the -specified root. This introduces build paths and thus information -leakage and non-reproducible data. - -Solve this by stripping the root prefix off the original path when -passing to import_file. - -Upstream-Status: Backport [https://github.com/systemd/systemd/pull/43062] -Signed-off-by: Ross Burton ---- - src/shared/hwdb-util.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/shared/hwdb-util.c b/src/shared/hwdb-util.c -index b42681a289..5386b4e9f4 100644 ---- a/src/shared/hwdb-util.c -+++ b/src/shared/hwdb-util.c -@@ -632,9 +632,11 @@ int hwdb_update(const char *root, const char *hwdb_bin_dir, bool strict, bool co - - FOREACH_ARRAY(i, files, n_files) { - ConfFile *c = *i; -+ char *path_in_root; - - log_debug("Reading file \"%s\" -> \"%s\"", c->original_path, c->resolved_path); -- RET_GATHER(ret, import_file(trie, c->fd, c->original_path, file_priority++, compat)); -+ path_in_root = path_startswith_full(c->original_path, empty_to_root(root), PATH_STARTSWITH_RETURN_LEADING_SLASH); -+ RET_GATHER(ret, import_file(trie, c->fd, path_in_root, file_priority++, compat)); - } - - strbuf_complete(trie->strings); --- -2.43.0 - diff --git a/meta/recipes-core/systemd/systemd/0005-boot-downgrade-EFI_MEMORY_ATTRIBUTE_PROTOCOL-warning.patch b/meta/recipes-core/systemd/systemd/0005-boot-downgrade-EFI_MEMORY_ATTRIBUTE_PROTOCOL-warning.patch deleted file mode 100644 index 7db73571cd..0000000000 --- a/meta/recipes-core/systemd/systemd/0005-boot-downgrade-EFI_MEMORY_ATTRIBUTE_PROTOCOL-warning.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 829c2f0e3dffe8b4484e730a3f3058b61e2133ad Mon Sep 17 00:00:00 2001 -From: Aswin Murugan -Date: Tue, 14 Jul 2026 11:37:14 +0530 -Subject: [PATCH] boot: downgrade EFI_MEMORY_ATTRIBUTE_PROTOCOL warning - -U-Boot currently does not implement EFI_MEMORY_ATTRIBUTE_PROTOCOL -even when reporting EFI version >= 2.10. Consequently, systemd-boot -emits a warning on every boot when running on U-Boot firmware. - -The absence of EFI_MEMORY_ATTRIBUTE_PROTOCOL is a current -U-Boot limitation and not a condition users can remedy. -Furthermore, the EFI specification does not require all -firmware advertising EFI 2.10 or newer to implement the -protocol. As a result, the warning provides little value on -U-Boot systems while causing log_wait() to impose a 2.5-second -boot delay. - -Downgrade the message to LOG_DEBUG, this keeps the diagnostic -available for debugging purposes without penalizing normal -boot time. - -Upstream-Status: Backport [ https://github.com/systemd/systemd/pull/43017 ] - -Signed-off-by: Aswin Murugan ---- - src/boot/linux.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/boot/linux.c b/src/boot/linux.c -index 67ed859993..09fb63419d 100644 ---- a/src/boot/linux.c -+++ b/src/boot/linux.c -@@ -267,10 +267,7 @@ EFI_STATUS linux_exec( - * if required for NX_COMPAT */ - err = BS->LocateProtocol(MAKE_GUID_PTR(EFI_MEMORY_ATTRIBUTE_PROTOCOL), /* Registration= */ NULL, (void **) &memory_proto); - if (err != EFI_SUCCESS) -- /* Only warn if the UEFI should have support in the first place (version >= 2.10) */ -- log_full(err, -- ST->Hdr.Revision >= ((2U << 16) | 100U) ? LOG_WARNING : LOG_DEBUG, -- "No EFI_MEMORY_ATTRIBUTE_PROTOCOL found, skipping NX_COMPAT support."); -+ log_debug_status(err, "No EFI_MEMORY_ATTRIBUTE_PROTOCOL found, skipping NX_COMPAT support."); - } - - const PeSectionHeader *headers; --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd_261.1.bb b/meta/recipes-core/systemd/systemd_261.2.bb similarity index 99% rename from meta/recipes-core/systemd/systemd_261.1.bb rename to meta/recipes-core/systemd/systemd_261.2.bb index 575717bb89..b295a69548 100644 --- a/meta/recipes-core/systemd/systemd_261.1.bb +++ b/meta/recipes-core/systemd/systemd_261.2.bb @@ -36,7 +36,6 @@ SRC_URI += " \ file://systemd-pager.sh \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0003-Do-not-create-var-log-README.patch \ - file://0005-boot-downgrade-EFI_MEMORY_ATTRIBUTE_PROTOCOL-warning.patch \ " PAM_PLUGINS = " \