summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-connectivity/uhd/uhd.inc20
-rw-r--r--meta-oe/recipes-connectivity/uhd/uhd_git.bb4
2 files changed, 13 insertions, 11 deletions
diff --git a/meta-oe/recipes-connectivity/uhd/uhd.inc b/meta-oe/recipes-connectivity/uhd/uhd.inc
index b08d1a066..466a19c8a 100644
--- a/meta-oe/recipes-connectivity/uhd/uhd.inc
+++ b/meta-oe/recipes-connectivity/uhd/uhd.inc
@@ -7,20 +7,22 @@ DEPENDS = "git-native python-cheetah-native boost libusb1 uhd-firmware orc-nativ
7RDEPENDS_${PN} += "uhd-firmware" 7RDEPENDS_${PN} += "uhd-firmware"
8 8
9PE = "1" 9PE = "1"
10INC_PR = "r0" 10INC_PR = "r1"
11 11
12inherit cmake 12inherit cmake
13 13
14PACKAGES =+ "${PN}-tests ${PN}-examples" 14PACKAGES =+ "${PN}-tests ${PN}-examples ${PN}-e1xx"
15 15
16FILES_${PN} += "${libdir}/libuhd.so" 16INSANE_SKIP_${PN} = "dev-so"
17FILES_${PN} += "${datadir}/uhd/utils/*" 17
18FILES_${PN} += "${libdir}/libuhd.so \
19 ${datadir}/uhd/utils/*"
18FILES_${PN}-tests += "${datadir}/uhd/tests/*" 20FILES_${PN}-tests += "${datadir}/uhd/tests/*"
19FILES_${PN}-dbg += "${datadir}/uhd/examples/.debug \ 21FILES_${PN}-e1xx += "${datadir}/uhd/usrp_e_utils/*"
20 ${datadir}/uhd/utils/.debug \ 22FILES_${PN}-dbg += "${datadir}/uhd/examples/.debug/* \
21 ${datadir}/uhd/tests/.debug \ 23" ${datadir}/uhd/utils/.debug/* \
22 ${datadir}/uhd/usrp_e_utils/.debug \ 24 ${datadir}/uhd/tests/.debug/* \
23 " 25 ${datadir}/uhd/usrp_e_utils/.debug/*"
24FILES_${PN}-examples = "${datadir}/uhd/examples/*" 26FILES_${PN}-examples = "${datadir}/uhd/examples/*"
25 27
26OECMAKE_BUILDPATH = "${S}/build" 28OECMAKE_BUILDPATH = "${S}/build"
diff --git a/meta-oe/recipes-connectivity/uhd/uhd_git.bb b/meta-oe/recipes-connectivity/uhd/uhd_git.bb
index 329a39598..cd9c554ff 100644
--- a/meta-oe/recipes-connectivity/uhd/uhd_git.bb
+++ b/meta-oe/recipes-connectivity/uhd/uhd_git.bb
@@ -1,10 +1,10 @@
1require uhd.inc 1require uhd.inc
2 2
3PV = "3.2.1" 3PV = "3.3.1"
4PR = "${INC_PR}.0" 4PR = "${INC_PR}.0"
5 5
6SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;protocol=git \ 6SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;protocol=git \
7 file://0001-HACK-work-around-Wl-as-needed-problems.patch;striplevel=2" 7 file://0001-HACK-work-around-Wl-as-needed-problems.patch;striplevel=2"
8S = "${WORKDIR}/git/host" 8S = "${WORKDIR}/git/host"
9 9
10SRCREV = "fc349d30507620baca935e75e68a9554b40d427c" 10SRCREV = "f8d66fcfb14062283cdb0d0cbe4f77e2964ceb82"