[oe-commits] Koen Kooi : uhd-firmare: update to 3.2.1

[git version control]

Module: meta-openembedded.git
Branch: master
Commit: 83f4dd214f8f652512cec0033c3506013d845816
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=83f4dd214f8f652512cec0033c3506013d845816

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Tue Aug  2 18:31:15 2011 +0200

uhd-firmare: update to 3.2.1

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 meta-oe/recipes-connectivity/uhd/uhd-firmware.inc  |    5 ++++-
 .../uhd/uhd-firmware_003.001.000.bb                |   10 ----------
 .../uhd/uhd-firmware_003.002.001.bb                |   10 ++++++++++
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/meta-oe/recipes-connectivity/uhd/uhd-firmware.inc b/meta-oe/recipes-connectivity/uhd/uhd-firmware.inc
index 40ef590..24dfae4 100644
--- a/meta-oe/recipes-connectivity/uhd/uhd-firmware.inc
+++ b/meta-oe/recipes-connectivity/uhd/uhd-firmware.inc
@@ -4,7 +4,7 @@ LICENSE = "GPLv3"
 
 INC_PR = "r0"
 
-PACKAGE_ARCH = "all"
+inherit allarch
 
 SRC_URI = "http://www.ettus.com/downloads/uhd_releases/${PV}/images-only/UHD-images-${PVdots}.tar.gz"
 
@@ -12,6 +12,9 @@ S = "${WORKDIR}/UHD-images-${PVdots}"
 
 do_install() {
 	install -d ${D}${datadir}/uhd/images
+	install -d ${D}${datadir}/uhd/images/bit
+	install -m 0644 ${S}/share/uhd/images/bit/* ${D}${datadir}/uhd/images/bit
+	rm -rf ${S}/share/uhd/images/bit
 	install -m 0644 ${S}/share/uhd/images/* ${D}${datadir}/uhd/images
 }
 
diff --git a/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.001.000.bb b/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.001.000.bb
deleted file mode 100644
index 549445e..0000000
--- a/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.001.000.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require uhd-firmware.inc
-LIC_FILES_CHKSUM = "file://share/uhd/images/usrp_e100_fpga.bin;md5=f4e787828ebe5a886be67fe9fb71cc61"
-
-PV = "003_001_000"
-PVdots = "003.001.000"
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "0d6a6792c6b98e9163d67cb62bf29dce"
-SRC_URI[sha256sum] = "3b25726946026c6d25061403e3343d72b34cc41e7e44026b272510379d01233a"
-
diff --git a/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.002.001.bb b/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.002.001.bb
new file mode 100644
index 0000000..0c70e19
--- /dev/null
+++ b/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.002.001.bb
@@ -0,0 +1,10 @@
+require uhd-firmware.inc
+LIC_FILES_CHKSUM = "file://share/uhd/images/usrp_e100_fpga_v2.bin;md5=ea9a4b4421aeeca7c864fd8ca6dd73dd"
+
+PV = "003_002_001"
+PVdots = "003.002.001"
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "1894391da027884e5eed474606250be9"
+SRC_URI[sha256sum] = "c194d9e30bb02225de623400bdba9be9200f70a57c6220506bc0b051eed8fae8"
+