summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-03-05 00:02:14 +0800
committerSaul Wold <sgw@linux.intel.com>2011-03-08 15:21:52 -0800
commita776cc376e1435d61b5ca1b91369e149e28cc17b (patch)
tree5aa0c3fcd81182166ce023a03d8ebdfc596baef9 /meta/recipes-connectivity
parent83777bf1bcb6f615d44bb70ba1d070c759dad163 (diff)
downloadpoky-a776cc376e1435d61b5ca1b91369e149e28cc17b.tar.gz
connman: add xuser to the dbus permission list
Some platform (like atom-pc) enables rootless X, thus the connman frontend run on it need the permission to connect with connman by dbus. This commit grants permission to xuser. This fixes [YOCTO #779] (From OE-Core rev: cfbf50c235c2faeb53f43b42a12c49c022288488) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch21
-rw-r--r--meta/recipes-connectivity/connman/connman_0.65.bb3
2 files changed, 23 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch
new file mode 100644
index 0000000000..787d49ba8d
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch
@@ -0,0 +1,21 @@
1Some platform (like atom-pc) enables rootless X,
2thus we need to add the xuser in the list.
3
4Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
5
6diff -ruN connman-0.65-orig/src/connman-dbus.conf connman-0.65/src/connman-dbus.conf
7--- connman-0.65-orig/src/connman-dbus.conf 2011-03-04 09:34:49.000000000 +0800
8+++ connman-0.65/src/connman-dbus.conf 2011-03-04 09:35:21.000000000 +0800
9@@ -7,6 +7,12 @@
10 <allow send_interface="net.connman.Agent"/>
11 <allow send_interface="net.connman.Counter"/>
12 </policy>
13+ <policy user="xuser">
14+ <allow own="net.connman"/>
15+ <allow send_destination="net.connman"/>
16+ <allow send_interface="net.connman.Agent"/>
17+ <allow send_interface="net.connman.Counter"/>
18+ </policy>
19 <policy at_console="true">
20 <allow send_destination="net.connman"/>
21 </policy>
diff --git a/meta/recipes-connectivity/connman/connman_0.65.bb b/meta/recipes-connectivity/connman/connman_0.65.bb
index 0b077e1d98..8bb84a1cf2 100644
--- a/meta/recipes-connectivity/connman/connman_0.65.bb
+++ b/meta/recipes-connectivity/connman/connman_0.65.bb
@@ -1,5 +1,5 @@
1require connman.inc 1require connman.inc
2PR = "r0" 2PR = "r1"
3 3
4EXTRA_OECONF += "\ 4EXTRA_OECONF += "\
5 ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \ 5 ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
@@ -21,6 +21,7 @@ EXTRA_OECONF += "\
21SRC_URI = "\ 21SRC_URI = "\
22 http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \ 22 http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
23 file://fix-shutdown-ap-disconnect.patch \ 23 file://fix-shutdown-ap-disconnect.patch \
24 file://add_xuser_dbus_permission.patch \
24 file://connman \ 25 file://connman \
25" 26"
26 27