diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-10-01 11:04:36 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-01 15:07:49 +0100 |
| commit | 7cb07658d140203d628009433e2164867814d493 (patch) | |
| tree | d878aaa3ea1f4a89df2ef95aefd36eab9c5b4950 /meta/recipes-support/user-creation | |
| parent | cdaa8fd9608d1c34a2e6c9f6d0c9dc6ced706859 (diff) | |
| download | poky-7cb07658d140203d628009433e2164867814d493.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-support/user-creation')
| -rw-r--r-- | meta/recipes-support/user-creation/files/system-xuser.conf | 11 | ||||
| -rw-r--r-- | meta/recipes-support/user-creation/xuser-account_0.1.bb | 6 |
2 files changed, 15 insertions, 2 deletions
diff --git a/meta/recipes-support/user-creation/files/system-xuser.conf b/meta/recipes-support/user-creation/files/system-xuser.conf new file mode 100644 index 0000000000..d42e3d1f50 --- /dev/null +++ b/meta/recipes-support/user-creation/files/system-xuser.conf | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" | ||
| 2 | "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> | ||
| 3 | <busconfig> | ||
| 4 | <policy user="xuser"> | ||
| 5 | <allow send_destination="net.connman"/> | ||
| 6 | <allow send_destination="net.connman.vpn"/> | ||
| 7 | <allow send_destination="org.ofono"/> | ||
| 8 | <allow send_destination="org.bluez"/> | ||
| 9 | </policy> | ||
| 10 | </busconfig> | ||
| 11 | |||
diff --git a/meta/recipes-support/user-creation/xuser-account_0.1.bb b/meta/recipes-support/user-creation/xuser-account_0.1.bb index 77ba97dbf1..13ba677333 100644 --- a/meta/recipes-support/user-creation/xuser-account_0.1.bb +++ b/meta/recipes-support/user-creation/xuser-account_0.1.bb | |||
| @@ -2,7 +2,7 @@ SUMMARY = "Creates an 'xuser' account used for running X11" | |||
| 2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
| 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
| 4 | 4 | ||
| 5 | SRC_URI = "" | 5 | SRC_URI = "file://system-xuser.conf" |
| 6 | 6 | ||
| 7 | inherit allarch useradd | 7 | inherit allarch useradd |
| 8 | 8 | ||
| @@ -15,9 +15,11 @@ do_compile() { | |||
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | do_install() { | 17 | do_install() { |
| 18 | : | 18 | install -D -m 0644 ${WORKDIR}/system-xuser.conf ${D}${sysconfdir}/dbus-1/system.d/system-xuser.conf |
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | FILES_${PN} = "${sysconfdir}/dbus-1/system.d/system-xuser.conf" | ||
| 22 | |||
| 21 | USERADD_PACKAGES = "${PN}" | 23 | USERADD_PACKAGES = "${PN}" |
| 22 | GROUPADD_PARAM_${PN} = "--system shutdown" | 24 | GROUPADD_PARAM_${PN} = "--system shutdown" |
| 23 | USERADD_PARAM_${PN} = "--create-home \ | 25 | USERADD_PARAM_${PN} = "--create-home \ |
