diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2025-04-15 11:50:16 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-04-17 11:03:22 +0100 |
commit | 4dd76f5edf1f0141b703af72fc806df28e3f853d (patch) | |
tree | 3bb5157b1e9ff36a9aa15b9928625e930e87b746 | |
parent | 79fa12ae4b72b967051f7d19ffddac4fe3651171 (diff) | |
download | poky-4dd76f5edf1f0141b703af72fc806df28e3f853d.tar.gz |
systemd: Correct tmpfile.d file for resolv.conf
The tmpfiles config for systemd-resolve has been split out [1],
so correct tmpfile.d file for resolv.conf in our recipe accordingly.
[ YOCTO # 15768]
[1] https://github.com/systemd/systemd/commit/b15f6eae421ad64773c0be934fd372d1ca230adb
(From OE-Core rev: a3020c11c91304b7400bc19f80e44e7d3720281d)
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/systemd/systemd_257.5.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_257.5.bb b/meta/recipes-core/systemd/systemd_257.5.bb index 24aad11c0a..bd57f1f5a5 100644 --- a/meta/recipes-core/systemd/systemd_257.5.bb +++ b/meta/recipes-core/systemd/systemd_257.5.bb | |||
@@ -360,7 +360,7 @@ do_install() { | |||
360 | ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd | 360 | ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd |
361 | else | 361 | else |
362 | resolv_conf="${@bb.utils.contains('RESOLV_CONF', 'stub-resolv', 'run/systemd/resolve/stub-resolv.conf', 'run/systemd/resolve/resolv.conf', d)}" | 362 | resolv_conf="${@bb.utils.contains('RESOLV_CONF', 'stub-resolv', 'run/systemd/resolve/stub-resolv.conf', 'run/systemd/resolve/resolv.conf', d)}" |
363 | sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - - - ../${resolv_conf}%g" ${D}${exec_prefix}/lib/tmpfiles.d/etc.conf | 363 | sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - - - ../${resolv_conf}%g" ${D}${exec_prefix}/lib/tmpfiles.d/systemd-resolve.conf |
364 | ln -s ../${resolv_conf} ${D}${sysconfdir}/resolv-conf.systemd | 364 | ln -s ../${resolv_conf} ${D}${sysconfdir}/resolv-conf.systemd |
365 | fi | 365 | fi |
366 | if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)}; then | 366 | if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)}; then |