move hostapd setup script from wireless-tools to hostapd package

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7000 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index b77873c..e500b87 100644 (file)
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -81,6 +81,8 @@ define Package/InstallTemplate
                rm -f $(PKG_BUILD_DIR)/.built; \
                $(MAKE) $(PKG_BUILD_DIR)/.built; \
        fi
+       $(INSTALL_DIR) $$(1)/lib/wifi
+       $(INSTALL_DATA) ./files/hostapd.sh $$(1)/lib/wifi/hostapd.sh
        $(INSTALL_DIR) $$(1)/etc
        $(INSTALL_CONF) $(PKG_BUILD_DIR)_$(2)/madwifi.conf $$(1)/etc/hostapd.conf
        $(INSTALL_DIR) $$(1)/usr/sbin

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
new file mode 100644 (file)
index 0000000..529462e
--- /dev/null
+++ b/package/hostapd/files/hostapd.sh
@@ -0,0 +1,66 @@
+hostapd_setup_vif() {
+       local vif="$1"
+       local driver="$2"
+       local hostapd_cfg=
+
+       # Examples:
+       # psk-mixed/tkip        => WPA1+2 PSK, TKIP
+       # wpa-psk2/tkip+aes     => WPA2 PSK, CCMP+TKIP
+       # wpa2/tkip+aes         => WPA2 RADIUS, CCMP+TKIP
+       # ...
+
+       # TODO: move this parsing function somewhere generic, so that
+       # later it can be reused by drivers that don't use hostapd
+       
+       # crypto defaults: WPA2 vs WPA1
+       case "$enc" in
+               wpa2*|WPA2*|*PSK2*|*psk2*)
+                       wpa=2
+                       crypto="CCMP"
+               ;;
+               *mixed*)
+                       wpa=3
+                       crypto="CCMP TKIP"
+               ;;
+               *) 
+                       wpa=1
+                       crypto="TKIP"
+               ;;
+       esac
+
+       # explicit override for crypto setting
+       case "$enc" in
+               *tkip+aes|*TKIP+AES|*tkip+ccmp|*TKIP+CCMP) crypto="CCMP TKIP";;
+               *tkip|*TKIP) crypto="TKIP";;
+               *aes|*AES|*ccmp|*CCMP) crypto="CCMP";;
+       esac
+       
+       # use crypto/auth settings for building the hostapd config
+       case "$enc" in
+               *psk*|*PSK*)
+                       config_get psk "$vif" key
+                       append hostapd_cfg "wpa_passphrase=$psk" "$N"
+               ;;
+               *wpa*|*WPA*)
+               # FIXME: add wpa+radius here
+               ;;
+               *)
+                       return 0;
+               ;;
+       esac
+       config_get ifname "$vif" ifname
+       config_get bridge "$vif" bridge
+       config_get ssid "$vif" ssid
+       cat > /var/run/hostapd-$ifname.conf <<EOF
+driver=$driver
+interface=$ifname
+${bridge:+bridge=$bridge}
+ssid=$ssid
+debug=0
+wpa=$wpa
+wpa_pairwise=$crypto
+$hostapd_cfg
+EOF
+       hostapd -B /var/run/hostapd-$ifname.conf
+}
+

diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index 0f790aa..476efec 100644 (file)
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -59,8 +59,6 @@ define Build/UninstallDev
 endef
 
 define Package/wireless-tools/install
-       $(INSTALL_DIR) $(1)/lib/wifi
-       $(INSTALL_DATA)  ./files/wifi.sh $(1)/lib/wifi/generic.sh
        $(INSTALL_DIR) $(1)/usr/lib
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/libiw.so.28 $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/sbin

diff --git a/package/wireless-tools/files/wifi.sh b/package/wireless-tools/files/wifi.sh
deleted file mode 100644 (file)
index 529462e..0000000
--- a/package/wireless-tools/files/wifi.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-hostapd_setup_vif() {
-       local vif="$1"
-       local driver="$2"
-       local hostapd_cfg=
-
-       # Examples:
-       # psk-mixed/tkip        => WPA1+2 PSK, TKIP
-       # wpa-psk2/tkip+aes     => WPA2 PSK, CCMP+TKIP
-       # wpa2/tkip+aes         => WPA2 RADIUS, CCMP+TKIP
-       # ...
-
-       # TODO: move this parsing function somewhere generic, so that
-       # later it can be reused by drivers that don't use hostapd
-       
-       # crypto defaults: WPA2 vs WPA1
-       case "$enc" in
-               wpa2*|WPA2*|*PSK2*|*psk2*)
-                       wpa=2
-                       crypto="CCMP"
-               ;;
-               *mixed*)
-                       wpa=3
-                       crypto="CCMP TKIP"
-               ;;
-               *) 
-                       wpa=1
-                       crypto="TKIP"
-               ;;
-       esac
-
-       # explicit override for crypto setting
-       case "$enc" in
-               *tkip+aes|*TKIP+AES|*tkip+ccmp|*TKIP+CCMP) crypto="CCMP TKIP";;
-               *tkip|*TKIP) crypto="TKIP";;
-               *aes|*AES|*ccmp|*CCMP) crypto="CCMP";;
-       esac
-       
-       # use crypto/auth settings for building the hostapd config
-       case "$enc" in
-               *psk*|*PSK*)
-                       config_get psk "$vif" key
-                       append hostapd_cfg "wpa_passphrase=$psk" "$N"
-               ;;
-               *wpa*|*WPA*)
-               # FIXME: add wpa+radius here
-               ;;
-               *)
-                       return 0;
-               ;;
-       esac
-       config_get ifname "$vif" ifname
-       config_get bridge "$vif" bridge
-       config_get ssid "$vif" ssid
-       cat > /var/run/hostapd-$ifname.conf <<EOF
-driver=$driver
-interface=$ifname
-${bridge:+bridge=$bridge}
-ssid=$ssid
-debug=0
-wpa=$wpa
-wpa_pairwise=$crypto
-$hostapd_cfg
-EOF
-       hostapd -B /var/run/hostapd-$ifname.conf
-}
-