summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-07-03 17:11:38 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-10 09:41:55 +0100
commit95ce63d8bca1393725cc917e8a22922c2200735b (patch)
treecb20fa142b3c3833b532866cb00cd27a93a4e23f
parent79e948b5e36a36f907e1b9e625318015075c9625 (diff)
downloadpoky-95ce63d8bca1393725cc917e8a22922c2200735b.tar.gz
connman: remove xuser creation, RDEPEND on xuser-account
[YOCTO #4345] (From OE-Core rev: c10d89b201c3854eaa1f1387a8ad684f57b84174) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/connman/connman.inc10
1 files changed, 2 insertions, 8 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index e6584ffa6e..6b5ea0b17b 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -60,14 +60,7 @@ SYSTEMD_SERVICE_${PN} = "connman.service"
60SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" 60SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
61SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" 61SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup"
62 62
63# IMPORTANT: because xuser is shared with rootless X, please make sure the 63inherit autotools gtk-doc pkgconfig systemd update-rc.d
64# USERADD_PARAM is in sync with the one in xserver-nodm-init.bb
65USERADD_PACKAGES = "${PN}"
66USERADD_PARAM_${PN} = "--create-home \
67 --groups video,tty,audio \
68 --user-group xuser"
69
70inherit autotools gtk-doc pkgconfig systemd update-rc.d useradd
71 64
72do_configure_append () { 65do_configure_append () {
73 sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service 66 sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service
@@ -118,6 +111,7 @@ RDEPENDS_${PN} = "\
118 ${@base_contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \ 111 ${@base_contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \
119 ${@base_contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \ 112 ${@base_contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \
120 ${@base_contains('PACKAGECONFIG', '3g','ofono', '', d)} \ 113 ${@base_contains('PACKAGECONFIG', '3g','ofono', '', d)} \
114 xuser-account \
121 " 115 "
122 116
123PACKAGES_DYNAMIC += "^${PN}-plugin-.*" 117PACKAGES_DYNAMIC += "^${PN}-plugin-.*"