From 7cb07658d140203d628009433e2164867814d493 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Thu, 1 Oct 2015 11:04:36 +0300 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-connectivity/connman/connman.inc | 1 - .../connman/add_xuser_dbus_permission.patch | 43 ---------------------- meta/recipes-connectivity/connman/connman_1.30.bb | 1 - .../user-creation/files/system-xuser.conf | 11 ++++++ .../user-creation/xuser-account_0.1.bb | 6 ++- 5 files changed, 15 insertions(+), 47 deletions(-) delete mode 100644 meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch create mode 100644 meta/recipes-support/user-creation/files/system-xuser.conf diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 1712af3016..ab7f86d12a 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -107,7 +107,6 @@ RPROVIDES_${PN} = "\ RDEPENDS_${PN} = "\ dbus \ - xuser-account \ " PACKAGES_DYNAMIC += "^${PN}-plugin-.*" diff --git a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch deleted file mode 100644 index 15a191da55..0000000000 --- a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch +++ /dev/null @@ -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 - ---- - 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 @@ - - - -+ -+ -+ - - - -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 @@ - - - -+ -+ -+ - - - --- -2.1.4 - diff --git a/meta/recipes-connectivity/connman/connman_1.30.bb b/meta/recipes-connectivity/connman/connman_1.30.bb index 9b512c565f..7d65ac931c 100644 --- a/meta/recipes-connectivity/connman/connman_1.30.bb +++ b/meta/recipes-connectivity/connman/connman_1.30.bb @@ -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 \ 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 @@ + + + + + + + + + + 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" 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 \ -- cgit v1.2.3-54-g00ecf