mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
xuser-account: Take over xuser specific D-Bus policy
Move connmans xuser-related D-Bus policy to a separate file that xuser-account installs: This way connman does not need to depend on xuser-account. Add policies for bluez and ofono in the same file. (From OE-Core rev: 9f37ce18b7d79135a67474187b6119980e0130ae) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
cdaa8fd960
commit
7cb07658d1
@@ -107,7 +107,6 @@ RPROVIDES_${PN} = "\
|
||||
|
||||
RDEPENDS_${PN} = "\
|
||||
dbus \
|
||||
xuser-account \
|
||||
"
|
||||
|
||||
PACKAGES_DYNAMIC += "^${PN}-plugin-.*"
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
Because Poky doesn't support at_console we need to
|
||||
special-case the session user.
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
|
||||
---
|
||||
src/connman-dbus.conf | 3 +++
|
||||
vpn/vpn-dbus.conf | 3 +++
|
||||
2 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/src/connman-dbus.conf b/src/connman-dbus.conf
|
||||
index 98a773e..466809c 100644
|
||||
--- a/src/connman-dbus.conf
|
||||
+++ b/src/connman-dbus.conf
|
||||
@@ -8,6 +8,9 @@
|
||||
<allow send_interface="net.connman.Counter"/>
|
||||
<allow send_interface="net.connman.Notification"/>
|
||||
</policy>
|
||||
+ <policy user="xuser">
|
||||
+ <allow send_destination="net.connman"/>
|
||||
+ </policy>
|
||||
<policy at_console="true">
|
||||
<allow send_destination="net.connman"/>
|
||||
</policy>
|
||||
diff --git a/vpn/vpn-dbus.conf b/vpn/vpn-dbus.conf
|
||||
index 0f0c8da..9ad05b9 100644
|
||||
--- a/vpn/vpn-dbus.conf
|
||||
+++ b/vpn/vpn-dbus.conf
|
||||
@@ -6,6 +6,9 @@
|
||||
<allow send_destination="net.connman.vpn"/>
|
||||
<allow send_interface="net.connman.vpn.Agent"/>
|
||||
</policy>
|
||||
+ <policy user="xuser">
|
||||
+ <allow send_destination="net.connman.vpn"/>
|
||||
+ </policy>
|
||||
<policy at_console="true">
|
||||
<allow send_destination="net.connman.vpn"/>
|
||||
</policy>
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -2,7 +2,6 @@ require connman.inc
|
||||
|
||||
SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
|
||||
file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
|
||||
file://add_xuser_dbus_permission.patch \
|
||||
file://0001-Detect-backtrace-API-availability-before-using-it.patch \
|
||||
file://0002-resolve-musl-does-not-implement-res_ninit.patch \
|
||||
file://0003-Fix-header-inclusions-for-musl.patch \
|
||||
|
||||
11
meta/recipes-support/user-creation/files/system-xuser.conf
Normal file
11
meta/recipes-support/user-creation/files/system-xuser.conf
Normal file
@@ -0,0 +1,11 @@
|
||||
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
|
||||
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
|
||||
<busconfig>
|
||||
<policy user="xuser">
|
||||
<allow send_destination="net.connman"/>
|
||||
<allow send_destination="net.connman.vpn"/>
|
||||
<allow send_destination="org.ofono"/>
|
||||
<allow send_destination="org.bluez"/>
|
||||
</policy>
|
||||
</busconfig>
|
||||
|
||||
@@ -2,7 +2,7 @@ SUMMARY = "Creates an 'xuser' account used for running X11"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||
|
||||
SRC_URI = ""
|
||||
SRC_URI = "file://system-xuser.conf"
|
||||
|
||||
inherit allarch useradd
|
||||
|
||||
@@ -15,9 +15,11 @@ do_compile() {
|
||||
}
|
||||
|
||||
do_install() {
|
||||
:
|
||||
install -D -m 0644 ${WORKDIR}/system-xuser.conf ${D}${sysconfdir}/dbus-1/system.d/system-xuser.conf
|
||||
}
|
||||
|
||||
FILES_${PN} = "${sysconfdir}/dbus-1/system.d/system-xuser.conf"
|
||||
|
||||
USERADD_PACKAGES = "${PN}"
|
||||
GROUPADD_PARAM_${PN} = "--system shutdown"
|
||||
USERADD_PARAM_${PN} = "--create-home \
|
||||
|
||||
Reference in New Issue
Block a user