From c10d89b201c3854eaa1f1387a8ad684f57b84174 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Wed, 3 Jul 2013 17:11:38 +0300 Subject: connman: remove xuser creation, RDEPEND on xuser-account [YOCTO #4345] Signed-off-by: Laurentiu Palcu Signed-off-by: Saul Wold --- meta/recipes-connectivity/connman/connman.inc | 10 ++-------- 1 file 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" SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" -# IMPORTANT: because xuser is shared with rootless X, please make sure the -# USERADD_PARAM is in sync with the one in xserver-nodm-init.bb -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--create-home \ - --groups video,tty,audio \ - --user-group xuser" - -inherit autotools gtk-doc pkgconfig systemd update-rc.d useradd +inherit autotools gtk-doc pkgconfig systemd update-rc.d do_configure_append () { sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service @@ -118,6 +111,7 @@ RDEPENDS_${PN} = "\ ${@base_contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \ ${@base_contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \ ${@base_contains('PACKAGECONFIG', '3g','ofono', '', d)} \ + xuser-account \ " PACKAGES_DYNAMIC += "^${PN}-plugin-.*" -- cgit 1.2.3-korg