[oe-commits] org.oe.dev misc-binary-only/prism-firmware.bb : use non broken prism firmware. This

[xora commit]

misc-binary-only/prism-firmware.bb : use non broken prism firmware. This
should ease the connection problems people reported with 1.8.4 and
improve kismetting

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: a5a7ee9814548b1e054d96cea845556c4b5c39e9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a5a7ee9814548b1e054d96cea845556c4b5c39e9
Files:
1
packages/misc-binary-only/prism-firmware/prism-fw.sh
packages/misc-binary-only/prism-firmware.bb
Diffs:

#
# mt diff -rcee1094caff87c8003275dbb13c483c2f4b4ef15 -ra5a7ee9814548b1e054d96cea845556c4b5c39e9
#
# 
# 
# patch "packages/misc-binary-only/prism-firmware/prism-fw.sh"
#  from [01e11a8fd115fe200d3ca578cffcccf33adc81ec]
#    to [c3edfabe4b87f2b640d2d15ae6c4532f95994de5]
# 
# patch "packages/misc-binary-only/prism-firmware.bb"
#  from [bbfdfcf3d5affba9aa4c8e106eb545485f9069b6]
#    to [c6119706ca5818c93a5cd774212d8f6c9c8b0d4b]
# 
============================================================
--- packages/misc-binary-only/prism-firmware/prism-fw.sh	01e11a8fd115fe200d3ca578cffcccf33adc81ec
+++ packages/misc-binary-only/prism-firmware/prism-fw.sh	c3edfabe4b87f2b640d2d15ae6c4532f95994de5
@@ -1,10 +1,10 @@ PRI=/lib/firmware/pm010102.hex 
 #!/bin/sh
 
 CARD_ID=`/usr/sbin/hostap_diag $INTERFACE|grep NICID|awk '{print $2}'|sed -e 's/id=0x//'`
 
 # 801d cards lack even Primary firmware so we cannot use hostap_diag
 PRI=/lib/firmware/pm010102.hex 
-STA=/lib/firmware/rf010804.hex
+STA=/lib/firmware/rf010704.hex
 
 if [ $CARD_ID = '800c' ] || [ $CARD_ID = '8013' ] || [ $CARD_ID = '8017' ] || \
    [ $CARD_ID = '801b' ] || [ $CARD_ID = '8022' ] || [ $CARD_ID = '8023' ] ; then
============================================================
--- packages/misc-binary-only/prism-firmware.bb	bbfdfcf3d5affba9aa4c8e106eb545485f9069b6
+++ packages/misc-binary-only/prism-firmware.bb	c6119706ca5818c93a5cd774212d8f6c9c8b0d4b
@@ -5,23 +5,25 @@ PACKAGE_ARCH = "all"
 RREPLACES = "prism3-firmware prism3-support"
 RCONFLICTS = "prism3-firmware prism3-support"
 PACKAGE_ARCH = "all"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "http://www.red-bean.com/~proski/firmware/Latest-prism.tar.bz2 \
+SRC_URI = "http://www.red-bean.com/~proski/firmware/primary.tar.bz2 \
+           http://www.red-bean.com/~proski/firmware/1.7.4.tar.bz2 \
            file://prism-fw.sh \
 	   file://hostap.rules"
 
-S = "${WORKDIR}/Latest-prism/"
-
 do_install() {
 	install -d ${D}${base_libdir}/firmware/
 	install -d ${D}${base_libdir}/udev/
 	install -d ${D}${sysconfdir}/pcmcia/
 	install -d ${D}${sysconfdir}/udev/rules.d/
 
-	install -m 0644 primary-RAM/*.hex ${D}${base_libdir}/firmware/
-	install -m 0644 secondary-RAM/rf010804.hex ${D}${base_libdir}/firmware/
+	install -m 0644 ${WORKDIR}/primary/af010104.hex ${D}${base_libdir}/firmware/
+	install -m 0644 ${WORKDIR}/primary/ak010104.hex ${D}${base_libdir}/firmware/
+	install -m 0644 ${WORKDIR}/primary/pm010102.hex ${D}${base_libdir}/firmware/
 
+	install -m 0644 ${WORKDIR}/1.7.4/rf010704.hex ${D}${base_libdir}/firmware/
+
 	install -m 0755 ${WORKDIR}/prism-fw.sh ${D}${base_libdir}/udev/
 	install -m 0644 ${WORKDIR}/hostap.rules ${D}${sysconfdir}/udev/rules.d/
 }