5 files changed, 38 insertions, 88 deletions

diff --git a/recipes-connectivity/connman/files/0001-added-noipconfig-option.patch b/recipes-connectivity/connman/connman/0001-added-noipconfig-option.patch
index d86b778..d86b778 100644
--- a/recipes-connectivity/connman/files/0001-added-noipconfig-option.patch
+++ b/recipes-connectivity/connman/connman/0001-added-noipconfig-option.patch
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
diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend
new file mode 100644
index 0000000..a32d4b3
--- /dev/null
+++ b/recipes-connectivity/connman/connman_%.bbappend
@@ -0,0 +1,20 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/connman:"
+
+SRC_URI += "file://0001-added-noipconfig-option.patch \
+            file://connman.patch \
+           "
+
+python do_patch_prepend() {
+    import shutil
+    workdir = d.getVar('WORKDIR', True)
+    source = d.getVar('S', True)
+    shutil.move(os.path.join(workdir, "connman"), source)
+}
+
+
+python do_patch_append() {
+    import shutil
+    workdir = d.getVar('WORKDIR', True)
+    source = d.getVar('S', True)
+    shutil.move(os.path.join(source, "connman"), workdir)
+}
diff --git a/recipes-connectivity/connman/connman_1.25.bbappend b/recipes-connectivity/connman/connman_1.25.bbappend
deleted file mode 100644
index 4f72ec3..0000000
--- a/recipes-connectivity/connman/connman_1.25.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://0001-added-noipconfig-option.patch \
-            file://connman \
-           "
diff --git a/recipes-connectivity/connman/files/connman b/recipes-connectivity/connman/files/connman
deleted file mode 100644
index a7b7c7b..0000000
--- a/recipes-connectivity/connman/files/connman
+++ /dev/null
@@ -1,83 +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
-            NET_DEVS=`cat /proc/net/dev | sed -ne 's/^\([a-zA-Z0-9 ]*\):.*$/\1/p'`
-            NET_ADDR=`cat /proc/cmdline | sed -ne 's/^.*ip=\([^ :]*\).*$/\1/p'`
-
-            if [ ! -z "$NET_ADDR" ]; then
-                if [ "$NET_ADDR" = dhcp ]; then
-                    ethn=`ifconfig | grep "^eth" | sed -e "s/\(eth[0-9]\)\(.*\)/\1/"`
-                    if [ ! -z "$ethn" ]; then
-                        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="--noipconfig $i"
-                            break
-                        fi
-                    done
-                fi
-            fi
-        fi
-        if [ -f @LIBDIR@/connman/wired-setup ] ; then
-                . @LIBDIR@/connman/wired-setup
-        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