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>
This commit is contained in:
parent
79e948b5e3
commit
95ce63d8bc
|
@ -60,14 +60,7 @@ SYSTEMD_SERVICE_${PN} = "connman.service"
|
||||||
SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
|
SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
|
||||||
SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup"
|
SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup"
|
||||||
|
|
||||||
# IMPORTANT: because xuser is shared with rootless X, please make sure the
|
inherit autotools gtk-doc pkgconfig systemd update-rc.d
|
||||||
# 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
|
|
||||||
|
|
||||||
do_configure_append () {
|
do_configure_append () {
|
||||||
sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service
|
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', 'bluetooth', 'bluez4', '', d)} \
|
||||||
${@base_contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \
|
${@base_contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \
|
||||||
${@base_contains('PACKAGECONFIG', '3g','ofono', '', d)} \
|
${@base_contains('PACKAGECONFIG', '3g','ofono', '', d)} \
|
||||||
|
xuser-account \
|
||||||
"
|
"
|
||||||
|
|
||||||
PACKAGES_DYNAMIC += "^${PN}-plugin-.*"
|
PACKAGES_DYNAMIC += "^${PN}-plugin-.*"
|
||||||
|
|
Loading…
Reference in New Issue