diff options
| author | Philip Balister <philip@balister.org> | 2013-11-14 19:14:11 -0500 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-11-18 23:12:19 +0100 |
| commit | 381c941594752465d08967f3567c7a63e4cc3170 (patch) | |
| tree | 4386735eee705205535a3117c552595b3c15a244 /meta-oe/recipes-connectivity | |
| parent | 8a56dc88faceb0b1f6e1dfad84203a976a887890 (diff) | |
| download | meta-openembedded-381c941594752465d08967f3567c7a63e4cc3170.tar.gz | |
uhd: Remove from meta-oe. Now lives in meta-sdr.
https://github.com/balister/meta-sdr
Signed-off-by: Philip Balister <philip@balister.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
5 files changed, 0 insertions, 142 deletions
diff --git a/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.005.003.bb b/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.005.003.bb deleted file mode 100644 index 43699074a9..0000000000 --- a/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.005.003.bb +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | DESCRIPTION = "Universal Hardware Driver Firmware" | ||
| 2 | HOMEPAGE = "http://www.ettus.com" | ||
| 3 | |||
| 4 | PE = "1" | ||
| 5 | |||
| 6 | LICENSE = "GPLv3" | ||
| 7 | LIC_FILES_CHKSUM = "file://share/uhd/images/usrp_e100_fpga_v2.bin;md5=e86f2186823b264efc627aafc0ad60a2" | ||
| 8 | |||
| 9 | inherit allarch | ||
| 10 | |||
| 11 | SRC_URI = "http://files.ettus.com/binaries/uhd_stable/releases/uhd_${PV}-release/uhd-images_${PV}-release.tar.gz" | ||
| 12 | SRC_URI[md5sum] = "65cf76fd363d576ceff9c1527ade297b" | ||
| 13 | SRC_URI[sha256sum] = "9079586def30b6805053092673d942c0051f1f99eebc676b871f070c04b66e35" | ||
| 14 | |||
| 15 | S = "${WORKDIR}/uhd-images_${PV}-release" | ||
| 16 | |||
| 17 | do_install() { | ||
| 18 | install -d ${D}${datadir}/uhd/images | ||
| 19 | install -d ${D}${datadir}/uhd/images/bit | ||
| 20 | install -m 0644 ${S}/share/uhd/images/bit/* ${D}${datadir}/uhd/images/bit | ||
| 21 | rm -rf ${S}/share/uhd/images/bit | ||
| 22 | install -m 0644 ${S}/share/uhd/images/* ${D}${datadir}/uhd/images | ||
| 23 | } | ||
| 24 | |||
| 25 | PACKAGES = "${PN}" | ||
| 26 | FILES_${PN} = "${datadir}/uhd/images" | ||
| 27 | |||
diff --git a/meta-oe/recipes-connectivity/uhd/uhd.inc b/meta-oe/recipes-connectivity/uhd/uhd.inc deleted file mode 100644 index da1fbd8c79..0000000000 --- a/meta-oe/recipes-connectivity/uhd/uhd.inc +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | DESCRIPTION = "Universal Hardware Driver for Ettus Research products." | ||
| 2 | HOMEPAGE = "http://www.ettus.com" | ||
| 3 | LICENSE = "GPLv3+" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=51b35d652c070d136bf20244494be2d3" | ||
| 5 | |||
| 6 | DEPENDS = "git-native python-cheetah-native boost libusb1 uhd-firmware orc-native ncurses" | ||
| 7 | RDEPENDS_${PN} += "uhd-firmware" | ||
| 8 | |||
| 9 | PE = "1" | ||
| 10 | INC_PR = "r3" | ||
| 11 | |||
| 12 | inherit cmake pythonnative | ||
| 13 | |||
| 14 | PACKAGES =+ "${PN}-tests ${PN}-examples ${PN}-e1xx" | ||
| 15 | |||
| 16 | INSANE_SKIP_${PN} = "dev-so" | ||
| 17 | |||
| 18 | FILES_${PN} += "${libdir}/libuhd.so \ | ||
| 19 | ${datadir}/uhd/utils/*" | ||
| 20 | FILES_${PN}-tests += "${datadir}/uhd/tests/*" | ||
| 21 | FILES_${PN}-dbg += "${datadir}/uhd/examples/.debug/* \ | ||
| 22 | ${datadir}/uhd/utils/.debug/* \ | ||
| 23 | ${datadir}/uhd/tests/.debug/* \ | ||
| 24 | ${datadir}/uhd/usrp_e_utils/.debug/*" | ||
| 25 | FILES_${PN}-examples = "${datadir}/uhd/examples/*" | ||
| 26 | |||
| 27 | OECMAKE_BUILDPATH = "${S}/build" | ||
| 28 | OECMAKE_SOURCEPATH = "${S}" | ||
| 29 | |||
| 30 | PACKAGECONFIG ??= "" | ||
| 31 | PACKAGECONFIG[orc] = "-DENABLE_ORC=ON,-DENABLE_ORC=OFF,orc" | ||
| 32 | |||
| 33 | EXTRA_OECMAKE = "-DENABLE_E100=TRUE" | ||
| 34 | |||
| 35 | EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}" | ||
diff --git a/meta-oe/recipes-connectivity/uhd/uhd/0001-HACK-work-around-Wl-as-needed-problems.patch b/meta-oe/recipes-connectivity/uhd/uhd/0001-HACK-work-around-Wl-as-needed-problems.patch deleted file mode 100644 index eb05cc0a04..0000000000 --- a/meta-oe/recipes-connectivity/uhd/uhd/0001-HACK-work-around-Wl-as-needed-problems.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | From 77be3026cbfe77b3ee1aaa549a27f5ad50320f9d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
| 3 | Date: Fri, 17 Jun 2011 19:44:04 +0200 | ||
| 4 | Subject: [PATCH] HACK: work around -Wl,as-needed problems | ||
| 5 | |||
| 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
| 7 | --- | ||
| 8 | host/lib/types/CMakeLists.txt | 2 +- | ||
| 9 | host/usrp_e_utils/CMakeLists.txt | 2 +- | ||
| 10 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/host/lib/types/CMakeLists.txt b/host/lib/types/CMakeLists.txt | ||
| 13 | index 957dfd3..3147747 100644 | ||
| 14 | --- a/host/lib/types/CMakeLists.txt | ||
| 15 | +++ b/host/lib/types/CMakeLists.txt | ||
| 16 | @@ -59,7 +59,7 @@ CHECK_CXX_SOURCE_COMPILES(" | ||
| 17 | IF(HAVE_CLOCK_GETTIME) | ||
| 18 | MESSAGE(STATUS " High resolution timing supported through clock_gettime.") | ||
| 19 | SET(TIME_SPEC_DEFS HAVE_CLOCK_GETTIME) | ||
| 20 | - LIBUHD_APPEND_LIBS("-lrt") | ||
| 21 | + LIBUHD_APPEND_LIBS("-lrt -lpthread -lncurses") | ||
| 22 | ELSEIF(HAVE_MACH_ABSOLUTE_TIME) | ||
| 23 | MESSAGE(STATUS " High resolution timing supported through mach_absolute_time.") | ||
| 24 | SET(TIME_SPEC_DEFS HAVE_MACH_ABSOLUTE_TIME) | ||
| 25 | diff --git a/host/usrp_e_utils/CMakeLists.txt b/host/usrp_e_utils/CMakeLists.txt | ||
| 26 | index 9162a20..18414ad 100644 | ||
| 27 | --- a/host/usrp_e_utils/CMakeLists.txt | ||
| 28 | +++ b/host/usrp_e_utils/CMakeLists.txt | ||
| 29 | @@ -38,7 +38,7 @@ IF(ENABLE_USRP_E_UTILS) | ||
| 30 | FOREACH(util_source ${usrp_e_utils_sources}) | ||
| 31 | GET_FILENAME_COMPONENT(util_name ${util_source} NAME_WE) | ||
| 32 | ADD_EXECUTABLE(${util_name} ${util_source}) | ||
| 33 | - TARGET_LINK_LIBRARIES(${util_name} ${Boost_LIBRARIES}) | ||
| 34 | + TARGET_LINK_LIBRARIES(${util_name} ${Boost_LIBRARIES} -lpthread -lncurses) | ||
| 35 | INSTALL(TARGETS ${util_name} RUNTIME DESTINATION ${PKG_DATA_DIR}/usrp_e_utils) | ||
| 36 | ENDFOREACH(util_source) | ||
| 37 | |||
| 38 | -- | ||
| 39 | 1.6.6.1 | ||
| 40 | |||
diff --git a/meta-oe/recipes-connectivity/uhd/uhd/0001-use-uint8_t-from-boost-namespace.patch b/meta-oe/recipes-connectivity/uhd/uhd/0001-use-uint8_t-from-boost-namespace.patch deleted file mode 100644 index 8978ddcc44..0000000000 --- a/meta-oe/recipes-connectivity/uhd/uhd/0001-use-uint8_t-from-boost-namespace.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | From 317f6f08cedf005ce1f2d6f0d04cfb2659863423 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sun, 30 Jun 2013 22:10:50 -0700 | ||
| 4 | Subject: [PATCH] use uint8_t from boost namespace | ||
| 5 | |||
| 6 | Fixes errors like | ||
| 7 | codec_ctrl.cpp:113:10: error: 'uint8_t' was not declared in this scope | ||
| 8 | |||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | --- | ||
| 11 | host/lib/usrp/e100/codec_ctrl.cpp | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/host/lib/usrp/e100/codec_ctrl.cpp b/host/lib/usrp/e100/codec_ctrl.cpp | ||
| 15 | index 13b3bc9..2c13176 100644 | ||
| 16 | --- a/host/lib/usrp/e100/codec_ctrl.cpp | ||
| 17 | +++ b/host/lib/usrp/e100/codec_ctrl.cpp | ||
| 18 | @@ -110,7 +110,7 @@ e100_codec_ctrl_impl::e100_codec_ctrl_impl(spi_iface::sptr iface){ | ||
| 19 | //_ad9862_regs.dis2 = ad9862_regs_t::DIS2_DIS; needed for transmit | ||
| 20 | |||
| 21 | //write the register settings to the codec | ||
| 22 | - for (uint8_t addr = 0; addr <= 25; addr++){ | ||
| 23 | + for (boost::uint8_t addr = 0; addr <= 25; addr++){ | ||
| 24 | this->send_reg(addr); | ||
| 25 | } | ||
| 26 | |||
| 27 | -- | ||
| 28 | 1.7.9.5 | ||
| 29 | |||
diff --git a/meta-oe/recipes-connectivity/uhd/uhd_git.bb b/meta-oe/recipes-connectivity/uhd/uhd_git.bb deleted file mode 100644 index ee02cc7c22..0000000000 --- a/meta-oe/recipes-connectivity/uhd/uhd_git.bb +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | require uhd.inc | ||
| 2 | |||
| 3 | PV = "3.5.3" | ||
| 4 | PR = "${INC_PR}.0" | ||
| 5 | |||
| 6 | SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;branch=maint \ | ||
| 7 | file://0001-use-uint8_t-from-boost-namespace.patch;striplevel=2 \ | ||
| 8 | " | ||
| 9 | S = "${WORKDIR}/git/host" | ||
| 10 | |||
| 11 | SRCREV = "f4c58120dc1e3674ee0228213f0f0011a0f80dcf" | ||
