From 154b76a5103a09ab3acd26c428c9ebb21f99fe8f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 9 Dec 2011 14:34:03 +0000 Subject: connman: move files from connman-0.75 to connman dir This is being done in preparation to get newer version of connman into OE-Core. Signed-off-by: Otavio Salvador --- .../connman-0.75/add_xuser_dbus_permission.patch | 23 -------- .../connman/connman-0.75/connman | 62 --------------------- .../connman/connman-0.75/xtables_version.patch | 64 ---------------------- .../connman/add_xuser_dbus_permission.patch | 23 ++++++++ meta/recipes-connectivity/connman/connman/connman | 62 +++++++++++++++++++++ .../connman/connman/xtables_version.patch | 64 ++++++++++++++++++++++ 6 files changed, 149 insertions(+), 149 deletions(-) delete mode 100644 meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch delete mode 100644 meta/recipes-connectivity/connman/connman-0.75/connman delete mode 100644 meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch create mode 100644 meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch create mode 100644 meta/recipes-connectivity/connman/connman/connman create mode 100644 meta/recipes-connectivity/connman/connman/xtables_version.patch (limited to 'meta') diff --git a/meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch deleted file mode 100644 index 764c689fc..000000000 --- a/meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch +++ /dev/null @@ -1,23 +0,0 @@ -Some platform (like atom-pc) enables rootless X, -thus we need to add the xuser in the list. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Dongxiao Xu - -diff -ruN connman-0.65-orig/src/connman-dbus.conf connman-0.65/src/connman-dbus.conf ---- connman-0.65-orig/src/connman-dbus.conf 2011-03-04 09:34:49.000000000 +0800 -+++ connman-0.65/src/connman-dbus.conf 2011-03-04 09:35:21.000000000 +0800 -@@ -7,6 +7,12 @@ - - - -+ -+ -+ -+ -+ -+ - - - diff --git a/meta/recipes-connectivity/connman/connman-0.75/connman b/meta/recipes-connectivity/connman/connman-0.75/connman deleted file mode 100644 index f01bf371c..000000000 --- a/meta/recipes-connectivity/connman/connman-0.75/connman +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -DAEMON=/usr/sbin/connmand -PIDFILE=/var/run/connmand.pid -DESC="Connection Manager" - -if [ -f /etc/default/connman ] ; then - . /etc/default/connman -fi - -set -e - -nfsroot=0 - -exec 9<&0 < /proc/mounts -while read dev mtpt fstype rest; do - if test $mtpt = "/" ; then - case $fstype in - nfs | nfs4) - nfsroot=1 - break - ;; - *) - ;; - esac - fi -done - -do_start() { - EXTRA_PARAM="" - if test $nfsroot -eq 1 ; then - EXTRA_PARAM="-P ethernet" - fi - $DAEMON $EXTRA_PARAM -} - -do_stop() { - start-stop-daemon --stop --name connmand --quiet -} - -case "$1" in - start) - echo "Starting $DESC" - do_start - ;; - stop) - echo "Stopping $DESC" - do_stop - ;; - restart|force-reload) - echo "Restarting $DESC" - do_stop - sleep 1 - do_start - ;; - *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch b/meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch deleted file mode 100644 index 13e2c36aa..000000000 --- a/meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch +++ /dev/null @@ -1,64 +0,0 @@ -xtables_merge_options API change, fix its calling in connman. - -Signed-off-by: Dongxiao Xu - -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) diff --git a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch new file mode 100644 index 000000000..764c689fc --- /dev/null +++ b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch @@ -0,0 +1,23 @@ +Some platform (like atom-pc) enables rootless X, +thus we need to add the xuser in the list. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Dongxiao Xu + +diff -ruN connman-0.65-orig/src/connman-dbus.conf connman-0.65/src/connman-dbus.conf +--- connman-0.65-orig/src/connman-dbus.conf 2011-03-04 09:34:49.000000000 +0800 ++++ connman-0.65/src/connman-dbus.conf 2011-03-04 09:35:21.000000000 +0800 +@@ -7,6 +7,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + diff --git a/meta/recipes-connectivity/connman/connman/connman b/meta/recipes-connectivity/connman/connman/connman new file mode 100644 index 000000000..f01bf371c --- /dev/null +++ b/meta/recipes-connectivity/connman/connman/connman @@ -0,0 +1,62 @@ +#!/bin/sh + +DAEMON=/usr/sbin/connmand +PIDFILE=/var/run/connmand.pid +DESC="Connection Manager" + +if [ -f /etc/default/connman ] ; then + . /etc/default/connman +fi + +set -e + +nfsroot=0 + +exec 9<&0 < /proc/mounts +while read dev mtpt fstype rest; do + if test $mtpt = "/" ; then + case $fstype in + nfs | nfs4) + nfsroot=1 + break + ;; + *) + ;; + esac + fi +done + +do_start() { + EXTRA_PARAM="" + if test $nfsroot -eq 1 ; then + EXTRA_PARAM="-P ethernet" + fi + $DAEMON $EXTRA_PARAM +} + +do_stop() { + start-stop-daemon --stop --name connmand --quiet +} + +case "$1" in + start) + echo "Starting $DESC" + do_start + ;; + stop) + echo "Stopping $DESC" + do_stop + ;; + restart|force-reload) + echo "Restarting $DESC" + do_stop + sleep 1 + do_start + ;; + *) + echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/meta/recipes-connectivity/connman/connman/xtables_version.patch b/meta/recipes-connectivity/connman/connman/xtables_version.patch new file mode 100644 index 000000000..13e2c36aa --- /dev/null +++ b/meta/recipes-connectivity/connman/connman/xtables_version.patch @@ -0,0 +1,64 @@ +xtables_merge_options API change, fix its calling in connman. + +Signed-off-by: Dongxiao Xu + +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) -- cgit v1.2.3