From: Jörg Sommer <[email protected]>
Signed-off-by: Jörg Sommer <[email protected]>
---
meta/recipes-core/systemd/systemd_259.5.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_259.5.bb
b/meta/recipes-core/systemd/systemd_259.5.bb
index f3ec0edae7..0fbfcaba42 100644
--- a/meta/recipes-core/systemd/systemd_259.5.bb
+++ b/meta/recipes-core/systemd/systemd_259.5.bb
@@ -330,9 +330,9 @@ do_install() {
echo 'f /run/systemd/resolve/resolv.conf 0644 root root'
>>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf
ln -s ../run/systemd/resolve/resolv.conf
${D}${sysconfdir}/resolv-conf.systemd
else
- resolv_conf="${@bb.utils.contains('RESOLV_CONF', 'stub-resolv',
'run/systemd/resolve/stub-resolv.conf', 'run/systemd/resolve/resolv.conf', d)}"
- sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - -
- ../${resolv_conf}%g" ${D}${exec_prefix}/lib/tmpfiles.d/systemd-resolve.conf
- ln -s ../${resolv_conf} ${D}${sysconfdir}/resolv-conf.systemd
+ rc="../run/systemd/resolve/${@bb.utils.contains('RESOLV_CONF',
'stub-resolv', 'stub-', '', d)}resolv.conf"
+ sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - -
- $rc%" ${D}${exec_prefix}/lib/tmpfiles.d/systemd-resolve.conf
+ ln -s $rc ${D}${sysconfdir}/resolv-conf.systemd
fi
if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)};
then
rm ${D}${exec_prefix}/lib/tmpfiles.d/x11.conf
--
2.53.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#240282):
https://lists.openembedded.org/g/openembedded-core/message/240282
Mute This Topic: https://lists.openembedded.org/mt/120143147/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
