aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity
diff options
context:
space:
mode:
authorPhilip Balister <philip@balister.org>2012-11-24 10:39:04 -0500
committerMartin Jansa <Martin.Jansa@gmail.com>2013-01-18 10:49:42 +0100
commit6bd7221787b977e45470354b1c22b8114981b9d2 (patch)
treeb08ec7b8626d9f41c8d83bc64d0ed086c5c44dfa /meta-oe/recipes-connectivity
parent8e14e61272ca401e64212c99a853b3b6ccee7894 (diff)
downloadmeta-openembedded-6bd7221787b977e45470354b1c22b8114981b9d2.tar.gz
uhd : Update to version 3.5.0.
This version drops the usrp E100 utilities. Also, the recipe depends on python-cheetah-native now. Signed-off-by: Philip Balister <philip@balister.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
-rw-r--r--meta-oe/recipes-connectivity/uhd/uhd.inc7
-rw-r--r--meta-oe/recipes-connectivity/uhd/uhd_git.bb6
2 files changed, 6 insertions, 7 deletions
diff --git a/meta-oe/recipes-connectivity/uhd/uhd.inc b/meta-oe/recipes-connectivity/uhd/uhd.inc
index c237a96931..d3cc4c8587 100644
--- a/meta-oe/recipes-connectivity/uhd/uhd.inc
+++ b/meta-oe/recipes-connectivity/uhd/uhd.inc
@@ -1,9 +1,9 @@
DESCRIPTION = "Universal Hardware Driver for Ettus Research products."
HOMEPAGE = "http://www.ettus.com"
-LICENSE = "GPLV3+"
+LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=51b35d652c070d136bf20244494be2d3"
-DEPENDS = "git-native boost libusb1 uhd-firmware orc-native"
+DEPENDS = "git-native python-cheetah-native boost libusb1 uhd-firmware orc-native"
RDEPENDS_${PN} += "uhd-firmware"
PE = "1"
@@ -18,7 +18,6 @@ INSANE_SKIP_${PN} = "dev-so"
FILES_${PN} += "${libdir}/libuhd.so \
${datadir}/uhd/utils/*"
FILES_${PN}-tests += "${datadir}/uhd/tests/*"
-FILES_${PN}-e1xx += "${datadir}/uhd/usrp_e_utils/*"
FILES_${PN}-dbg += "${datadir}/uhd/examples/.debug/* \
${datadir}/uhd/utils/.debug/* \
${datadir}/uhd/tests/.debug/* \
@@ -28,6 +27,6 @@ FILES_${PN}-examples = "${datadir}/uhd/examples/*"
OECMAKE_BUILDPATH = "${S}/build"
OECMAKE_SOURCEPATH = "${S}"
-EXTRA_OECMAKE = "-DENABLE_E100=TRUE -DENABLE_USRP_E_UTILS=TRUE"
+EXTRA_OECMAKE = "-DENABLE_E100=TRUE"
EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}"
diff --git a/meta-oe/recipes-connectivity/uhd/uhd_git.bb b/meta-oe/recipes-connectivity/uhd/uhd_git.bb
index e740ccde89..721182c379 100644
--- a/meta-oe/recipes-connectivity/uhd/uhd_git.bb
+++ b/meta-oe/recipes-connectivity/uhd/uhd_git.bb
@@ -1,10 +1,10 @@
require uhd.inc
-PV = "3.4.1"
+PV = "3.5.0"
PR = "${INC_PR}.0"
-SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;protocol=git \
+SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;branch=maint;protocol=git \
"
S = "${WORKDIR}/git/host"
-SRCREV = "3fb067567b0c799b3c707938491eb8489d85fefa"
+SRCREV = "5cb9779da40491b06157596b06422f704a58c7d0"