From e700b4d0c3a3ec05c077322bf470093f762b328c Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 18 May 2017 17:41:14 +0200
Subject: [PATCH] networkmanager: implement wireless configuration

https://jira.digi.com/browse/DEL-4289

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../networkmanager/networkmanager/nm.wlan0.dhcp      | 10 ++++++++++
 .../networkmanager/networkmanager/nm.wlan0.static    | 12 ++++++++++++
 .../networkmanager/networkmanager_1.0.12.bbappend    | 10 ++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.wlan0.dhcp
 create mode 100644 meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.wlan0.static

diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.wlan0.dhcp b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.wlan0.dhcp
new file mode 100644
index 000000000..37918d043
--- /dev/null
+++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.wlan0.dhcp
@@ -0,0 +1,10 @@
+[connection]
+id=wlan0
+type=wifi
+interface-name=wlan0
+
+[wifi]
+ssid=""
+
+[ipv4]
+method=auto
diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.wlan0.static b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.wlan0.static
new file mode 100644
index 000000000..0c2006f59
--- /dev/null
+++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.wlan0.static
@@ -0,0 +1,12 @@
+[connection]
+id=wlan0
+type=wifi
+interface-name=wlan0
+
+[wifi]
+ssid=""
+
+[ipv4]
+address1=##WLAN0_STATIC_CIDR##,##WLAN0_STATIC_GATEWAY##
+dns=##WLAN0_STATIC_DNS##;
+method=manual
diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend
index 439f9215a..6c52eec31 100644
--- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend
+++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend
@@ -9,6 +9,8 @@ SRC_URI += " \
     file://nm.eth0.static \
     file://nm.eth1.dhcp \
     file://nm.eth1.static \
+    file://nm.wlan0.dhcp \
+    file://nm.wlan0.static \
 "
 
 PACKAGECONFIG_remove = "dnsmasq netconfig"
@@ -27,6 +29,7 @@ def ipaddr_to_cidr(iface, d):
 
 ETH0_STATIC_CIDR = "${@ipaddr_to_cidr('eth0', d)}"
 ETH1_STATIC_CIDR = "${@ipaddr_to_cidr('eth1', d)}"
+WLAN0_STATIC_CIDR = "${@ipaddr_to_cidr('wlan0', d)}"
 
 inherit update-rc.d
 
@@ -53,6 +56,13 @@ do_install_append() {
 		-e "s,##ETH1_STATIC_GATEWAY##,${ETH1_STATIC_GATEWAY},g" \
 		-e "s,##ETH1_STATIC_DNS##,${ETH1_STATIC_DNS},g" \
 		${D}${sysconfdir}/NetworkManager/system-connections/nm.eth1
+
+	# Wireless (only IP settings; connection settings need to be provided at runtime)
+	install -m 0600 ${WORKDIR}/nm.wlan0.${WLAN0_MODE} ${D}${sysconfdir}/NetworkManager/system-connections/nm.wlan0
+	sed -i  -e "s,##WLAN0_STATIC_CIDR##,${WLAN0_STATIC_CIDR},g" \
+		-e "s,##WLAN0_STATIC_GATEWAY##,${WLAN0_STATIC_GATEWAY},g" \
+		-e "s,##WLAN0_STATIC_DNS##,${WLAN0_STATIC_DNS},g" \
+		${D}${sysconfdir}/NetworkManager/system-connections/nm.wlan0
 }
 
 # NetworkManager needs to be started after DBUS