diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2015-03-02 15:37:48 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-10 10:47:40 +0000 |
| commit | 5cfac6b9e9eff0a9fbc4f4e595d688c1be083381 (patch) | |
| tree | eb4c446bbae4b21c78ddc3c15a5a5beb70fc19df /meta/recipes-core | |
| parent | 5818c0dc31a76e4a9c056b23e7b103ca5bcc5215 (diff) | |
| download | ast2050-yocto-poky-5cfac6b9e9eff0a9fbc4f4e595d688c1be083381.zip ast2050-yocto-poky-5cfac6b9e9eff0a9fbc4f4e595d688c1be083381.tar.gz | |
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.
(From OE-Core rev: 060375f0fea327d2962980045666edb6eaa5d5f0)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/systemd/systemd_219.bb | 2 |
1 files changed, 1 insertions, 1 deletions
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 } |
