diff options
author | Philip Balister <philip@balister.org> | 2013-06-18 14:09:45 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-06-29 14:22:47 +0200 |
commit | 30e97c15d762f09fa37a31602d00f1f4b0d059bb (patch) | |
tree | 25b6a20407394dcce8944a97df3ce93719445de8 /meta-oe | |
parent | a706c2734cf79aeaa84c3a2f08976651c4ad5554 (diff) | |
download | meta-openembedded-contrib-30e97c15d762f09fa37a31602d00f1f4b0d059bb.tar.gz |
gnuradio: Update to 3.6.5. Also fix for docs, packaging, and grc RDEPENDS.
* Fix packaging so grc and examples packages are not empty.
* Account for addition of gr-modtool.
* Update to version 3.6.5 of GNU Radio.
* Update RDEPENDS for grc to add python-netserver.
* Try even harder to stop docs from getting built.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Philip Balister <philip@balister.org>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-gr-trellis-Kill-docs-hard.patch | 38 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb | 17 |
2 files changed, 47 insertions, 8 deletions
diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-gr-trellis-Kill-docs-hard.patch b/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-gr-trellis-Kill-docs-hard.patch new file mode 100644 index 0000000000..38c3a10748 --- /dev/null +++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-gr-trellis-Kill-docs-hard.patch @@ -0,0 +1,38 @@ +From 473342055e423384e2b17cc0957613299382fb79 Mon Sep 17 00:00:00 2001 +From: Philip Balister <philip@balister.org> +Date: Mon, 17 Jun 2013 10:58:29 -0400 +Subject: [PATCH] gr-trellis : Kill docs hard. + +Signed-off-by: Philip Balister <philip@balister.org> +--- + gr-trellis/CMakeLists.txt | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/gr-trellis/CMakeLists.txt b/gr-trellis/CMakeLists.txt +index 16a3e7c..95e1420 100644 +--- a/gr-trellis/CMakeLists.txt ++++ b/gr-trellis/CMakeLists.txt +@@ -50,12 +50,6 @@ if(ENABLE_GR_TRELLIS) + include(GrPackage) + CPACK_SET(CPACK_COMPONENT_GROUP_TRELLIS_DESCRIPTION "GNU Radio Trellis Blocks") + +-CPACK_COMPONENT("trellis_docs" +- GROUP "Trellis" +- DISPLAY_NAME "Documentation" +- DESCRIPTION "Doxygen HTML and XML" +-) +- + CPACK_COMPONENT("trellis_runtime" + GROUP "Trellis" + DISPLAY_NAME "Runtime" +@@ -95,7 +89,6 @@ CPACK_COMPONENT("trellis_swig" + # Add subdirectories + ######################################################################## + add_subdirectory(src/lib) +-add_subdirectory(doc) + if(ENABLE_PYTHON) + add_subdirectory(grc) + add_subdirectory(src/python) +-- +1.7.11.7 + diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb index 45f4c772f7..b0fc6308e5 100644 --- a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb +++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb @@ -27,7 +27,7 @@ RDEPENDS_${PN} = "python-core python-audio python-threading python-codecs \ python-netclient python-difflib \ python-pprint python-numpy \ " -RDEPENDS_${PN}-grc = "python-pygtk python-lxml python-cheetah" +RDEPENDS_${PN}-grc = "python-pygtk python-lxml python-cheetah python-netserver" C_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" @@ -43,34 +43,35 @@ do_compile_prepend() { } PACKAGES += " \ - ${PN}-examples \ ${PN}-grc \ + ${PN}-examples \ " FILES_${PN}-grc = "${datadir}/gnuradio/grc" +FILES_${PN}-examples = "${datadir}/gnuradio/examples" -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/*" -FILES_${PN} += "${datadir}/gnuradio/*" +FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/gnuradio" +FILES_${PN} += "${datadir}/gnuradio/modtool" # The following needs fixing upstream -FILES_${PN} += "${prefix}/etc/gnuradio/*" +FILES_${PN} += "${prefix}/etc/gnuradio" FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/.debug \ ${PYTHON_SITEPACKAGES_DIR}/gnuradio/*/.debug \ ${datadir}/gnuradio/examples/*/.debug \ " -FILES_${PN}-examples = "${datadir}/gnuradio/examples" -PV = "3.6.4.1" +PV = "3.6.5" FILESPATHPKG_prepend = "gnuradio-git:" -SRCREV = "5f69899e059e9bea58f92af61f70fc3f63825087" +SRCREV = "a7b3a9339106aaba72195b693dfeaa98f194e0d5" # Make it easy to test against developer repos and branches GIT_REPO = "gnuradio.git" GIT_BRANCH = "master" SRC_URI = "git://git.gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \ + file://0001-gr-trellis-Kill-docs-hard.patch \ " S="${WORKDIR}/git" |