From 1010144ed319e675e713eda24c6a0500915c949c Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Tue, 2 Aug 2016 13:48:39 +0000
Subject: connectivity: Create wpa_supplicant configuration file in-line

Change-Id: I437d03051f1c9a52147d2640ed025d4bbd6de3ce
---
 strata/connectivity.morph                |  4 ++--
 strata/connectivity/wpa_supplicant.morph | 30 +++++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/strata/connectivity.morph b/strata/connectivity.morph
index 68ef9d9b..823ead65 100644
--- a/strata/connectivity.morph
+++ b/strata/connectivity.morph
@@ -16,8 +16,8 @@ chunks:
 - name: wpa_supplicant
   morph: strata/connectivity/wpa_supplicant.morph
   repo: upstream:hostap
-  ref: d2d2254ad0c8d9dc80545936c86abecbad49fa91
-  unpetrify-ref: baserock/hostap_2_5
+  ref: 1f344cd7b4461c8bae31abc3fc450407782282e2
+  unpetrify-ref: hostap_2_5
   build-depends:
   - libnl
 - name: iptables
diff --git a/strata/connectivity/wpa_supplicant.morph b/strata/connectivity/wpa_supplicant.morph
index 86a51608..3fdc68a2 100644
--- a/strata/connectivity/wpa_supplicant.morph
+++ b/strata/connectivity/wpa_supplicant.morph
@@ -1,7 +1,35 @@
 name: wpa_supplicant
 kind: chunk
 configure-commands:
-- sed -i 's/^CONFIG_READLINE=y$//' wpa_supplicant/.config
+- |
+  cat >"wpa_supplicant/.config" <<EOF
+  CONFIG_DRIVER_HOSTAP=y
+  CONFIG_DRIVER_ATMEL=y
+  CONFIG_DRIVER_WEXT=y
+  CONFIG_DRIVER_NL80211=y
+  CONFIG_DRIVER_WIRED=y
+  CONFIG_IEEE8021X_EAPOL=y
+  CONFIG_EAP_MD5=y
+  CONFIG_EAP_MSCHAPV2=y
+  CONFIG_EAP_TLS=y
+  CONFIG_EAP_PEAP=y
+  CONFIG_EAP_TTLS=y
+  CONFIG_EAP_GTC=y
+  CONFIG_EAP_OTP=y
+  CONFIG_EAP_LEAP=y
+  CONFIG_WPS=y
+  CONFIG_PKCS12=y
+  CONFIG_SMARTCARD=y
+  CONFIG_CTRL_IFACE=y
+  CONFIG_BACKEND=file
+  CONFIG_PEERKEY=y
+  CONFIG_CTRL_IFACE_DBUS=y
+  CONFIG_CTRL_IFACE_DBUS_NEW=y
+  CONFIG_CTRL_IFACE_DBUS_INTRO=y
+  CONFIG_LIBNL32=y
+  CONFIG_IPV6=y
+  CFLAGS += -I/usr/include/libnl3
+  EOF
 build-commands:
 - make -C wpa_supplicant
 install-commands:
-- 
cgit v1.2.1