[oe-commits] Chen Qi : systemd: avoid parsing error when 'networkd' is enabled in PACKAGECONFIG

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 060375f0fea327d2962980045666edb6eaa5d5f0
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=060375f0fea327d2962980045666edb6eaa5d5f0

Author: Chen Qi <Qi.Chen at windriver.com>
Date:   Mon Mar  2 15:37:48 2015 +0800

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 <Qi.Chen at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-core/systemd/systemd_219.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index 24486f1..d5c14a4 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
 }