# HG changeset patch
# User Rohit Joshi <jozee@slitaz.org>
# Date 1268826511 0
# Node ID 92fe53b748bb94b02684924b0e00faf0ad6e5327
# Parent  7e4cec027e34ec8d2a6ca43e1b9b4c6121a87b5f
wifi-firmare: improve wget_urls; add support for fw-only install; distribute free fw

diff -r 7e4cec027e34 -r 92fe53b748bb get-wifi-firmware/receipt
--- a/get-wifi-firmware/receipt	Tue Mar 16 18:06:21 2010 +0000
+++ b/get-wifi-firmware/receipt	Wed Mar 17 11:48:31 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="get-wifi-firmware"
-VERSION="1.0"
+VERSION="2.0"
 CATEGORY="non-free"
 SHORT_DESC="Get misc wifi firmwares."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -13,8 +13,21 @@
 	mkdir -p $fs/usr/bin
 	cp stuff/$PACKAGE $fs/usr/bin
 	for i in b43 b43legacy ipw2100 ipw2200 rt61 rt73 rt2860 zd1211 \
-		 rt61pci rt73usb zd1211rw \
-		 iwlwifi-3945 iwlwifi-4965 iwlwifi-5000; do
+		 rt61pci rt73usb rt2870usb zd1211rw \
+		 iwlwifi-3945 iwlwifi-4965 iwlwifi-5000 iwlwifi-5150 iwlwifi-1000 iwlwifi-6000; do
 		ln -s $PACKAGE $fs/usr/bin/get-$i-firmware
 	done
 }
+
+post_install()
+{
+  # directly support some freely distributable firmware drivers 
+  # intel
+  get-iwlwifi-3945-firmware --firmware
+  get-iwlwifi-4965-firmware --firmware
+  get-iwlwifi-5000-firmware --firmware
+  # ralink
+  get-rt61-firmware --firmware
+  get-rt73-firmware --firmware
+  get-rt2870usb-firmware --firmware
+}
diff -r 7e4cec027e34 -r 92fe53b748bb get-wifi-firmware/stuff/get-wifi-firmware
--- a/get-wifi-firmware/stuff/get-wifi-firmware	Tue Mar 16 18:06:21 2010 +0000
+++ b/get-wifi-firmware/stuff/get-wifi-firmware	Wed Mar 17 11:48:31 2010 +0000
@@ -24,16 +24,16 @@
 	FWSET=wl_apsta-$VERSION.o
 	;;
 ipw2100)
-	VERSION=1.3-6.0.1
+	VERSION=1.3
 	SHORT_DESC="Intel PRO/Wireless 2100 firmware."
 	WEB_SITE="http://$MODULE.sourceforge.net/"
-	WGET_URL="http://dl.atrpms.net/all/$PKG-$VERSION.noarch.rpm"
+	WGET_URL="http://bughost.org/firmware/${MODULE}-fw-${VERSION}.tgz"
 	;;
 ipw2200)
-	VERSION=3.0-9.0.1
+	VERSION=3.1
 	SHORT_DESC="Intel PRO/Wireless 2200BG firmware."
 	WEB_SITE="http://$MODULE.sourceforge.net/"
-	WGET_URL="http://dl.atrpms.net/all/$PKG-$VERSION.noarch.rpm"
+	WGET_URL="http://bughost.org/firmware/${MODULE}-fw-${VERSION}.tgz"
 	;;
 iwlwifi-3945)
 	VERSION=15.32.2.9
@@ -83,6 +83,12 @@
 	WEB_SITE="http://www.ralinktech.com/"
 	WGET_URL="ftp://ftp.archlinux.org/other/rt2x00-rt71w-fw/RT71W_Firmware_V${VERSION}.zip"
 	;;
+rt2870usb)
+	VERSION=8
+	SHORT_DESC="RaLink RT2870USB (RT2870/RT2770) WiFi adapter."
+	WEB_SITE="http://www.ralinktech.com/"
+	WGET_URL="ftp://ftp.archlinux.org/other/${MODULE}-fw/RT2870_Firmware_V${VERSION}.zip"
+	;;
 zd1211|zd1211rw)
 	VERSION=2.16.0.0-0.1
 	SHORT_DESC="zd1211/zd1211rw Wireless Lan firmware."
@@ -144,16 +150,18 @@
 esac
 	
 # Create pseudo package
