diff options
| author |   Otavio Salvador <otavio@ossystems.com.br> | 2011-12-08 18:30:52 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-09 17:46:25 +0000 |
| commit | 4215b2fb04b3ed61e8e1cf0847639cf6fe31d337 (patch) | |
| tree | 33f5a233a644c48c2b649f03d02db869d3ec523d /meta/recipes-connectivity/connman/connman | |
| parent | 154b76a5103a09ab3acd26c428c9ebb21f99fe8f (diff) | |
| download | openembedded-core-4215b2fb04b3ed61e8e1cf0847639cf6fe31d337.tar.gz | |
connman: update to 0.78
Updates the package to 0.78 bringing changes done on meta-oe and extra
cleanups as:
* xtables_version.patch: removed as it has been merged upstream
* use sed to fix dbus access policy
* remove build depends on dhclient as connman has an internal client
now
* make wifi and bluetooth building optional
* add ppp in depends that is used by some plugins
* add ntp in depends and enable ntp plugin
* package tools
* enable fake plugin
This uses PR as "r1" since it was previously available on meta-oe.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity/connman/connman')
| -rw-r--r-- | meta/recipes-connectivity/connman/connman/xtables_version.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/meta/recipes-connectivity/connman/connman/xtables_version.patch b/meta/recipes-connectivity/connman/connman/xtables_version.patch deleted file mode 100644 index 13e2c36aa8..0000000000 --- a/meta/recipes-connectivity/connman/connman/xtables_version.patch +++ /dev/null @@ -1,64 +0,0 @@ -xtables_merge_options API change, fix its calling in connman. - -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> - -Upstream-Status: Backport - -diff -ruN connman-0.75-orig//src/iptables.c connman-0.75/src/iptables.c ---- connman-0.75-orig//src/iptables.c 2011-02-22 12:16:25.000000000 +0800 -+++ connman-0.75/src/iptables.c 2011-10-26 09:21:33.941164000 +0800 -@@ -1089,7 +1089,11 @@ - if (xt_t->init != NULL) - xt_t->init(xt_t->t); - iptables_globals.opts = -- xtables_merge_options(iptables_globals.opts, -+ xtables_merge_options( -+#if XTABLES_VERSION_CODE > 5 -+ iptables_globals.orig_opts, -+#endif -+ iptables_globals.opts, - xt_t->extra_opts, - &xt_t->option_offset); - if (iptables_globals.opts == NULL) -@@ -1113,7 +1117,11 @@ - xt_m->init(xt_m->m); - if (xt_m != xt_m->next) { - iptables_globals.opts = -- xtables_merge_options(iptables_globals.opts, -+ xtables_merge_options( -+#if XTABLES_VERSION_CODE > 5 -+ iptables_globals.orig_opts, -+#endif -+ iptables_globals.opts, - xt_m->extra_opts, - &xt_m->option_offset); - if (iptables_globals.opts == NULL) -diff -ruN connman-0.75-orig//tools/iptables-test.c connman-0.75/tools/iptables-test.c ---- connman-0.75-orig//tools/iptables-test.c 2011-02-22 12:16:25.000000000 +0800 -+++ connman-0.75/tools/iptables-test.c 2011-10-26 09:23:25.701164000 +0800 -@@ -1076,7 +1076,11 @@ - if (xt_t->init != NULL) - xt_t->init(xt_t->t); - connman_iptables_globals.opts = -- xtables_merge_options(connman_iptables_globals.opts, -+ xtables_merge_options( -+#if XTABLES_VERSION_CODE > 5 -+ connman_iptables_globals.orig_opts, -+#endif -+ connman_iptables_globals.opts, - xt_t->extra_opts, - &xt_t->option_offset); - if (connman_iptables_globals.opts == NULL) -@@ -1102,7 +1106,11 @@ - xt_m->init(xt_m->m); - if (xt_m != xt_m->next) { - connman_iptables_globals.opts = -- xtables_merge_options(connman_iptables_globals.opts, -+ xtables_merge_options( -+#if XTABLES_VERSION_CODE > 5 -+ connman_iptables_globals.orig_opts, -+#endif -+ connman_iptables_globals.opts, - xt_m->extra_opts, - &xt_m->option_offset); - if (connman_iptables_globals.opts == NULL) |