Update for new BUILD_DIR and SRC_DIR variables

[hvlinux.git] / stage2 / pkg / wpa_supplicant

diff --git a/stage2/pkg/wpa_supplicant b/stage2/pkg/wpa_supplicant
index 69c8331..2419f34 100644 (file)
--- a/stage2/pkg/wpa_supplicant
+++ b/stage2/pkg/wpa_supplicant
@@ -2,45 +2,60 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}/wpa_supplicant
+    cd ${SRC_DIR}/wpa_supplicant
 
     cat > .config << "EOF"
-CONFIG_DRIVER_WEXT=y
-CONFIG_CTRL_IFACE=y
 CONFIG_BACKEND=file
+CONFIG_CTRL_IFACE=y
+CONFIG_DEBUG_FILE=y
+CONFIG_DEBUG_SYSLOG=y
+CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
+CONFIG_DRIVER_NL80211=y
 
+# Because openssl is not installed at this point,
+# use bundled library versions:
 CONFIG_TLS=internal
-
-# If CONFIG_TLS=internal is used, additional library and include paths are
-# needed for LibTomMath. Alternatively, an integrated, minimal version of
-# LibTomMath can be used. See beginning of libtommath.c for details on benefits
-# and drawbacks of this option.
+CONFIG_EAP_TLS=internal
 CONFIG_INTERNAL_LIBTOMMATH=y
 
-# At the cost of about 4 kB of additional binary size, the internal LibTomMath
-# can be configured to include faster routines for exptmod, sqr, and div to
-# speed up DH and RSA calculation considerably
-CONFIG_INTERNAL_LIBTOMMATH_FAST=y
+CONFIG_LIBNL32=y
+CONFIG_READLINE=y
+CONFIG_WPS=y
+CFLAGS += -I/usr/include/libnl3
 
+CONFIG_DRIVER_WEXT=n
+CONFIG_IPV6=n
 EOF
 
-    make
-    install -m 755 wpa_cli wpa_supplicant wpa_passphrase /sbin
-    install -m 644 doc/docbook/*8 /usr/man/man8
-    install -m 644 doc/docbook/wpa_supplicant.conf.5 /usr/man/man5
+    make BINDIR=/sbin LIBDIR=/lib
+
+    install -v -m755 wpa_{cli,passphrase,supplicant} /sbin
+    install -v -m644 doc/docbook/wpa_supplicant.conf.5 /usr/share/man/man5
+    install -v -m644 doc/docbook/wpa_{cli,passphrase,supplicant}.8 \
+        /usr/share/man/man8
 }
 
 hvbuild_post()
 {
-    # Create default wpa configuration file
-    cat > /etc/wpa_supplicant.conf << EOF
+    if [ ! -f /etc/wpa_supplicant.conf ]; then
+        # Create default wpa configuration file
+        cat > /etc/wpa_supplicant.conf << EOF
 ctrl_interface=/var/run/wpa_supplicant
 
+# Allow wpa_cli to edit this configuration:
+update_config=1
+
+eapol_version=2
+ap_scan=1
+fast_reauth=1
+
+# Use wpa_passphrase to insert new network entries
+
 network={
   ssid="insert your SSID here"
-  scan_ssid=1
   key_mgmt=WPA-PSK
   psk="insert your password here"
 }
 EOF
+    fi
 }