Patchwork [meta-oe] gnuradio : Update to 3.6.5. Also fix for docs, packaging, and grc RDEPENDS.

login
register
mail settings
Submitter Philip Balister
Date June 18, 2013, 2:09 p.m.
Message ID <1371564585-12373-1-git-send-email-philip@balister.org>
Download mbox | patch
Permalink /patch/51931/
State Accepted, archived
Commit 30e97c15d762f09fa37a31602d00f1f4b0d059bb
Headers show

Comments

Philip Balister - June 18, 2013, 2:09 p.m.
* 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.
---
 .../gnuradio/0001-gr-trellis-Kill-docs-hard.patch  | 38 ++++++++++++++++++++++
 .../recipes-connectivity/gnuradio/gnuradio_git.bb  | 17 +++++-----
 2 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-gr-trellis-Kill-docs-hard.patch
Paul Barker - June 20, 2013, 12:29 p.m.
On 18 June 2013 15:09, Philip Balister <philip@balister.org> wrote:
>  * 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.

Just tried building gnuradio with this patch applied. The system
topped out at 5GB RAM and 4GB swap used (everything on the system)
then:

[ 94%] Building CXX object
gr-analog/swig/CMakeFiles/_analog_swig.dir/analog_swigPYTHON_wrap.cxx.o
cd /home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gr-analog/swig
&& /home/pbarker/build/20130619_poky/build/tmp/sysroots/x86_64-lin
ux/usr/bin/armv6-vfp-poky-linux-gnueabi/arm-poky-linux-gnueabi-g++
-DENABLE_GR_LOG -D_analog_swig_EXPORTS -march=armv6 -mthumb-interwork
-mfloat-abi=softfp   --sysroot=/home/pbarker/build/
20130619_poky/build/tmp/sysroots/raspberrypi  -O2 -pipe -g
-feliminate-unused-debug-types -fpermissive
-fvisibility-inlines-hidden -fpermissive -O2 -pipe -g
-feliminate-unused-debug-types  -
O2 -pipe -g -feliminate-unused-debug-types -fpermissive
-fvisibility-inlines-hidden -DNDEBUG -fPIC
-I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.
6.5-r0/git/gr-analog/include
-I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gr-analog/include
-I/home/pbarker/build/20130619_poky
/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gr-filter/lib
-I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gr-filt
er/include -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gr-filter/lib
-I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-
vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gr-filter/include
-I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gnuradio-core/src/l
ib/runtime -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gnuradio-core/src/lib/general
-I/home/pbarker/build/20130619_poky/build
/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gnuradio-core/src/lib/general
-I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/g
it/build/gnuradio-core/src/lib/gengen
-I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gnuradio-core/src/lib/gengen
-I/home/pbarker/build
/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gnuradio-core/src/lib/filter
-I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gn
ueabi/gnuradio/3.6.5-r0/git/gnuradio-core/src/lib/filter
-I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gnuradio-core/src/lib/missing
-
I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gnuradio-core/src/lib/reed-solomon
-I/home/pbarker/build/20130619_poky/build/tmp/work/arm
v6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gnuradio-core/src/lib/viterbi
-I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gnuradio-c
ore/src/lib/io -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gnuradio-core/src/lib/swig
-I/home/pbarker/build/20130619_poky/buil
d/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gnuradio-core/src/lib/swig
-I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git
/gnuradio-core/src/lib/hier
-I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build
-I/home/pbarker/build/20130619_poky/build/tmp/work/arm
v6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gruel/src/swig
-I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gruel/src/swig
-I/h
ome/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gruel/src/include
-I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gn
ueabi/gnuradio/3.6.5-r0/git/build/gruel/src/include
-I/home/pbarker/build/20130619_poky/build/tmp/sysroots/raspberrypi/usr/include
-I/home/pbarker/build/20130619_poky/build/tmp/sysroots/rasp
berrypi/usr/include/python2.7
-I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gr-analog/swig
-I/home/pbarker/build/20130619_poky/build/t
mp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gr-analog/swig
   -fvisibility=hidden -Wsign-compare -Wall -Wno-uninitialized -o
CMakeFiles/_analog_swig.dir/analog_swigPYTHO
N_wrap.cxx.o -c
/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gr-analog/swig/analog_swigPYTHON_wrap.cxx
arm-poky-linux-gnueabi-g++: internal compiler error: Killed (program cc1plus)
Please submit a full bug report,
with preprocessed source if appropriate.
See <http://gcc.gnu.org/bugs.html> for instructions.

Should this really be using over 1GB RAM per cc1plus process to
compile this? I think something broke somewhere. I'll try building
this from scratch in a new build directory and let you know how it
goes.

This is with MACHINE=raspberrypi and using gcc 4.7.2.

--
Paul Barker

Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk
Philip Balister - June 20, 2013, 2:18 p.m.
On 06/20/2013 08:29 AM, Paul Barker wrote:
> On 18 June 2013 15:09, Philip Balister <philip@balister.org> wrote:
>>  * 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.
> 
> Just tried building gnuradio with this patch applied. The system
> topped out at 5GB RAM and 4GB swap used (everything on the system)
> then:

My machine says:

[balister@thuvia ~]$ free -g
             total       used       free     shared    buffers     cached
Mem:            19         16          3          0          1          7
-/+ buffers/cache:          7         12
Swap:            5          0          5


Compiling the c++ output of swig is known to consume loads of ram.

Philip


> 
> [ 94%] Building CXX object
> gr-analog/swig/CMakeFiles/_analog_swig.dir/analog_swigPYTHON_wrap.cxx.o
> cd /home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gr-analog/swig
> && /home/pbarker/build/20130619_poky/build/tmp/sysroots/x86_64-lin
> ux/usr/bin/armv6-vfp-poky-linux-gnueabi/arm-poky-linux-gnueabi-g++
> -DENABLE_GR_LOG -D_analog_swig_EXPORTS -march=armv6 -mthumb-interwork
> -mfloat-abi=softfp   --sysroot=/home/pbarker/build/
> 20130619_poky/build/tmp/sysroots/raspberrypi  -O2 -pipe -g
> -feliminate-unused-debug-types -fpermissive
> -fvisibility-inlines-hidden -fpermissive -O2 -pipe -g
> -feliminate-unused-debug-types  -
> O2 -pipe -g -feliminate-unused-debug-types -fpermissive
> -fvisibility-inlines-hidden -DNDEBUG -fPIC
> -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.
> 6.5-r0/git/gr-analog/include
> -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gr-analog/include
> -I/home/pbarker/build/20130619_poky
> /build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gr-filter/lib
> -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gr-filt
> er/include -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gr-filter/lib
> -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-
> vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gr-filter/include
> -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gnuradio-core/src/l
> ib/runtime -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gnuradio-core/src/lib/general
> -I/home/pbarker/build/20130619_poky/build
> /tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gnuradio-core/src/lib/general
> -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/g
> it/build/gnuradio-core/src/lib/gengen
> -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gnuradio-core/src/lib/gengen
> -I/home/pbarker/build
> /20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gnuradio-core/src/lib/filter
> -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gn
> ueabi/gnuradio/3.6.5-r0/git/gnuradio-core/src/lib/filter
> -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gnuradio-core/src/lib/missing
> -
> I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gnuradio-core/src/lib/reed-solomon
> -I/home/pbarker/build/20130619_poky/build/tmp/work/arm
> v6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gnuradio-core/src/lib/viterbi
> -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gnuradio-c
> ore/src/lib/io -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gnuradio-core/src/lib/swig
> -I/home/pbarker/build/20130619_poky/buil
> d/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gnuradio-core/src/lib/swig
> -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git
> /gnuradio-core/src/lib/hier
> -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build
> -I/home/pbarker/build/20130619_poky/build/tmp/work/arm
> v6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gruel/src/swig
> -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gruel/src/swig
> -I/h
> ome/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gruel/src/include
> -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gn
> ueabi/gnuradio/3.6.5-r0/git/build/gruel/src/include
> -I/home/pbarker/build/20130619_poky/build/tmp/sysroots/raspberrypi/usr/include
> -I/home/pbarker/build/20130619_poky/build/tmp/sysroots/rasp
> berrypi/usr/include/python2.7
> -I/home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/gr-analog/swig
> -I/home/pbarker/build/20130619_poky/build/t
> mp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gr-analog/swig
>    -fvisibility=hidden -Wsign-compare -Wall -Wno-uninitialized -o
> CMakeFiles/_analog_swig.dir/analog_swigPYTHO
> N_wrap.cxx.o -c
> /home/pbarker/build/20130619_poky/build/tmp/work/armv6-vfp-poky-linux-gnueabi/gnuradio/3.6.5-r0/git/build/gr-analog/swig/analog_swigPYTHON_wrap.cxx
> arm-poky-linux-gnueabi-g++: internal compiler error: Killed (program cc1plus)
> Please submit a full bug report,
> with preprocessed source if appropriate.
> See <http://gcc.gnu.org/bugs.html> for instructions.
> 
> Should this really be using over 1GB RAM per cc1plus process to
> compile this? I think something broke somewhere. I'll try building
> this from scratch in a new build directory and let you know how it
> goes.
> 
> This is with MACHINE=raspberrypi and using gcc 4.7.2.
> 
> --
> Paul Barker
> 
> Email: paul@paulbarker.me.uk
> http://www.paulbarker.me.uk
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 
>
Paul Barker - June 22, 2013, 10:22 a.m.
On 20 June 2013 15:18, Philip Balister <philip@balister.org> wrote:
> On 06/20/2013 08:29 AM, Paul Barker wrote:
>>
>> Just tried building gnuradio with this patch applied. The system
>> topped out at 5GB RAM and 4GB swap used (everything on the system)
>> then:
>
> Compiling the c++ output of swig is known to consume loads of ram.
>

I tried this again with PARALLEL_MAKE = "" rather than "-j 4" and it
worked fine. Before this gnuradio do_compile failed pretty early when
trying to build documentation so this patch does fix that build error.

--
Paul Barker

Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk

Patch

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 0000000..38c3a10
--- /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 45f4c77..b0fc630 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"