=== modified file 'packages/initscripts/acme/wireless-tools/Makefile' --- packages/initscripts/acme/wireless-tools/Makefile 2007-07-05 08:04:45 +0000 +++ packages/initscripts/acme/wireless-tools/Makefile 2008-07-22 15:53:23 +0000 @@ -11,6 +11,11 @@ else \ echo "$(AXIS_CONFIG_ACME_WLAN_KEY)" ; \ fi` +WPA=`if test "$(AXIS_CONFIG_ACME_WLAN_WPA_NONE)" = "y" ; then \ + echo "off" ; \ + else \ + echo "$(AXIS_CONFIG_ACME_WLAN_WPA)" ; \ + fi` GATEWAY_USE=`if test "$(AXIS_CONFIG_ACME_WLAN_DEFAULT)" = "y" ; then \ echo "1" ; \ else \ @@ -24,8 +29,9 @@ sed "s/_WLAN_MODE_/$(MODE)/g" | \ sed "s/_WLAN_KEY_/$(KEY)/g" | \ sed "s/_WLAN_GATEWAY_USE_/$(GATEWAY_USE)/g" | \ + sed "s/_WPA_/$(WPA)/g" | \ sed "s/_WLAN_GATEWAY_IP_/$(AXIS_CONFIG_ACME_WLAN_GATEWAY)/g" | \ - sed "s/_WLAN_SUBNET_/$(AXIS_CONFIG_ACME_WLAN_SUBNET)/g" > net.wireless + sed "s/_WLAN_SUBNET_/$(AXIS_CONFIG_ACME_WLAN_SUBNET)/g" > net.wireless $(INSTALL) $(OWN) -m 0755 wireless $(prefix)/etc/init.d/wireless $(INSTALL) $(OWN) -m 0644 net.wireless $(prefix)/etc/conf.d/net.wireless $(LN) -sf ../init.d/wireless "$(prefix)"/etc/rc3.d/S31wireless === modified file 'packages/initscripts/acme/wireless-tools/net.wireless.orig' --- packages/initscripts/acme/wireless-tools/net.wireless.orig 2007-07-05 08:04:45 +0000 +++ packages/initscripts/acme/wireless-tools/net.wireless.orig 2008-07-22 15:21:02 +0000 @@ -30,3 +30,5 @@ # KEY="6162636465" KEY="_WLAN_KEY_" +WPA="_WPA_" + === modified file 'packages/initscripts/acme/wireless-tools/wireless' (properties changed) --- packages/initscripts/acme/wireless-tools/wireless 2007-07-05 08:04:45 +0000 +++ packages/initscripts/acme/wireless-tools/wireless 2008-07-22 16:47:34 +0000 @@ -4,66 +4,81 @@ . /etc/init.d/functions.sh DEV="" case "$1" in - start) + start) for a in $(/bin/cat /proc/net/dev|/bin/grep : | /usr/bin/cut -d: -f1) do if [ $a = "rausb0" ] - then + then DEV=$a fi - + if [ $a = "wlan0" ] then DEV=$a fi done - - - + + + if [ $DEV = "" ] then echo "No Wifi to bring up" exit 0 fi - + begin "Bringing up $DEV" - + # start the net device /sbin/ifconfig $DEV $IP netmask $SUBNET 2> /dev/null if [ $? = 0 ] then information "IP: $IP" - # set the known wep keys - information "WEP: $KEY" - /usr/sbin/iwconfig $DEV key $KEY [1] + + #WEP or WPA + if [ $WPA = "" ] + then + # set the known wep keys + information "WEP: $KEY" + /usr/sbin/iwconfig $DEV key $KEY [1] + else + #use WPA + information "WPA: $WPA" + iwpriv $DEV set AuthMode=WPAPSK + iwpriv $DEV set EncrypType=TKIP + fi # start the wireless connex information "Channel: $CHANNEL" information "ESSID: $ESSID" - information "Mode: $MODE" + information "Mode: $MODE" /usr/sbin/iwconfig $DEV mode $MODE - /usr/sbin/iwconfig $DEV essid $ESSID + /usr/sbin/iwconfig $DEV essid $ESSID /usr/sbin/iwconfig $DEV rate 54 /usr/sbin/iwconfig $DEV channel $CHANNEL - + #dirty workaround to get the d-link C1 to find the host :-( - /usr/sbin/iwconfig $DEV essid $ESSID - /usr/sbin/iwconfig $DEV essid $ESSID - /usr/sbin/iwconfig $DEV essid $ESSID - /usr/sbin/iwconfig $DEV essid $ESSID - /usr/sbin/iwconfig $DEV essid $ESSID - /usr/sbin/iwconfig $DEV essid $ESSID - #end of dirty work around + /usr/sbin/iwconfig $DEV essid $ESSID + /usr/sbin/iwconfig $DEV essid $ESSID + /usr/sbin/iwconfig $DEV essid $ESSID + /usr/sbin/iwconfig $DEV essid $ESSID + /usr/sbin/iwconfig $DEV essid $ESSID + /usr/sbin/iwconfig $DEV essid $ESSID + #end of dirty work around + + if [ $WPA != "" ] + then + iwpriv $DEV set WPAPSK=$WPA + fi # use wifi as default roue ? if [ $WIFI_DEFAULT = "1" ] then information "Gateway: $WIFI_GATEWAY" route del default - route add default gw $WIFI_GATEWAY dev $DEV + route add default gw $WIFI_GATEWAY dev $DEV fi end 0 - else + else information "$DEV was not found" end 1 fi === modified file 'configure-files/common/AC_common-tag--devboard-R2_01' --- configure-files/common/AC_common-tag--devboard-R2_01 2007-09-18 18:01:44 +0000 +++ configure-files/common/AC_common-tag--devboard-R2_01 2008-07-22 15:52:19 +0000 @@ -30,22 +30,22 @@ config NETWORK_INTERFACES int - default 1 - + default 1 + config PRODUCT_TYPE_developer - bool + bool default y config PRODUCT_TYPE_NAME - string + string default "Developer Board" if PRODUCT_TYPE_developer config PRODUCT_FULL_NAME - string + string default "FOX" config PRODUCT_WEB_URL - string + string default "http://developer.axis.com/" if PRODUCT_TYPE_developer config PRODUCT_HWID @@ -53,21 +53,21 @@ default "1.0" config PRODUCT_CGI_PATH - string + string default "axis-cgi" ######################################################################### -choice +choice prompt "ACME FOXBOARD selection" default ACME_BRD_MCM config ACME_BRD_MCM bool "FOXBOARD Classic (MCM)" - + config ACME_BRD_LX416 bool "FOXBOARD LX416" - + config ACME_BRD_LX816 bool "FOXBOARD LX816" @@ -133,14 +133,14 @@ bool "Enable WLAN support" default N -menu "Wireless networking (WLAN)" +menu "Wireless networking (WLAN)" depends on ACME_WIFI config ACME_WIRELESS_TOOLS depends on ACME_WIFI bool "wireless tools" -choice +choice prompt "DLink DWL-G122" default ACME_DLINK_NONE @@ -185,10 +185,10 @@ config ACME_FB_NO bool "No" - + config ACME_FB_YES bool "Yes" - + endchoice choice @@ -197,16 +197,16 @@ depends on ACME_FB_YES config ACME_KEY_NONE bool "Default" - + config ACME_KEY_GER bool "German" - + config ACME_KEY_IT bool "Italian" - + config ACME_KEY_FR bool "French" - + endchoice config BLUEZ @@ -217,13 +217,13 @@ Select this to include support for BlueZ libraries and tools. config ACME_OPENOBEX - bool "OpenObex" + bool "OpenObex" depends on LINUX_2_6_X default n depends on BLUEZ config ACME_USSP_PUSH - bool "ussp-push" + bool "ussp-push" depends on LINUX_2_6_X default n depends on BLUEZ @@ -259,13 +259,13 @@ choice prompt "Proto" depends on ACME_IP_CUSTOM - + config ACME_IP_STATIC bool "Static IP" - + config ACME_IP_DHCP bool "DHCP" - + endchoice config ACME_IP_IP @@ -277,7 +277,7 @@ string "Broadcast" default "192.168.0.255" depends ACME_IP_STATIC - + config ACME_IP_GATEWAY string "Gateway" default "192.168.0.1" @@ -306,13 +306,13 @@ choice prompt "WLAN mode" depends on ACME_WIFI - + config ACME_WLAN_ADHOC bool "Ad-Hoc" - + config ACME_WLAN_MANAGED bool "Managed" - + endchoice choice @@ -324,7 +324,7 @@ config ACME_WLAN_KEY_ENABLE bool "Enable" - + endchoice config ACME_WLAN_KEY @@ -332,6 +332,24 @@ default "s:abcdefghijklm" depends on ACME_WLAN_KEY_ENABLE +choice + prompt "WPA key" + depends on ACME_WIFI + +config ACME_WLAN_WPA_NONE + bool "NONE" + +config ACME_WLAN_WPA_ENABLE + bool "Enable" + +endchoice + +config ACME_WLAN_WPA + string "WPAKey" + default "mykey" + depends on ACME_WLAN_WPA_ENABLE + + config ACME_WLAN_IP string "IP" default "192.168.10.90" @@ -343,12 +361,12 @@ config ACME_WLAN_DEFAULT bool "Use WLAN as default route ?" default "n" - + config ACME_WLAN_GATEWAY string "Gateway" depends on ACME_WLAN_DEFAULT default "192.168.10.1" - + endmenu menu "Nameserver Settings" @@ -473,7 +491,7 @@ config ACME_FBGRAB bool "fox_fbgrab tool" - + config ACME_FBCTL bool "fb_ctl tool" @@ -541,9 +559,9 @@ endmenu config ACME_KLONE_WEB - bool "Enable Klone - fox-vhdld" + bool "Enable Klone - fox-vhdld" depends on ACME_VHDL - + config ACME_KLONE_DEMO bool "Enable Klone - fox-demod" @@ -552,7 +570,7 @@ config ACME_RSS_READER bool "Enable rssreader" - + config ACME_FPKG bool "Enable fpkg tool" @@ -737,7 +755,7 @@ depends on PRODUCT_TYPE_developer default n help - Select this to create SCSI device nodes. Needed for USB Mass + Select this to create SCSI device nodes. Needed for USB Mass Storage. config TTYUSB_DEV_NODE @@ -745,7 +763,7 @@ depends on PRODUCT_TYPE_developer default n help - Select this to create TTYUSB device nodes. Needed for USB serial + Select this to create TTYUSB device nodes. Needed for USB serial converter products. endmenu @@ -764,7 +782,7 @@ opt_source configure-files/devboard/AC_common config PROCESSOR_etrax_100lx - bool + bool default y help Select this for ETRAX 100LX based products. @@ -772,7 +790,7 @@ #----------------------------------------------------------------------------- config CONTROL_BUTTON_A1 - bool + bool default y help Select this if the control button is connected to pin 1 on general @@ -798,7 +816,7 @@ #----------------------------------------------------------------------------- config PARTITION_TABLE_USB_DEVICE_FS bool "USB Device Filesystem" - depends on PARTITION_TABLE + depends on PARTITION_TABLE help Select this to enable USB Device Filesystem support. @@ -815,11 +833,11 @@ default n -choice +choice prompt "Manually partition FOX" depends on PARTITION_TABLE default ACME_PART_NO - + config ACME_PART_YES bool "Yes" @@ -828,11 +846,11 @@ endchoice -choice +choice prompt "Partition the FOX for 4MB Flash to" depends on (ACME_BRD_LX416 ||ACME_BRD_MCM) && ACME_PART_NO default ACME_PART_35_05 - + config ACME_PART_30_10 bool "0x300000 - 0x0F0000 (3,0MB - 1,0MB)" @@ -841,11 +859,11 @@ endchoice -choice +choice prompt "Partition the FOX for 8MB Flash to ro - rw" depends on (ACME_BRD_LX816 || ACME_BRD_LX832 || ACME_BRD_LX864) && ACME_PART_NO default ACME_PART_30_50 - + config ACME_PART_35_45 bool "0x350000 - 0x4A0000 (3,5MB - 4,5MB)" @@ -865,7 +883,7 @@ config PARTITION_TABLE_FLASH1_SIZE - hex + hex depends on PARTITION_TABLE && ACME_PART_NO default 0x300000 if ACME_PART_30_10 default 0x350000 if ACME_PART_35_05 @@ -899,8 +917,8 @@ config PARTITION_TABLE_FLASH2_SIZE hex "Flash2 size" depends on PARTITION_TABLE && ACME_PART_YES - default 0x4A0000 if ACME_BRD_LX816 || ACME_BRD_LX832 || ACME_BRD_LX864 - default 0x0A0000 if ACME_BRD_LX416 ||ACME_BRD_MCM + default 0x4A0000 if ACME_BRD_LX816 || ACME_BRD_LX832 || ACME_BRD_LX864 + default 0x0A0000 if ACME_BRD_LX416 ||ACME_BRD_MCM help Specify the size of the flash2 partition (writable). This partition contains configuration files and other dynamic