systemd: upgrade to 261.2
PATCH v2 1/1 systemd: upgrade to 261.2
From: Daniel Turull <[email protected]>
Drop two backports that are already in the new version
Changelog for systemd: 261.1 -> 261.2
4925d9f07f meson: bump version to 261.270cc4f3d72 escape: reject UTF-16 surrogates in \u escapes in cunescape_one() (#43079) a7bce5b205 homed: verify privileged worker changesf62b9ce4ed man: document that ExitType=cgroup is rejected for Type=oneshot 24ca862cf7 man: update the sample glib/sd-event integration28c374ef1c man: document unlocked as default IMDS network mode
1192084871 sd-device: allow non-safe characters in uevent filesdbfd5d2789 hwdb: classify PlayStation controller audio as controller form-factor 41932924a4 hwdb: strip the root from filenames when generating hwdb.bin089099b924 man/network: fix default value for RequiredFamilyForOnline=ff395a8c2a hwdb: add debug logging for the output filename26f3717e27 core/dbus: do not block the manager on GetId during bus (re-)connection dc225cc553 boot: cover BCD offsets past the bufferd8cdc4ee79 password-quality-util-passwdqc: restore password-quality-util.h include 598273bb05 systemd-imds-generator: fix import docsb9a65cb1ba creds: reject empty validity intervals5158952f96 dissect: include image size in JSON outputd4ea8a3061 repart: skip generated files during dry runseeb244e82c firstboot: validate root shell credentials431c436a53 sysusers: validate shell credentialsd3ebe51c6a docs: clarify scope of portable servicesc6fc821265 repart: fix varlink description string484aee1528 network: silence false warning about unitialized variableef3e2271bd id128: reject app-specific IDs for new2edfcce6b0 rm-rf: downgrade root check log when directory doesn't existcaa3df83b3 rm-rf: use faccessat instead of fstatat180baee67d repart: log allocation failure at debug level in Varlink service mode b83eac6ac0 repart: report the actual block device size in currentSizeBytes a315a8afca portable: honor --force for directory extensions0e4bb54915 portabled: apply pool limits to portable imagesbcc187363a portablectl: normalize set-limit image pathsbf5bf89bd4 portablectl: normalize remove image paths81e6878669 portable: keep unit symlinks inside the image4f7c9b77ae portablectl: normalize read-only image pathse67b1bfaf5 portablectl: keep inspect --force unit metadatab05d2790a2 hwdb: update to main@{2026-07-17}b456963bec obs: disable Tumbleweed too43c416bcd6 units: properly wait for swtpm to finish before the initrd transition b2f01dfed1 units: harden systemd-tpm2-swtpm.servicea4badd74aa tpm2: stop the software TPM before the ESP is unmounted on shutdown 160d4f1259 tree-wide: get rid of backslashes in file names8467a27870 nspawn: use chase() for creating dev nodesc889bcb737 nspawn: log at error level before exiting if parsing OCI failsfe3dbfdf7f boot: fix MEMMAP_DEVICE_PATH EndingAddress field calculation870d718006 Rebased and reapplied the fix, dropped the test case.7aa2da940f discover-image: don't ignore symlinks to raw imagesd392d17143 homed: fix verification of local identity fileeb24d74627 machined: Allow user ids in open_shell for machine-dbusc6138ffbdc udev-util: bound leading whitespace skip in udev_replace_whitespace f4c528cb06 string-util: add strnspn()f767359875 sysext: validate work directory metadata before removal4529bb61d9 shift-uid: close consumed directory fds on early return9033eae9af rm-rf: fail closed when the root check failsc63b37c0f0 vconsole: reject empty layout during keymap conversion with error fd01077f17 resolved: preserve unchanged question on asymmetric redirect350d79015d journal-remote: zero-initialize MHD daemon wrapperbd45f60193 journal-remote: remove disabled compression entry before freeing 91796f82de network: cancel netlink calls for detached requestsedd08edfe2 network: compare all multipath route nexthops742bdbb0ea tpm2-util: keep the measurement log's torn-write marker intact170dab0fe9 journalctl: reject field listing with filters5e150d2eb5 test: make NSS IPv4 tuple bounds explicit17dfd608f5 oci-util: Don't fall back to default registry for explicit registries 92ea6ed698 boot: guard missing Windows auto entry19ce494c58 journalctl: use root machine ID for namespaces5ab9b61004 tpm2-util: initialize NvPCRs on first extension6f10261eef sd-dhcp-relay: fix off-by-one when discarding BOOTREQUEST messages by hops count 56958bd945 boot: downgrade EFI_MEMORY_ATTRIBUTE_PROTOCOL warningfdd3966f56 sysupdate: use strverscmp_improved() like everywhere else2c219d2f09 timedatectl: display RTCTimeUSec in UTC formataa10c21092 network: do not use assert() on a call with side effects8e10f5f229 dissect-image: don't assert() on partition geometry from blkid20140670a5 homework-luks: add new key slots before destroying old onesff4298e73b pull-oci: switch assert() to assert_se() for set_remove() callb5c0959d45 copy: avoid following fifo/node chmod targetcb25da37eb log: add upper bound to journal iovec accountinga09c3c523d string-util: add upper bound to ellipsize_mem UTF-8 walksc8e6b02ce6 test: Remove a redundant exit callddc90bf66c sysupdate: Downgrade an info to a debug log messagec8dabc7a90 man: update gpt-auto-generator ESP mounting behaviorb8a1d98873 repart: Properly pre-calculate auto size of images2d75ade520 id128: honor json output for single idsc3ce4a403d boot: allow BCD fields to end at buffer limite42a4b8be7 portablectl: retry inspect with PORTABLE_PREFIXES1b23cedff3 string-util: introduce STRING_FILENAME_PART flag for string_is_safe() 87983793db string-util: add STRING_DISALLOW_WHITESPACE for string_is_safe14648c131e dns-answer: preserve shared aliases when removing recordsfaa89f2c7d resolved: roll back partial DNS zone publication856f2c88b7 man: clarify that --when= is a lower bound, not a condition72816231de boot: skip boot counter logic for entries marked read-only848532980f boot-secret: don't initialize secret mixin file if marked read-only 4c27b10f7f boot: skip random seed handling if seed file is marked read-only eab3959fee run: reject waiting for remain-after-exit servicescdc7b3c086 run: reject JSON output with verbose logsc6750b6267 run: reject JSON output in scope mode1e4abaa22c run: reject JSON output for trigger units53947cf5a3 run: reject JSON output with stdio forwardingabe01e1a8c run: accept explicit trigger unit names2e5787eb75 run: reject --ignore-failure in scope mode3e93ac6e17 run: honor --no-block for trigger units8f4aa23791 repart: Fix growing the partition preceding a FreeArea from leftover space 6a2db11e2e timer: avoid re-arming WakeSystem=yes timer after suspend61ed8f7147 resolved: publish browsed service after initialization49f3d283fd libudev: replace unique list entries in place48161d0f85 udev/net: reset the config list head in link_configs_free()3c0f875c76 repart: Don't copy trailing padding when using --copy-from=377c4e1001 repart: Clarify and test that --copy-from= argument respects grain size 293e44cb09 repart: Don't get old grain size from fdisk for --copy-from=15b672e8a5 udevadm-trigger: reject invalid wait-daemon timeout461c203676 udev-config: merge configured children maxaf2e46c389 man/udevadm: update device-id-of-file argumentsc9c847e23d udevadm-settle: reject positional argumentsfeb767cb60 udevadm-wait: let --removed override initialization400b796c81 udevadm-info: allow valueless attr filtersac6eb48563 udev: avoid reading before empty capability masks32fc32a92f test: TEST-89: assert ifindex=0 browse does not flap72cb20049e ci: check 'update-man-rules' to ensure it is not forgottene445b27491 resolved: fix spurious BrowseServices add/remove flapping with ifindex=0 8ac83d4f6c nss-myhostname: keep IPv6 probe result stablea6bd0815f5 creds: tolerate TPM2 seal failure in auto modeaf1a5b4566 ndisc: reject non-zero ICMPv6 codes in parsers9d34967b4f pull-oci: verify redirected manifest digest69a4065ae0 efivars: fix concurrent growth read accountingebbad7adc9 network: do not regenerate MAC address if already set by userspace 5e1295cb08 obs: explicitly disable Ubuntu/i586 buildsf1c1f93118 udev: require exact builtin command matchesa7ca71c5a4 include: add hwcaps missing from glibc and musl7bb32fdcee nspawn-oci: match the spec-correct "swappiness" memory field key 7ac32985fe udevadm-info: handle missing data db cleanup1da0209142 udevadm-control: reject oversized children-maxeca88a543b udev-rules: drop truncated import output line76f014a083 udevadm-hwdb: honor root when queryingab9695a0b1 udev-rules: accept cvm CONST matches5df1e9d9f4 import: drop redundant oci-util.c from sources735ac821c8 dns-configuration: make dns_scope_free() staticf36fa3cd91 creds: Use ERRNO_IS_NEG_TPM2_UNSEAL_BAD_PCRa5231d9ace cryptsetup: Give NV index missing its own error code5713f1e55e cryptsetup: Skip tokens with JSON parsing errorse8660577a4 cryptsetup: Reduce log level for TPM mismatches9ccec8367c cryptsetup: Remap bad PCR set early to EPERM70eb48e1a4 TEST-70-TPM2.cryptsetup: Make sure we iterate over foreign tokens 2424b89f5e tpm2-util: Also report EREMOTE if key is for different parent template 6ff4b985ac tpm2-util: For NV index errors report EREMOTE to be able to continue 793efd3553 tpm2-util: Align tpm2_import with tpm2_load to report on foreign keys 96cc8eecb7 cryptsetup/cryptenroll: Iterate over TPM tokens when they don't match 4d229c8d85 cryptsetup: Report mismatching TPM token error separately0bd3d0c2e2 stub: Set up all detected consolesa047e14bc8 mount-util/sysext: Clone sub mounts as private to preserve nested ones 2d4b465561 mount-util: Compact list of sub mounts after dropping434d6e0274 core: make /run/systemd/first-boot available earlierdf771b177b sysupdate: handle slashes after pattern fields43a450377b tree-wide: fix some double word errors like "the the"3b3b4692a8 core: connect to sockets in credential directories42060d2c30 pcrlock: handle piped PE input2073a33f0d dissect: do not follow copy-to directory symlinks86931d2563 stub: Prefer graphical console over virtio detection heuristic94d7796aef logind: set session->started before seat_read_active_vt() call723b35b584 journal-remote: do not create /var/log/journal/remotec76ae7a879 mkosi: update arch commit reference to f884cb080300eeb273fb7549fd0aa19bb6142c21 a955daf063 efi-api: validate boot option device path lengthsb82a9f9f53 dns-rr: invalidate wire format after changing ttl872ad58935 tmpfiles: add hardening in glob_item_recursivelyc4e5f003ed resolved: honour per-link DNSOverTLS=yes for certificate verification 4cff7ce255 sd-event: use CLOCK_BOOTTIME for rate limitsbcabc25eb6 creds-util: log when we remove a secret from a different machine 050ff0d62b sd-device: check fd validity before using in sendmsg in testdd01b5bd60 dns-rr: fix SOA JSON fieldsd51dd5a655 fsck: don't apply invalid mode or repair valuesc4e0899385 bootctl: Fix prepend when installing systemd-boot for the first time fc4658bc0a sd-bus: voidify bus_match_remove call9ec5d452f2 measure-smbios: bound type 1 length before zeroing wake-up type ac406e3232 gitignore: add .envrc, .direnvb8522c506f portable: fix marker_matches_images() and propagate errors correctly 138467290f journald: replace existing syslog event source before reopening 626c57b9ba journald: pin the sending client's context across native message dispatch 60cba9ebf8 portable: detect drop-in-only attachments706c4491ce sbsign: write unaligned signature size into WIN_CERTIFICATE header 775a9e171b pull: honor sync for OCI artifacts8201bf6977 copy: keep replaced target after publish errors675f4b0b06 mkosi: update fedora commit reference to 57cbcf979ce2dd872a871c59e87d2c65dfa996e6 589ba40e97 mkosi: update fedora commit reference to 45c16dd369c961b70664e473552def34d5469664 9e41763ec9 resolve: anchor the service browser from mDNS maintenance queries 4744ed0712 network: implement refcounting for SR-IOV objects0c65971685 udev: clear event back-pointer when freeing a workerc6d35bf4cb sd-bus: drop half-registered vtable members on failure4a895ab034 sd-bus: re-check match_callbacks_modified in the argNhas value loop c01e2dff1f sd-netlink: disconnect the slot on async/match error paths9d9774050f network: initialize dot_servers before CLEANUP_ARRAY16b5fcfa0d udev: track remaining buffer size across $links devlinks10bc41033c sd-device: avoid 32-bit overflow in the monitor properties bounds check 99d7c6743a hashmap: honor the value destructor in set_ensure_consume()5867697d6e sd-device: bound the tag filter BPF program size0826a4a15d logind: drop the seat from the GC queue after draining its devices d65875951e logind: cancel long-press timers when the Button is freedb6a6963e78 logind: don't free live SessionDevice on duplicate TakeDevice40467642bd boot: require a minimum PE optional header size in verify_pe()b16364d0df boot: restore parent loaded image when initrd registration fails b2644bfe8f boot: restore RW/RO memory attributes on every error23741dcd57 boot: check PE section against SizeOfImage0f3dd7ab02 boot: bound PE section VirtualSize before zeroing the inner kernel 1dbedeef33 boot: reject inner kernel entry point outside the imageec6c9360b7 boot: don't unquote an empty value in line_get_key_value()3b32f046f0 boot: initialize return parameters on zero-length EFI variable read e62dc3e2bf boot: make device_path_next_node() robust against malformed zero-length nodes 0b59b1bd1f test-socket-util: convert to new ASSERT macros313edfcb48 meson: merge two libelf-related clfags dependencies30d63ed089 meson: merge three glib cflags dependencies8e34addf1a meson: do not pass space-separated list of librariesab892b3e1f meson: use tpm2_cflags dependency rather than tpm293f26c6c5d pull: introduce pull-forward.h2a08e8cb08 sysinstall: Look for valid kernel image before installinge233936dbc boot: reject GPT headers with SizeOfPartitionEntry below the minimum 8eb162df81 machined: drop superfluos 'supervisor' varlink input parameter for register method 0cb4245755 calendarspec: warn on weekday/date conflict in systemd-analyze and systemd-run 387df32dc2 test: ignore fails when the formatted timezone differs from the current one 6fff312839 pcrextend,tpm2-util,tpm2-setup: gracefully skip NvPCR when TPM NV space is exhausted 4f5dcef65d bless-boot: avoid false maybe-uninitialized warninga035cb3445 resolve: fix segfault when built with OPENSSL_NO_DEPRECATED_3_0 1f720ac2dd coredumpctl: use break instead of continue for time bound checks f07d32db0f man: add thread-awareness note to sd_bus/sd_event manpagesc12e4a6e28 man: note that sd-tmpfiles/sysusers --root is not a sandboxing feature 3e5fdf2835 vmspawn/nspawn: Always use a per-machine runtime subdirectory924727469e meson: fix fs.exists() check for fuzz corpus samples59e87bb61a compress: handle ZSTD_CONTENTSIZE_UNKNOWN when decompressing blobs 97369d584a docs: Update memory pressure docs for latest GLib support for it dc8ce44f48 test: suppress fails on the Africa/Tripoli (Libya) timezonee61272caf1 ukify: show all sections and profiles in inspect JSON output35178b46b7 test: add test case for show_menu()f99cc27984 terminal-util: drop assert() on 'x'8a6900b8fe terminal-util: make sure we never go below 10 characters line width 380432f43a terminal-util: use LESS_BY() where appropriate8f62acc860 terminal-util: calculate array index only oncec547cddab9 bpf-restrict-fs: use a 32-bit magic key on big-endian tooce595a30c1 core/scope: don't assert when start is retried during cgroup chown 337cc13d8b core: donate the fdset to do_reexecute() to avoid a double free a8d535fb55 run: refuse --no-block when combined with --scopecfeae2790c shared/install: give the borrowed name back before bailing on error 7d0f473cb9 quotacheck: don't apply an invalid quotacheck.mode= valuec4fe868f7b core: avoid using uninitialized buffer on bad systemd.random_seed= 256465f3f7 tree-wide: fix return type of sysconf()cce527de38 memory-util: don't use 'r' for non-int returnsc9248545a5 build(deps): bump the actions group with 6 updates8d8f9c1e39 man: update description for sd_device_enumerator_add_match_subsystem 9836c4ab8c test: reduce number of disks in TEST-64-UDEV-STORAGE-simultaneous_events on Debian/Ubuntu de01a0f78f sd-journal: rate-limit tail timestamp refresh during iteration2db85c4e1c man: fix wrong KillUserProcesses= default in systemd-run(1)114df0eeab ptyfwd: avoid touching forwarder after exit drain3c06c9e4ad boot/random-seed: create \loader\ dir if missing when seeding903f1d1dc6 env-util: ensure NUL termination of the replace_env_argv() output array 9d3da650d0 fido2: reject zero-length HMAC secret
2674591913 ssl-util: set log level to debug in dlopen_many_sym_or_warn()80f8a1124a resolvectl: fix JSON reply cleanup in varlink_dump_dns_configuration a22d428609 exec-invoke: fix wrong errno in log_error_errno for setenv failure b9ec917f14 crypto-util: set log level to debug in dlopen_many_sym_or_warn() 26916eda27 luo-util: use new LIVEUPDATE_SESSION_GET_NAME ioctl to get session name if available 8b45e907e7 Import linux/liveupdate.h UAPI header from 7.2-rc1d76499f0b4 portable: leave room for trailing NUL in metadata receive buffer ae34b3441d man: document that $XDG_CONFIG_HOME affects environment.d lookup path 14ec524c1f shared/varlink: fix license of varlink-io.systemd.Udev.ceeb5862a0b test: drop ASAN workaround in TEST-07-PID1.issue-14566cc0c446e10 test: use /run/ for temporary files in TEST-07-PID1.issue-14566 5827c35fd8 test: make TEST-07-PID1.issue-14566 more robust5323aefd49 mkosi: fix license of mkosi.finalize2bb7b1ae7c shell-completion: add missing commands and options to timedatectl zsh 1fc65de3b4 tmpfiles: fix device node major:minor logging to use i->major_minor dd6c1c63de logind: fix typo in reboot-to-boot-loader-entry pathb8418ff33a journal-verify: fix offset reported for tail hash mismatch38d246a627 tmpfiles: propagate clean_item_instance() error in clean_item() df9ffa2309 Correct allocation size computation in xescape_full71fc09c47e vmspawn: complain loudly if we can't prepare a unix socket for virtiofsd 06f2b81cc9 mkosi: pull new split-out packages for deb/ubuntu73b089c099 journal-importer: avoid false maybe-uninitialized warningcc674bbeca test: relax grep for DNS query refusal6a5feb213e sd-json: Fix validation of optional fields within a mandatory struct 1e133c189e man: fix first argument in Environment= expansion example0f1a2cde63 mkosi: update debian commit reference to 8e947316488c163321665a60766dbc972e9edf7a
Tested with testsuite systmed on qemux86-64
RESULTS:
RESULTS - ping.PingTest.test_ping: PASSED (0.00s)
RESULTS - ssh.SSHTest.test_ssh: PASSED (0.48s)
RESULTS - systemd.SystemdBasicTests.test_systemd_basic: PASSED (0.48s) RESULTS - systemd.SystemdBasicTests.test_systemd_failed: PASSED (0.96s) RESULTS - systemd.SystemdBasicTests.test_systemd_list: PASSED (0.66s) RESULTS - systemd.SystemdJournalTests.test_systemd_boot_time: PASSED (0.48s) RESULTS - systemd.SystemdJournalTests.test_systemd_journal: PASSED (0.68s) RESULTS - systemd.SystemdServiceTests.test_systemd_coredump_minidebuginfo: SKIPPED (0.00s) RESULTS - systemd.SystemdServiceTests.test_systemd_disable_enable: SKIPPED (0.00s) RESULTS - systemd.SystemdServiceTests.test_systemd_disable_enable_ro: SKIPPED (0.00s) RESULTS - systemd.SystemdServiceTests.test_systemd_status: SKIPPED (0.00s) RESULTS - systemd.SystemdServiceTests.test_systemd_stop_start: SKIPPED (0.00s)
---
v2: remove danglig SRC_URI of a removed patch
---
..._261.1.bb => systemd-boot-native_261.2.bb} | 0
...md-boot_261.1.bb => systemd-boot_261.2.bb} | 4 --
...261.1.bb => systemd-tools-native_261.2.bb} | 2 -
meta/recipes-core/systemd/systemd.inc | 2 +-
...oot-from-filenames-when-generating-h.patch | 40 ----------------
...FI_MEMORY_ATTRIBUTE_PROTOCOL-warning.patch | 47 -------------------
.../{systemd_261.1.bb => systemd_261.2.bb} | 1 -
7 files changed, 1 insertion(+), 95 deletions(-)
rename meta/recipes-core/systemd/{systemd-boot-native_261.1.bb => systemd-boot-native_261.2.bb} (100%)
rename meta/recipes-core/systemd/{systemd-boot_261.1.bb => systemd-boot_261.2.bb} (95%)
rename meta/recipes-core/systemd/{systemd-tools-native_261.1.bb => systemd-tools-native_261.2.bb} (95%)
delete mode 100644 meta/recipes-core/systemd/systemd/0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0005-boot-downgrade-EFI_MEMORY_ATTRIBUTE_PROTOCOL-warning.patch
rename meta/recipes-core/systemd/{systemd_261.1.bb => systemd_261.2.bb} (99%)meta/recipes-core/systemd/systemd-boot-native_261.2.bb renamed from meta/recipes-core/systemd/systemd-boot-native_261.1.bb +0 -0
meta/recipes-core/systemd/systemd-boot_261.2.bb renamed from meta/recipes-core/systemd/systemd-boot_261.1.bb +0 -4
@@ -8,10 +8,6 @@ DEPENDS = "libcap util-linux gperf-native python3-jinja2-native python3-pyelftoo inherit meson pkgconfig gettext inherit deploy -SRC_URI += " \ - file://0005-boot-downgrade-EFI_MEMORY_ATTRIBUTE_PROTOCOL-warning.patch \ - " - PACKAGE_ARCH = "${MACHINE_ARCH}" LDFLAGS =+ "${@ " ".join(d.getVar('LD').split()[1:])} "
meta/recipes-core/systemd/systemd-tools-native_261.2.bb renamed from meta/recipes-core/systemd/systemd-tools-native_261.1.bb +0 -2
@@ -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"
meta/recipes-core/systemd/systemd.inc +1 -1
@@ -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}"
meta/recipes-core/systemd/systemd/0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 0031715c560e8138cc320f017a0a2c7160b1f7fe Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -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 <[email protected]> ---- - 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 -
meta/recipes-core/systemd/systemd/0005-boot-downgrade-EFI_MEMORY_ATTRIBUTE_PROTOCOL-warning.patch deleted +0 -47
47 lines not on this page · raw message
meta/recipes-core/systemd/systemd_261.2.bb renamed from meta/recipes-core/systemd/systemd_261.1.bb +0 -1
@@ -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 = " \