-mkdir -p $PKG-$VERSION/fs/lib/firmware
+mkdir -p $PKG-$VERSION/fs/lib/firmware $PKG-$VERSION/fs/usr/share/licenses
 case "$MODULE" in 
 b43*)	b43-fwcutter -w "$PKG-$VERSION/fs/lib/firmware" $FWSET;;
-ipw*)	rm -f lib/firmware/*LICENSE*
-	mv lib/firmware/* $PKG-$VERSION/fs/lib/firmware;;
-rt61|rt61pci|rt2860)
-	mv RT*_Firmware_V$VERSION/*.bin $PKG-$VERSION/fs/lib/firmware;;
-rt73|rt73usb)
-	mv RT73_Linux_STA_Drv$VERSION/Module/rt73.bin $PKG-$VERSION/fs/lib/firmware;;
-iwlwifi*) mv iwlwifi*/iwlwifi*.ucode $PKG-$VERSION/fs/lib/firmware;;
+ipw2200)	cp ${MODULE}-fw-$VERSION/*LICENSE* $PKG-$VERSION/fs/usr/share/licenses/intel-$MODULE-LICENSE.txt
+			mv ${MODULE}-fw-$VERSION/* $PKG-$VERSION/fs/lib/firmware;;
+ipw2100)	cp *LICENSE* $PKG-$VERSION/fs/usr/share/licenses/intel-$MODULE-LICENSE.txt
+			mv *.fw* *LICENSE* $PKG-$VERSION/fs/lib/firmware;;
+rt*)
+	mv RT*_Firmware_V$VERSION/*.bin $PKG-$VERSION/fs/lib/firmware
+	mv RT*_Firmware_V$VERSION/*LICENSE* $PKG-$VERSION/fs/usr/share/licenses/ralink-rt61-LICENSE.txt;;
+iwlwifi*) mv iwlwifi*/iwlwifi*.ucode $PKG-$VERSION/fs/lib/firmware
+		  mv iwlwifi*/*LICENSE* $PKG-$VERSION/fs/usr/share/licenses/intel-iwlwifi-LICENSE.txt	;;
 zd1211|zd1211rw)
 	mv lib/firmware/zd1211 $PKG-$VERSION/fs/lib/firmware 
 	for i in $(cd usr/lib/hotplug/firmware; ls); do
@@ -182,23 +190,31 @@
 cd $TOP
 rm -rf $TMP
 
-# Check if we need wpa_supplicant
-. $ROOT/etc/network.conf
-if [ $WIFI_KEY_TYPE = "wpa" ] || [ $WIFI_KEY_TYPE = "WPA" ]; then
-	if [ ! -d $ROOT/var/lib/tazpkg/installed/wpa_supplicant ]; then
-		tazpkg get-install wpa_supplicant --root=$ROOT
+if [ "$1" == "--firmware" ] ; then 
+    echo "just install firmare: yes"
+    JUST_INSTALL_FIRMWARE="yes"
+fi
+
+if [ ! "$JUST_INSTALL_FIRMWARE" == "yes" ]; then
+	echo "configuring and loading module ..."
+	# Check if we need wpa_supplicant
+	. $ROOT/etc/network.conf
+	if [ $WIFI_KEY_TYPE = "wpa" ] || [ $WIFI_KEY_TYPE = "WPA" ]; then
+		if [ ! -d $ROOT/var/lib/tazpkg/installed/wpa_supplicant ]; then
+			tazpkg get-install wpa_supplicant --root=$ROOT
+		fi
+	fi
+
+	# Configure /etc/network.conf and start connexion
+	sed -i s/'WIFI="no"'/'WIFI="yes"'/ $ROOT/etc/network.conf
+
+	# Load module
+	if [ -z "$ROOT" -a -n "$(modprobe -l $MODULE)" ]; then
+		echo "Loading module: $MODULE..."
+		if modprobe $MODULE ; then
+			sleep 2
+			/etc/init.d/network.sh restart
+		fi
 	fi
 fi
 
-# Configure /etc/network.conf and start connexion
-sed -i s/'WIFI="no"'/'WIFI="yes"'/ $ROOT/etc/network.conf
-
-# Load module
-if [ -z "$ROOT" -a -n "$(modprobe -l $MODULE)" ]; then
-	echo "Loading module: $MODULE..."
-	if modprobe $MODULE ; then
-		sleep 2
-		/etc/init.d/network.sh restart
-	fi
-fi
-