diff options
| author |   Otavio Salvador <otavio@ossystems.com.br> | 2011-11-04 17:26:00 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2011-11-04 19:41:20 +0100 |
| commit | 77baa7401844ad46e0c6a0a7234b9ca023d45710 (patch) | |
| tree | 590daed1b73ae31e6e2fa1b852a467a349ce9594 /meta-oe/recipes-connectivity | |
| parent | 39ce6e1fbba636b21f635ac9aa3c3155e259fb6c (diff) | |
| download | meta-openembedded-77baa7401844ad46e0c6a0a7234b9ca023d45710.tar.gz | |
connman: refactor systemd packaging
This changes the recipe to use systemd.bbclass to avoid duplicating
code and also fix the rdepends of connman-systemd on connman.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-connectivity')
| -rw-r--r-- | meta-oe/recipes-connectivity/connman/connman.inc | 24 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/connman/connman_0.77.bb | 2 |
2 files changed, 6 insertions, 20 deletions
diff --git a/meta-oe/recipes-connectivity/connman/connman.inc b/meta-oe/recipes-connectivity/connman/connman.inc index 8209502f97..88b2e51062 100644 --- a/meta-oe/recipes-connectivity/connman/connman.inc +++ b/meta-oe/recipes-connectivity/connman/connman.inc @@ -31,9 +31,12 @@ EXTRA_OECONF += "\ INITSCRIPT_NAME = "connman" INITSCRIPT_PARAMS = "start 05 5 2 . stop 22 0 1 6 ." +SYSTEMD_PACKAGES = "${PN}-systemd" +SYSTEMD_SERVICE_${PN}-systemd = "connman.service" + PARALLEL_MAKE = "" -inherit autotools pkgconfig update-rc.d +inherit autotools pkgconfig update-rc.d systemd do_configure_append() { ln -sf . include/connman @@ -84,24 +87,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ PACKAGES =+ "${PN}-systemd" # Package up systemd files FILES_${PN}-systemd += "${base_libdir}/systemd" - -pkg_postinst_connman-systemd() { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - - systemctl enable connman.service -} - -pkg_postrm_connman-systemd() { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - - systemctl disable connman.service -} +RDEPENDS_${PN}-systemd += "${PN}" # Needed when using DNS proxy feature RRECOMMENDS_${PN} += "dnsmasq-dbus" diff --git a/meta-oe/recipes-connectivity/connman/connman_0.77.bb b/meta-oe/recipes-connectivity/connman/connman_0.77.bb index 6d9c87cecf..9c93e516be 100644 --- a/meta-oe/recipes-connectivity/connman/connman_0.77.bb +++ b/meta-oe/recipes-connectivity/connman/connman_0.77.bb @@ -1,5 +1,5 @@ require connman.inc -PR = "r2" +PR = "r3" EXTRA_OECONF += "\ --disable-gtk-doc \ |