[PATCH 0/1] systemd: avoid parsing error when 'networkd' is enabled in PACKAGECONFIG

[PATCH 0/1] systemd: avoid parsing error when 'networkd' is enabled in PACKAGECONFIG

[Chen Qi]

The following changes since commit bc393da30306891617adbb5eda5f57c9209ff24f:

  build-appliance-image: Update to master head revision (2015-02-27 21:15:53 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib ChenQi/systemd-networkd
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/systemd-networkd

Chen Qi (1):
  systemd: avoid parsing error when 'networkd' is enabled in
    PACKAGECONFIG

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

-- 
1.9.1

[PATCH 1/1] systemd: avoid parsing error when 'networkd' is enabled in PACKAGECONFIG

[Chen Qi]

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@windriver.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 f245239..d785255 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -169,7 +169,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
 }
 
-- 
1.9.1

Re: [PATCH 1/1] systemd: avoid parsing error when 'networkd' is enabled in PACKAGECONFIG

[Dan McGregor]

On 2 March 2015 at 01:37, Chen Qi <Qi.Chen@windriver.com> wrote:
> 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@windriver.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 f245239..d785255 100644
> --- a/meta/recipes-core/systemd/systemd_219.bb
> +++ b/meta/recipes-core/systemd/systemd_219.bb
> @@ -169,7 +169,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)}

I did exactly this locally. Works fine.

>         fi
>  }
>
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core