From: Peter Kjellerstedt Date: Thu, 13 Jan 2022 03:18:50 +0000 (+0100) Subject: systemd: Avoid a Python deprecation warning X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~5507 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=427ca80eb4ea6c607b00028adcc9302e29db1368;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git systemd: Avoid a Python deprecation warning This avoids the following warning: WARNING: .../meta/recipes-core/systemd/systemd_250.1.bb: Var :1: DeprecationWarning: invalid escape sequence \$ seen when doing `devtool finish --force-patch-refresh systemd meta`. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/systemd/systemd_250.1.bb b/meta/recipes-core/systemd/systemd_250.1.bb index b05905b764d..4dd668833a7 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() { # this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it # for existence else it fails - if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ]; then - ${@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)} + if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ] && + ! ${@bb.utils.contains('PACKAGECONFIG', 'networkd', 'true', 'false', d)}; then + echo 'd /run/systemd/netif/links 0755 root root -' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf fi if ! ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'true', 'false', d)}; then echo 'L! ${sysconfdir}/resolv.conf - - - - ../run/systemd/resolve/resolv.conf' >>${D}${exec_prefix}/lib/tmpfiles.d/etc.conf