summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-09-03 16:19:06 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-09-03 16:19:06 +0000
commitb277442ca6f4a0648fe5cfdd33b5a6b5f24f55ee (patch)
tree2b5afff15f5ec0eda9f0f9caf5c043f12adf197f
parent5c6262bc5a3b1ed73553a4f3e40f324a2a7772ad (diff)
parente3c570ae9c1f668acd8499b9c5849235ffd77dd8 (diff)
merge of '14dd1ebc66d8ff7879e828544c4b811a8b57489a'
and '1b8907dc6ebfe86113a2413b6b55a43e8b7a1add'
-rw-r--r--packages/misc-binary-only/prism-firmware.bb14
-rw-r--r--packages/misc-binary-only/prism-firmware/prism-fw.sh2
2 files changed, 9 insertions, 7 deletions
diff --git a/packages/misc-binary-only/prism-firmware.bb b/packages/misc-binary-only/prism-firmware.bb
index fefdb0ae22..903c55e15e 100644
--- a/packages/misc-binary-only/prism-firmware.bb
+++ b/packages/misc-binary-only/prism-firmware.bb
@@ -5,22 +5,24 @@ RDEPENDS = "hostap-utils"
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/
diff --git a/packages/misc-binary-only/prism-firmware/prism-fw.sh b/packages/misc-binary-only/prism-firmware/prism-fw.sh
index 96a2457f33..619f612be1 100644
--- a/packages/misc-binary-only/prism-firmware/prism-fw.sh
+++ b/packages/misc-binary-only/prism-firmware/prism-fw.sh
@@ -4,7 +4,7 @@ CARD_ID=`/usr/sbin/hostap_diag $INTERFACE|grep NICID|awk '{print $2}'|sed -e 's/
# 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