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/recipes-connectivity | |
parent | a706c2734cf79aeaa84c3a2f08976651c4ad5554 (diff) | |
download | meta-openembedded-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/recipes-connectivity')
-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 000000000..38c3a1074 --- /dev/null +++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-gr-trellis-Kill-docs-hard.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 473342055e423384e2b17cc0957613299382fb79 Mon Sep 17 00:00:00 2001 | ||
2 | From: Philip Balister <philip@balister.org> | ||
3 | Date: Mon, 17 Jun 2013 10:58:29 -0400 | ||
4 | Subject: [PATCH] gr-trellis : Kill docs hard. | ||
5 | |||
6 | Signed-off-by: Philip Balister <philip@balister.org> | ||
7 | --- | ||
8 | gr-trellis/CMakeLists.txt | 7 ------- | ||
9 | 1 file changed, 7 deletions(-) | ||
10 | |||
11 | diff --git a/gr-trellis/CMakeLists.txt b/gr-trellis/CMakeLists.txt | ||
12 | index 16a3e7c..95e1420 100644 | ||
13 | --- a/gr-trellis/CMakeLists.txt | ||
14 | +++ b/gr-trellis/CMakeLists.txt | ||
15 | @@ -50,12 +50,6 @@ if(ENABLE_GR_TRELLIS) | ||
16 | include(GrPackage) | ||
17 | CPACK_SET(CPACK_COMPONENT_GROUP_TRELLIS_DESCRIPTION "GNU Radio Trellis Blocks") | ||
18 | |||
19 | -CPACK_COMPONENT("trellis_docs" | ||
20 | - GROUP "Trellis" | ||
21 | - DISPLAY_NAME "Documentation" | ||
22 | - DESCRIPTION "Doxygen HTML and XML" | ||
23 | -) | ||
24 | - | ||
25 | CPACK_COMPONENT("trellis_runtime" | ||
26 | GROUP "Trellis" | ||
27 | DISPLAY_NAME "Runtime" | ||
28 | @@ -95,7 +89,6 @@ CPACK_COMPONENT("trellis_swig" | ||
29 | # Add subdirectories | ||
30 | ######################################################################## | ||
31 | add_subdirectory(src/lib) | ||
32 | -add_subdirectory(doc) | ||
33 | if(ENABLE_PYTHON) | ||
34 | add_subdirectory(grc) | ||
35 | add_subdirectory(src/python) | ||
36 | -- | ||
37 | 1.7.11.7 | ||
38 | |||
diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb index 45f4c772f..b0fc6308e 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 \ | |||
27 | python-netclient python-difflib \ | 27 | python-netclient python-difflib \ |
28 | python-pprint python-numpy \ | 28 | python-pprint python-numpy \ |
29 | " | 29 | " |
30 | RDEPENDS_${PN}-grc = "python-pygtk python-lxml python-cheetah" | 30 | RDEPENDS_${PN}-grc = "python-pygtk python-lxml python-cheetah python-netserver" |
31 | 31 | ||
32 | C_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 32 | C_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
33 | 33 | ||
@@ -43,34 +43,35 @@ do_compile_prepend() { | |||
43 | } | 43 | } |
44 | 44 | ||
45 | PACKAGES += " \ | 45 | PACKAGES += " \ |
46 | ${PN}-examples \ | ||
47 | ${PN}-grc \ | 46 | ${PN}-grc \ |
47 | ${PN}-examples \ | ||
48 | " | 48 | " |
49 | 49 | ||
50 | FILES_${PN}-grc = "${datadir}/gnuradio/grc" | 50 | FILES_${PN}-grc = "${datadir}/gnuradio/grc" |
51 | FILES_${PN}-examples = "${datadir}/gnuradio/examples" | ||
51 | 52 | ||
52 | FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/*" | 53 | FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/gnuradio" |
53 | FILES_${PN} += "${datadir}/gnuradio/*" | 54 | FILES_${PN} += "${datadir}/gnuradio/modtool" |
54 | # The following needs fixing upstream | 55 | # The following needs fixing upstream |
55 | FILES_${PN} += "${prefix}/etc/gnuradio/*" | 56 | FILES_${PN} += "${prefix}/etc/gnuradio" |
56 | 57 | ||
57 | FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/.debug \ | 58 | FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/.debug \ |
58 | ${PYTHON_SITEPACKAGES_DIR}/gnuradio/*/.debug \ | 59 | ${PYTHON_SITEPACKAGES_DIR}/gnuradio/*/.debug \ |
59 | ${datadir}/gnuradio/examples/*/.debug \ | 60 | ${datadir}/gnuradio/examples/*/.debug \ |
60 | " | 61 | " |
61 | FILES_${PN}-examples = "${datadir}/gnuradio/examples" | ||
62 | 62 | ||
63 | PV = "3.6.4.1" | 63 | PV = "3.6.5" |
64 | 64 | ||
65 | FILESPATHPKG_prepend = "gnuradio-git:" | 65 | FILESPATHPKG_prepend = "gnuradio-git:" |
66 | 66 | ||
67 | SRCREV = "5f69899e059e9bea58f92af61f70fc3f63825087" | 67 | SRCREV = "a7b3a9339106aaba72195b693dfeaa98f194e0d5" |
68 | 68 | ||
69 | # Make it easy to test against developer repos and branches | 69 | # Make it easy to test against developer repos and branches |
70 | GIT_REPO = "gnuradio.git" | 70 | GIT_REPO = "gnuradio.git" |
71 | GIT_BRANCH = "master" | 71 | GIT_BRANCH = "master" |
72 | 72 | ||
73 | SRC_URI = "git://git.gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \ | 73 | SRC_URI = "git://git.gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \ |
74 | file://0001-gr-trellis-Kill-docs-hard.patch \ | ||
74 | " | 75 | " |
75 | 76 | ||
76 | S="${WORKDIR}/git" | 77 | S="${WORKDIR}/git" |