summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc11
1 files changed, 8 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 5c9aa6de06..b61e2afd26 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -40,11 +40,14 @@ EXTRA_OECONF += "\
40 --disable-polkit \ 40 --disable-polkit \
41 --disable-client \ 41 --disable-client \
42 --enable-fake \ 42 --enable-fake \
43 ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '', d)} \
43" 44"
44 45
45INITSCRIPT_NAME = "connman" 46INITSCRIPT_NAME = "connman"
46INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." 47INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
47 48
49SYSTEMD_SERVICE_${PN} = "connman.service"
50
48# IMPORTANT: because xuser is shared with rootless X, please make sure the 51# IMPORTANT: because xuser is shared with rootless X, please make sure the
49# USERADD_PARAM is in sync with the one in xserver-nodm-init.bb 52# USERADD_PARAM is in sync with the one in xserver-nodm-init.bb
50USERADD_PACKAGES = "${PN}" 53USERADD_PACKAGES = "${PN}"
@@ -52,7 +55,7 @@ USERADD_PARAM_${PN} = "--create-home \
52 --groups video,tty,audio \ 55 --groups video,tty,audio \
53 --user-group xuser" 56 --user-group xuser"
54 57
55inherit autotools gtk-doc pkgconfig update-rc.d useradd 58inherit autotools gtk-doc pkgconfig systemd update-rc.d useradd
56 59
57# This allows *everyone* to access ConnMan over DBus, without any access 60# This allows *everyone* to access ConnMan over DBus, without any access
58# control. Really the at_console flag should work, which would mean that 61# control. Really the at_console flag should work, which would mean that
@@ -62,8 +65,10 @@ do_compile_append() {
62} 65}
63 66
64do_install_append() { 67do_install_append() {
65 install -d ${D}${sysconfdir}/init.d 68 if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
66 install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman 69 install -d ${D}${sysconfdir}/init.d
70 install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
71 fi
67 72
68 install -d ${D}${bindir} 73 install -d ${D}${bindir}
69 install -m 0755 ${S}/tools/*-test ${D}${bindir} 74 install -m 0755 ${S}/tools/*-test ${D}${bindir}