connman: Rewrite to a patch to the connman file

The original .bbappend was adding a new "connman" file that replaced the
one provided in the original recipe. This meant that any changes in the
original file from poky would be overwritten.

The .bbappend now patches the connman file so that any changes in it
are either included or caught with merge conflict. To achieve this I did
an artifice of copying the connman file in S to be patched by do_patch,
then copied it back in WORKDIR to be installed on target by do_install.

Also renamed the recipe .bbappend to cover all versions of connman and
renamed the files folder.

Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Signed-off-by: Nora Björklund <nora.bjorklund@enea.com>

1 files changed, 18 insertions, 0 deletions

diff --git a/recipes-connectivity/connman/connman/connman.patch b/recipes-connectivity/connman/connman/connman.patch
new file mode 100644
index 0000000..e3ff2f9
--- /dev/null
+++ b/recipes-connectivity/connman/connman/connman.patch
@@ -0,0 +1,18 @@
+--- ./connman.orig      2016-01-28 17:03:08.000315610 +0100
++++ ./connman   2016-01-28 17:05:24.393956927 +0100
+@@ -36,13 +36,13 @@ do_start() {
+                if [ "$NET_ADDR" = dhcp ]; then
+                    ethn=`ifconfig | grep "^eth" | sed -e "s/\(eth[0-9]\)\(.*\)/\1/"`
+                    if [ ! -z "$ethn" ]; then
+-                       EXTRA_PARAM="-I $ethn"
++                       EXTRA_PARAM="--noipconfig $ethn"
+                    fi
+                else
+                    for i in $NET_DEVS; do
+                        ADDR=`ifconfig $i | sed 's/addr://g' | sed -ne 's/^.*inet \([0-9.]*\) .*$/\1/p'`
+                        if [ "$NET_ADDR" = "$ADDR" ]; then
+-                           EXTRA_PARAM="-I $i"
++                           EXTRA_PARAM="--noipconfig $i"
+                            break
+                        fi
+                    done