summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2022-01-13 04:18:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-14 09:25:31 +0000
commit3383be190e54ed681be258430acecf5f4faebc0c (patch)
treed99fbdbe44b6695f207b79b5ba52ded25a490a9f
parent7e3955c3c661b878215cef1b4a7b04661e3b770c (diff)
downloadpoky-3383be190e54ed681be258430acecf5f4faebc0c.tar.gz
systemd: Avoid a Python deprecation warning
This avoids the following warning: WARNING: .../meta/recipes-core/systemd/systemd_250.1.bb: Var <do_install>:1: DeprecationWarning: invalid escape sequence \$ seen when doing `devtool finish --force-patch-refresh systemd meta`. (From OE-Core rev: 427ca80eb4ea6c607b00028adcc9302e29db1368) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_250.1.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd_250.1.bb b/meta/recipes-core/systemd/systemd_250.1.bb
index b05905b764..4dd668833a 100644
--- a/meta/recipes-core/systemd/systemd_250.1.bb
+++ b/meta/recipes-core/systemd/systemd_250.1.bb
@@ -297,8 +297,9 @@ do_install() {
297 297
298 # this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it 298 # this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it
299 # for existence else it fails 299 # for existence else it fails
300 if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ]; then 300 if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ] &&
301 ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)} 301 ! ${@bb.utils.contains('PACKAGECONFIG', 'networkd', 'true', 'false', d)}; then
302 echo 'd /run/systemd/netif/links 0755 root root -' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf
302 fi 303 fi
303 if ! ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'true', 'false', d)}; then 304 if ! ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'true', 'false', d)}; then
304 echo 'L! ${sysconfdir}/resolv.conf - - - - ../run/systemd/resolve/resolv.conf' >>${D}${exec_prefix}/lib/tmpfiles.d/etc.conf 305 echo 'L! ${sysconfdir}/resolv.conf - - - - ../run/systemd/resolve/resolv.conf' >>${D}${exec_prefix}/lib/tmpfiles.d/etc.conf