From 5c4968dd70c2d400065787dbc5b5f2ac30e45098 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Sat, 14 Feb 2015 13:44:02 +0100
Subject: [PATCH 1/2] wifi2udp: Honor the global default file for the
 destination address

---
 recipes-fixes/wireless-tools/files/wifi2udp.service      | 3 ++-
 recipes-fixes/wireless-tools/wireless-tools_sysmocom.inc | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipes-fixes/wireless-tools/files/wifi2udp.service b/recipes-fixes/wireless-tools/files/wifi2udp.service
index 67dba6c87e..1f3712e6f9 100644
--- a/recipes-fixes/wireless-tools/files/wifi2udp.service
+++ b/recipes-fixes/wireless-tools/files/wifi2udp.service
@@ -2,7 +2,8 @@
 Description=WIFI scan service
 
 [Service]
+EnvironmentFile=/etc/default/odu_gps.conf
 ExecStartPre=/sbin/ifconfig wlan0 up
-ExecStart=/usr/sbin/wifi2udp -w wlan0 -i eth0 10.3.0.1
+ExecStart=/usr/sbin/wifi2udp -w wlan0 -i eth0 ${UDP_SINK}
 Restart=always
 RestartSec=2
diff --git a/recipes-fixes/wireless-tools/wireless-tools_sysmocom.inc b/recipes-fixes/wireless-tools/wireless-tools_sysmocom.inc
index 5dc82bd347..590d809c20 100644
--- a/recipes-fixes/wireless-tools/wireless-tools_sysmocom.inc
+++ b/recipes-fixes/wireless-tools/wireless-tools_sysmocom.inc
@@ -1,7 +1,7 @@
 THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
 
-PRINC="7"
+PRINC="8"
 
 SRC_URI += "file://0001-Add-wifi2udp-program.patch \
 	    file://wifi2udp.service"

From 2d93f2256ad9ed45c61505c208451f9fa00245f7 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Sat, 14 Feb 2015 14:43:07 +0100
Subject: [PATCH 2/2] ifupdown: Launch udhcpc the same we way always do it

In case the port is not in a forwarding state.. don't just
give up but background and move on. This appears to be needed
for the odu to acquire a lease when STP is used.
---
 .../ifupdown/files/busybox-yocto-compat.patch       | 13 +++++++++++++
 recipes-extra/ifupdown/ifupdown_0.7.52.bb           |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/recipes-extra/ifupdown/files/busybox-yocto-compat.patch b/recipes-extra/ifupdown/files/busybox-yocto-compat.patch
index fc32e07430..d1ad7081b9 100644
--- a/recipes-extra/ifupdown/files/busybox-yocto-compat.patch
+++ b/recipes-extra/ifupdown/files/busybox-yocto-compat.patch
@@ -68,3 +68,16 @@ Index: ifupdown-0.7.52/execute.c
      out = parse(command, ifd);
      if (!out) {
          return 0;
+Index: ifupdown-0.7.52/inet.defn
+===================================================================
+--- ifupdown-0.7.52.orig/inet.defn
++++ ifupdown-0.7.52/inet.defn
+@@ -89,7 +89,7 @@ method dhcp
+         elsif (execable("/sbin/dhclient3"))
+     pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
+         elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100))
+-    udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x hostname:%hostname%]] \
++    udhcpc -R -b -p /run/udhcpc.%iface%.pid -i %iface% [[-x hostname:%hostname%]] \
+         elsif (execable("/sbin/udhcpc") && mylinuxver() >= mylinux(2,2,0))
+     dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
+            [[-l %leasetime%]] %iface% \
diff --git a/recipes-extra/ifupdown/ifupdown_0.7.52.bb b/recipes-extra/ifupdown/ifupdown_0.7.52.bb
index 046d44468a..b2e581e076 100644
--- a/recipes-extra/ifupdown/ifupdown_0.7.52.bb
+++ b/recipes-extra/ifupdown/ifupdown_0.7.52.bb
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "8a0647c59ee0606f5da9205c5b3c5b000fea98fe39348f6bb2cba5fecf
 
 CFLAGS += "-D'IFUPDOWN_VERSION="0.7"'"
 
-PR = "r1"
+PR = "r2"
 
 do_configure() {
 	chmod a+rx makecdep.sh makenwdep.sh