Patchwork [meta-oe,v2,2/3] uhd : Update to version 3.5.0.

login
register
mail settings
Submitter Philip Balister
Date Jan. 14, 2013, 3:52 p.m.
Message ID <1358178774-13647-2-git-send-email-philip@balister.org>
Download mbox | patch
Permalink /patch/42593/
State Accepted, archived
Headers show

Comments

Philip Balister - Jan. 14, 2013, 3:52 p.m.
This version drops the usrp E100 utilities. Also, the recipe depends on
python-cheetah-native now.

Signed-off-by: Philip Balister <philip@balister.org>
---
 meta-oe/recipes-connectivity/uhd/uhd.inc    | 7 +++----
 meta-oe/recipes-connectivity/uhd/uhd_git.bb | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

Patch

diff --git a/meta-oe/recipes-connectivity/uhd/uhd.inc b/meta-oe/recipes-connectivity/uhd/uhd.inc
index c237a96..d3cc4c8 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 e740ccd..721182c 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"