Patchwork [v1] connman: fix systemd support for connman-* packages.

login
register
mail settings
Submitter Yevhen Kyriukha
Date Aug. 12, 2013, 4:28 p.m.
Message ID <1376324886-17664-1-git-send-email-kirgene@gmail.com>
Download mbox | patch
Permalink /patch/55487/
State New
Headers show

Comments

Yevhen Kyriukha - Aug. 12, 2013, 4:28 p.m.
This patch fixes systemd's postinst/postrm script generation.

Signed-off-by: Yevhen Kyriukha <kirgene@gmail.com>
---
 meta/recipes-connectivity/connman/connman.inc | 1 +
 1 file changed, 1 insertion(+)
Saul Wold - Aug. 12, 2013, 10:52 p.m.
On 08/12/2013 09:28 AM, Yevhen Kyriukha wrote:
> This patch fixes systemd's postinst/postrm script generation.
>
> Signed-off-by: Yevhen Kyriukha <kirgene@gmail.com>
> ---
>   meta/recipes-connectivity/connman/connman.inc | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
> index 6b5ea0b..c5014b7 100644
> --- a/meta/recipes-connectivity/connman/connman.inc
> +++ b/meta/recipes-connectivity/connman/connman.inc
> @@ -56,6 +56,7 @@ PACKAGECONFIG[wispr] = "--enable-wispr,--disable-wispr,gnutls,"
>   INITSCRIPT_NAME = "connman"
>   INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
>
> +SYSTEMD_PACKAGES = "${PN} ${PN}-vpn"

This needs to be guarded with a check for the vpn in PACKAGECONFIG, 
otherwise a packaging error can occur since the service file is not 
available:

ERROR: Function failed: SYSTEMD_SERVICE_connman-vpn value 
connman-vpn.service does not exist

Please correct this.

Thanks
	Sau!

>   SYSTEMD_SERVICE_${PN} = "connman.service"
>   SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
>   SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup"
>

Patch

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 6b5ea0b..c5014b7 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -56,6 +56,7 @@  PACKAGECONFIG[wispr] = "--enable-wispr,--disable-wispr,gnutls,"
 INITSCRIPT_NAME = "connman"
 INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
 
+SYSTEMD_PACKAGES = "${PN} ${PN}-vpn"
 SYSTEMD_SERVICE_${PN} = "connman.service"
 SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
 SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup"