From: Chen Qi Date: Mon, 2 Mar 2015 07:37:48 +0000 (+0800) Subject: systemd: avoid parsing error when 'networkd' is enabled in PACKAGECONFIG X-Git-Tag: 2015-4~235 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=060375f0fea327d2962980045666edb6eaa5d5f0;p=openembedded-core.git systemd: avoid parsing error when 'networkd' is enabled in PACKAGECONFIG If 'networkd' is enabled in PACKAGECONFIG, the do_install variable cannot be correctly expanded. Error message is like below. Failure expanding variable do_install: ShellSyntaxError: LexToken(Fi,'fi',0,0) followed by: LexToken(NEWLINE,'\n',0,0) This patch fixes the above problem. Signed-off-by: Chen Qi Signed-off-by: Ross Burton --- diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index 24486f1815..d5c14a42c4 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb @@ -170,7 +170,7 @@ 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}${libdir}/tmpfiles.d/systemd.conf ]; then - ${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${libdir}/tmpfiles.d/systemd.conf', d)} + ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${libdir}/tmpfiles.d/systemd.conf', d)} fi }