[oe-commits] org.oe.dev merge of '674974b81d2da7e7d81070dc38e8b163632c887e'

[hrw commit]

merge of '674974b81d2da7e7d81070dc38e8b163632c887e'
     and '89afd3974ed8a86d2683d1222dcb1c60b2295772'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 477ae0076f30be01a0a3ccbeffc47b13efb2b7c4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=477ae0076f30be01a0a3ccbeffc47b13efb2b7c4
Files:
1
packages/misc-binary-only/prism3-firmware_1.8.3.bb
packages/misc-binary-only/prism3-firmware_1.8.4.bb
packages/prism3-support
packages/prism3-support/files
packages/prism3-support/files/hostap-fw-load
packages/prism3-support/prism3-support_1.0.0.bb
packages/misc-binary-only/prism-firmware
packages/misc-binary-only/prism-firmware/hostap.rules
packages/misc-binary-only/prism-firmware/prism-fw.sh
packages/misc-binary-only/prism-firmware.bb
packages/tasks/task-base.bb
packages/angstrom/angstrom-gateway-image.bb
packages/images/angstrom-minimal-image.bb
Diffs:

#
# mt diff -r674974b81d2da7e7d81070dc38e8b163632c887e -r477ae0076f30be01a0a3ccbeffc47b13efb2b7c4
#
# 
# 
# delete "packages/misc-binary-only/prism3-firmware_1.8.3.bb"
# 
# delete "packages/misc-binary-only/prism3-firmware_1.8.4.bb"
# 
# delete "packages/prism3-support"
# 
# delete "packages/prism3-support/files"
# 
# delete "packages/prism3-support/files/hostap-fw-load"
# 
# delete "packages/prism3-support/prism3-support_1.0.0.bb"
# 
# add_dir "packages/misc-binary-only/prism-firmware"
# 
# add_file "packages/misc-binary-only/prism-firmware/hostap.rules"
#  content [10ae5a1b14e578529d90691b9a9ac2a4a651add3]
# 
# add_file "packages/misc-binary-only/prism-firmware/prism-fw.sh"
#  content [ed6da5e3dd46ca45d08a8d3ce06ebae375d2d62d]
# 
# add_file "packages/misc-binary-only/prism-firmware.bb"
#  content [02755d031b0c3ad6bdf57da16e35300b34992abf]
# 
# patch "packages/tasks/task-base.bb"
#  from [cc21b03ea34f69a2d4ea66e043efbde612643618]
#    to [3514d4e6a1530da85764ea0064424f2cb95b4e98]
# 
============================================================
--- packages/misc-binary-only/prism-firmware/hostap.rules	10ae5a1b14e578529d90691b9a9ac2a4a651add3
+++ packages/misc-binary-only/prism-firmware/hostap.rules	10ae5a1b14e578529d90691b9a9ac2a4a651add3
@@ -0,0 +1,4 @@
+#
+# update firmware on Prism cards (load it to RAM, not to Flash)
+#
+SUBSYSTEM=="net", KERNEL=="wlan*" RUN="/lib/udev/prism-fw.sh"
============================================================
--- packages/misc-binary-only/prism-firmware/prism-fw.sh	ed6da5e3dd46ca45d08a8d3ce06ebae375d2d62d
+++ packages/misc-binary-only/prism-firmware/prism-fw.sh	ed6da5e3dd46ca45d08a8d3ce06ebae375d2d62d
@@ -0,0 +1,33 @@
+#!/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
+
+if [ $CARD_ID = '800c' ] || [ $CARD_ID = '8013' ] || [ $CARD_ID = '8017' ] || \
+   [ $CARD_ID = '801b' ] || [ $CARD_ID = '8022' ] || [ $CARD_ID = '8023' ] ; then
+        PRI=/lib/firmware/ak010104.hex 
+elif [ $CARD_ID = '800b' ] || [ $CARD_ID = '8012' ] || [ $CARD_ID = '8016' ] || \
+     [ $CARD_ID = '801a' ] ; then
+        PRI=/lib/firmware/af010104.hex 
+elif [ $CARD_ID = '800e' ] || [ $CARD_ID = '8015' ] || [ $CARD_ID = '8019' ] || \
+     [ $CARD_ID = '801d' ] ; then
+        PRI=/lib/firmware/pm010102.hex 
+fi
+
+DIR=/proc/net/hostap/wlan0  
+
+if [ ! -d $DIR ]; then
+    exit 1 
+fi
+
+if grep -q no_pri=1 $DIR/debug; then
+    /usr/sbin/prism2_srec -gs wlan0 $PRI   
+    /usr/sbin/prism2_srec -gp wlan0 $PRI 
+fi
+
+if grep -q pri_only=0 $DIR/debug; then
+    /usr/sbin/prism2_srec -rp wlan0 $STA
+fi
============================================================
--- packages/misc-binary-only/prism-firmware.bb	02755d031b0c3ad6bdf57da16e35300b34992abf
+++ packages/misc-binary-only/prism-firmware.bb	02755d031b0c3ad6bdf57da16e35300b34992abf
@@ -0,0 +1,30 @@
+DESCRIPTION = "Firmware for the Prism 2.x/3 cards"
+SECTION = "base"
+LICENSE = "closed"
+RDEPENDS = "hostap-utils"
+RREPLACES = "prism3-firmware prism3-support"
+RCONFLICTS = "prism3-firmware prism3-support"
+PACKAGE_ARCH = "all"
+PR = "r1"
+
+SRC_URI = "http://www.red-bean.com/~proski/firmware/Latest-prism.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 0755 ${WORKDIR}/prism-fw.sh ${D}${base_libdir}/udev/
+	install -m 0644 ${WORKDIR}/hostap.rules ${D}${sysconfdir}/udev/rules.d/
+}
+
+PACKAGES = "${PN}"
+FILES_${PN} += "${base_libdir}"
============================================================
--- packages/tasks/task-base.bb	cc21b03ea34f69a2d4ea66e043efbde612643618
+++ packages/tasks/task-base.bb	3514d4e6a1530da85764ea0064424f2cb95b4e98
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r36"
+PR = "r37"
 
 DEPENDS = "task-boot"
 PROVIDES = "${PACKAGES}"
