Patchwork connman: Have connman package systemd service.

login
register
mail settings
Submitter Florin Sarbu
Date Feb. 13, 2013, 3:52 p.m.
Message ID <1360770738-26127-1-git-send-email-florin.sarbu@windriver.com>
Download mbox | patch
Permalink /patch/44593/
State New
Headers show

Comments

Florin Sarbu - Feb. 13, 2013, 3:52 p.m.
connman.inc was missing the SYSTEMD_PACKAGES variable. Declared
${PN}-systemd as the package containing the systemd service
file and also added this package to PACKAGES variable.

Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com>
---
 meta/recipes-connectivity/connman/connman.inc |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Ross Burton - Feb. 14, 2013, 2:58 p.m.
On 13 February 2013 15:52, Florin Sarbu <florin.sarbu@windriver.com> wrote:
> connman.inc was missing the SYSTEMD_PACKAGES variable. Declared
> ${PN}-systemd as the package containing the systemd service
> file and also added this package to PACKAGES variable.

NACK.

SYSTEMD_PACKAGES defaults to $PN so the systemd service files are in
the connman package:

$ bb contents connman
connman
/etc/dbus-1/system.d/connman.conf
/lib/systemd/system/connman.service
/usr/sbin/connmand

The systemd support in oe-core wasn't literally copied from
meta-systemd, so please stop trying to add back the $PN-systemd
packages.

Ross

Patch

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index b61e2af..8c4ee89 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -20,7 +20,7 @@  DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
             ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
             "
 
-INC_PR = "r17"
+INC_PR = "r18"
 
 TIST = "--enable-tist"
 TIST_powerpc = ""
@@ -46,6 +46,7 @@  EXTRA_OECONF += "\
 INITSCRIPT_NAME = "connman"
 INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
 
+SYSTEMD_PACKAGES = "${PN}-systemd"
 SYSTEMD_SERVICE_${PN} = "connman.service"
 
 # IMPORTANT: because xuser is shared with rootless X, please make sure the
@@ -116,7 +117,7 @@  python populate_packages_prepend() {
             d.setVar("RDEPENDS_%s" % package, " ".join(rdepends))
 }
 
-PACKAGES =+ "${PN}-tools ${PN}-tests"
+PACKAGES =+ "${PN}-tools ${PN}-tests ${PN}-systemd"
 
 FILES_${PN}-tools = "${bindir}/wispr"