summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc1
-rw-r--r--meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch43
-rw-r--r--meta/recipes-connectivity/connman/connman_1.30.bb1
-rw-r--r--meta/recipes-support/user-creation/files/system-xuser.conf11
-rw-r--r--meta/recipes-support/user-creation/xuser-account_0.1.bb6
5 files changed, 15 insertions, 47 deletions
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} = "\
107 107
108RDEPENDS_${PN} = "\ 108RDEPENDS_${PN} = "\
109 dbus \ 109 dbus \
110 xuser-account \
111 " 110 "
112 111
113PACKAGES_DYNAMIC += "^${PN}-plugin-.*" 112PACKAGES_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 @@
1Because Poky doesn't support at_console we need to
2special-case the session user.
3
4Upstream-Status: Inappropriate [configuration]
5
6Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
7
8---
9 src/connman-dbus.conf | 3 +++
10 vpn/vpn-dbus.conf | 3 +++
11 2 files changed, 6 insertions(+)
12
13diff --git a/src/connman-dbus.conf b/src/connman-dbus.conf
14index 98a773e..466809c 100644
15--- a/src/connman-dbus.conf
16+++ b/src/connman-dbus.conf
17@@ -8,6 +8,9 @@
18 <allow send_interface="net.connman.Counter"/>
19 <allow send_interface="net.connman.Notification"/>
20 </policy>
21+ <policy user="xuser">
22+ <allow send_destination="net.connman"/>
23+ </policy>
24 <policy at_console="true">
25 <allow send_destination="net.connman"/>
26 </policy>
27diff --git a/vpn/vpn-dbus.conf b/vpn/vpn-dbus.conf
28index 0f0c8da..9ad05b9 100644
29--- a/vpn/vpn-dbus.conf
30+++ b/vpn/vpn-dbus.conf
31@@ -6,6 +6,9 @@
32 <allow send_destination="net.connman.vpn"/>
33 <allow send_interface="net.connman.vpn.Agent"/>
34 </policy>
35+ <policy user="xuser">
36+ <allow send_destination="net.connman.vpn"/>
37+ </policy>
38 <policy at_console="true">
39 <allow send_destination="net.connman.vpn"/>
40 </policy>
41--
422.1.4
43
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
2 2
3SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ 3SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
4 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ 4 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
5 file://add_xuser_dbus_permission.patch \
6 file://0001-Detect-backtrace-API-availability-before-using-it.patch \ 5 file://0001-Detect-backtrace-API-availability-before-using-it.patch \
7 file://0002-resolve-musl-does-not-implement-res_ninit.patch \ 6 file://0002-resolve-musl-does-not-implement-res_ninit.patch \
8 file://0003-Fix-header-inclusions-for-musl.patch \ 7 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 @@
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"
2LICENSE = "MIT" 2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4 4
5SRC_URI = "" 5SRC_URI = "file://system-xuser.conf"
6 6
7inherit allarch useradd 7inherit allarch useradd
8 8
@@ -15,9 +15,11 @@ do_compile() {
15} 15}
16 16
17do_install() { 17do_install() {
18 : 18 install -D -m 0644 ${WORKDIR}/system-xuser.conf ${D}${sysconfdir}/dbus-1/system.d/system-xuser.conf
19} 19}
20 20
21FILES_${PN} = "${sysconfdir}/dbus-1/system.d/system-xuser.conf"
22
21USERADD_PACKAGES = "${PN}" 23USERADD_PACKAGES = "${PN}"
22GROUPADD_PARAM_${PN} = "--system shutdown" 24GROUPADD_PARAM_${PN} = "--system shutdown"
23USERADD_PARAM_${PN} = "--create-home \ 25USERADD_PARAM_${PN} = "--create-home \