@@ -196,8 +196,7 @@ RDEPENDS_task-base-pcmcia = "\
 
 RDEPENDS_task-base-pcmcia = "\
     ${PCMCIA_MANAGER} \
-    ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism3-firmware', '',d)} \
-    ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism3-support', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} \
     "
 


#
# mt diff -r89afd3974ed8a86d2683d1222dcb1c60b2295772 -r477ae0076f30be01a0a3ccbeffc47b13efb2b7c4
#
# 
# 
# add_file "packages/angstrom/angstrom-gateway-image.bb"
#  content [0d28af15cf07cfbde7e6a5b3c5f6c40800846eff]
# 
# patch "packages/images/angstrom-minimal-image.bb"
#  from [3e2cd1b1fa9314aaa1212f5a743e836114f1e2ed]
#    to [c54fc3e4bfd625850981cbc316b0e61d8d1d48d3]
# 
============================================================
--- packages/angstrom/angstrom-gateway-image.bb	0d28af15cf07cfbde7e6a5b3c5f6c40800846eff
+++ packages/angstrom/angstrom-gateway-image.bb	0d28af15cf07cfbde7e6a5b3c5f6c40800846eff
@@ -0,0 +1,23 @@
+#Angstrom gateway image
+#gives you a gateway with SMB, ssh and dnsmasqs
+LICENSE = "MIT"
+PR = "r0"
+
+ANGSTROM_EXTRA_INSTALL ?= ""
+DISTRO_SSH_DAEMON ?= "dropbear"
+
+RDEPENDS = "task-boot \
+            ${DISTRO_SSH_DAEMON} \
+            iptables \
+            samba swat \
+            dnsmasq \
+#            vsftpd \
+            angstrom-version \
+	   "
+
+export IMAGE_BASENAME = "gateway-image"
+export IMAGE_LINGUAS = ""
+export PACKAGE_INSTALL = "${RDEPENDS}"
+
+inherit image
+
============================================================
--- packages/images/angstrom-minimal-image.bb	3e2cd1b1fa9314aaa1212f5a743e836114f1e2ed
+++ packages/images/angstrom-minimal-image.bb	c54fc3e4bfd625850981cbc316b0e61d8d1d48d3
@@ -1,13 +1,15 @@ LICENSE = "MIT"
 #Angstrom minimalist image
 #gives you a small images with ssh access
 LICENSE = "MIT"
-PR = "r1"
+PR = "r3"
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 DISTRO_SSH_DAEMON ?= "dropbear"
+IMAGE_LINGUAS = " "
 
 RDEPENDS = "task-boot \
             ${DISTRO_SSH_DAEMON} \
+            angstrom-version \
 	   "
 
 export IMAGE_BASENAME = "minimalist-image"