diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2012-03-06 19:40:47 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-13 11:45:11 +0000 |
commit | e9fdfbbcde4525ab2f82dbac086b3caa86521d6f (patch) | |
tree | 5d2640449b2de6bb99fa907341a30132c122dbbc /meta/recipes-connectivity | |
parent | fd6696a6f576676462fb9f0ef39bbd97083d49ae (diff) | |
download | poky-e9fdfbbcde4525ab2f82dbac086b3caa86521d6f.tar.gz |
connman: update to 0.79
(From OE-Core rev: 3d3a7103f4d068caed202833ffe9db6b47e75082)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch | 12 | ||||
-rw-r--r-- | meta/recipes-connectivity/connman/connman/disable_alg-test.patch | 18 | ||||
-rw-r--r-- | meta/recipes-connectivity/connman/connman_0.79.bb (renamed from meta/recipes-connectivity/connman/connman_0.78.bb) | 6 |
3 files changed, 18 insertions, 18 deletions
diff --git a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch index 764c689fcc..aa7a910eb7 100644 --- a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch +++ b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch | |||
@@ -5,18 +5,20 @@ Upstream-Status: Inappropriate [configuration] | |||
5 | 5 | ||
6 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | 6 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> |
7 | 7 | ||
8 | diff -ruN connman-0.65-orig/src/connman-dbus.conf connman-0.65/src/connman-dbus.conf | 8 | diff --git a/src/connman-dbus.conf b/src/connman-dbus.conf |
9 | --- connman-0.65-orig/src/connman-dbus.conf 2011-03-04 09:34:49.000000000 +0800 | 9 | index 98a773e..cbe2ba3 100644 |
10 | +++ connman-0.65/src/connman-dbus.conf 2011-03-04 09:35:21.000000000 +0800 | 10 | --- a/src/connman-dbus.conf |
11 | @@ -7,6 +7,12 @@ | 11 | +++ b/src/connman-dbus.conf |
12 | <allow send_interface="net.connman.Agent"/> | 12 | @@ -8,6 +8,13 @@ |
13 | <allow send_interface="net.connman.Counter"/> | 13 | <allow send_interface="net.connman.Counter"/> |
14 | <allow send_interface="net.connman.Notification"/> | ||
14 | </policy> | 15 | </policy> |
15 | + <policy user="xuser"> | 16 | + <policy user="xuser"> |
16 | + <allow own="net.connman"/> | 17 | + <allow own="net.connman"/> |
17 | + <allow send_destination="net.connman"/> | 18 | + <allow send_destination="net.connman"/> |
18 | + <allow send_interface="net.connman.Agent"/> | 19 | + <allow send_interface="net.connman.Agent"/> |
19 | + <allow send_interface="net.connman.Counter"/> | 20 | + <allow send_interface="net.connman.Counter"/> |
21 | + <allow send_interface="net.connman.Notification"/> | ||
20 | + </policy> | 22 | + </policy> |
21 | <policy at_console="true"> | 23 | <policy at_console="true"> |
22 | <allow send_destination="net.connman"/> | 24 | <allow send_destination="net.connman"/> |
diff --git a/meta/recipes-connectivity/connman/connman/disable_alg-test.patch b/meta/recipes-connectivity/connman/connman/disable_alg-test.patch index 44ad768cec..f5cea0047d 100644 --- a/meta/recipes-connectivity/connman/connman/disable_alg-test.patch +++ b/meta/recipes-connectivity/connman/connman/disable_alg-test.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b9a20c8eb61b600ced284646a1bea588fdd8a5ea Mon Sep 17 00:00:00 2001 | 1 | From 3ebba424d56919018733064ad9e0ab8790d2bf1d Mon Sep 17 00:00:00 2001 |
2 | From: Otavio Salvador <otavio@ossystems.com.br> | 2 | From: Otavio Salvador <otavio@ossystems.com.br> |
3 | Date: Fri, 16 Dec 2011 19:31:59 -0200 | 3 | Date: Fri, 16 Dec 2011 19:31:59 -0200 |
4 | Subject: [PATCH] Disable building of alg-test | 4 | Subject: [PATCH] Disable building of alg-test |
@@ -15,23 +15,23 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | |||
15 | 2 files changed, 1 insertions(+), 4 deletions(-) | 15 | 2 files changed, 1 insertions(+), 4 deletions(-) |
16 | 16 | ||
17 | diff --git a/Makefile.am b/Makefile.am | 17 | diff --git a/Makefile.am b/Makefile.am |
18 | index d5a76f9..d42a766 100644 | 18 | index a6509f1..93618a3 100644 |
19 | --- a/Makefile.am | 19 | --- a/Makefile.am |
20 | +++ b/Makefile.am | 20 | +++ b/Makefile.am |
21 | @@ -144,7 +144,7 @@ noinst_PROGRAMS += tools/wispr tools/supplicant-test \ | 21 | @@ -145,7 +145,7 @@ noinst_PROGRAMS += tools/wispr tools/supplicant-test \ |
22 | tools/dbus-test tools/polkit-test \ | 22 | tools/dbus-test tools/polkit-test \ |
23 | tools/iptables-test tools/tap-test tools/wpad-test \ | 23 | tools/iptables-test tools/tap-test tools/wpad-test \ |
24 | tools/stats-tool tools/private-network-test \ | 24 | tools/stats-tool tools/private-network-test \ |
25 | - tools/alg-test unit/test-session | 25 | - tools/alg-test unit/test-session unit/test-ippool \ |
26 | + unit/test-session | 26 | + unit/test-session unit/test-ippool \ |
27 | unit/test-nat | ||
27 | 28 | ||
28 | tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c | 29 | tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c |
29 | tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv | ||
30 | diff --git a/configure.ac b/configure.ac | 30 | diff --git a/configure.ac b/configure.ac |
31 | index f63fea8..67bfe85 100644 | 31 | index 3dca02e..3b2da4d 100644 |
32 | --- a/configure.ac | 32 | --- a/configure.ac |
33 | +++ b/configure.ac | 33 | +++ b/configure.ac |
34 | @@ -437,9 +437,6 @@ if (test "${enable_tools}" = "yes"); then | 34 | @@ -419,9 +419,6 @@ if (test "${enable_tools}" = "yes"); then |
35 | AC_MSG_ERROR(GnuTLS library is required)) | 35 | AC_MSG_ERROR(GnuTLS library is required)) |
36 | AC_SUBST(GNUTLS_CFLAGS) | 36 | AC_SUBST(GNUTLS_CFLAGS) |
37 | AC_SUBST(GNUTLS_LIBS) | 37 | AC_SUBST(GNUTLS_LIBS) |
@@ -42,5 +42,5 @@ index f63fea8..67bfe85 100644 | |||
42 | AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes") | 42 | AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes") |
43 | 43 | ||
44 | -- | 44 | -- |
45 | 1.7.7.3 | 45 | 1.7.9.1 |
46 | 46 | ||
diff --git a/meta/recipes-connectivity/connman/connman_0.78.bb b/meta/recipes-connectivity/connman/connman_0.79.bb index c73cad92f1..0c3a6fe08d 100644 --- a/meta/recipes-connectivity/connman/connman_0.78.bb +++ b/meta/recipes-connectivity/connman/connman_0.79.bb | |||
@@ -1,9 +1,7 @@ | |||
1 | require connman.inc | 1 | require connman.inc |
2 | 2 | ||
3 | PR = "r6" | 3 | # 0.79 tag |
4 | 4 | SRCREV = "442b1fe603e005814f592a3dbcf0d0bfb13f961c" | |
5 | # 0.78 tag | ||
6 | SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297" | ||
7 | SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ | 5 | SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ |
8 | file://add_xuser_dbus_permission.patch \ | 6 | file://add_xuser_dbus_permission.patch \ |
9 | file://ethernet_default.patch \ | 7 | file://ethernet_default.patch \ |