Patchwork [meta-oe] gnuradio : Update recipe to build on all machines again.

login
register
mail settings
Submitter Philip Balister
Date May 13, 2013, 2:59 p.m.
Message ID <1368457185-8140-1-git-send-email-philip@balister.org>
Download mbox | patch
Permalink /patch/49859/
State Superseded, archived
Headers show

Comments

Philip Balister - May 13, 2013, 2:59 p.m.
Also updated the git repo address after recent changes in hosting.

The recipe failed to build for machines without neon as a tune feature.
The cmake config options have been changed so that it configures properly
now.

Test on armv7a, x86, and x86-64.

Signed-off-by: Philip Balister <philip@balister.org>
---
 meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
Martin Jansa - May 19, 2013, 7:32 a.m.
On Mon, May 13, 2013 at 10:59:45AM -0400, Philip Balister wrote:
> Also updated the git repo address after recent changes in hosting.
> 
> The recipe failed to build for machines without neon as a tune feature.
> The cmake config options have been changed so that it configures properly
> now.
> 
> Test on armv7a, x86, and x86-64.
> 
> Signed-off-by: Philip Balister <philip@balister.org>
> ---
>  meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
> index edd4615..9e6998b 100644
> --- a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
> +++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
> @@ -70,7 +70,7 @@ SRCREV = "5f69899e059e9bea58f92af61f70fc3f63825087"
>  GIT_REPO = "gnuradio.git"
>  GIT_BRANCH = "master"
>  
> -SRC_URI = "git://gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \
> +SRC_URI = "git://git.gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \
>  "
>  
>  S="${WORKDIR}/git"
> @@ -88,15 +88,11 @@ EXTRA_OECMAKE = "-DENABLE_GR_ATSC=FALSE \
>                   -DQT_LIBRARY_DIR=${STAGING_LIBDIR} \
>                   -DQT_QTCORE_LIBRARY_RELEASE=${STAGING_LIBDIR}/libQtCore.so \
>                   -DQT_QTGUI_LIBRARY_RELEASE=${STAGING_LIBDIR}/libQtGui.so \
> +                 ${@base_contains('TUNE_FEATURES', 'neon', \
> +                     '-Dhave_mfpu_neon=1', '-Dhave_mfpu_neon=0', d)} \
>  "
>  
>  inherit distutils-base cmake pkgconfig
>  
>  EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}"
>  
> -# Only builds for machines with neon instructions. Problem is in upstream cmake.
> -python () {
> -    if not oe.utils.contains ('TUNE_FEATURES', 'neon', True, False, d):
> -        raise bb.parse.SkipPackage("'neon' not in TUNE_FEATURES")
> -}

Hi, 

this enables gnuradio to build on qemu* MACHINEs I'm testing and it
failed on all 3 because of docs generation, can you disable it?

| [ 20%] /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/gr-trellis.xml:6: warning: failed to load external entity "/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/docbookx.dtd"
| ]>
|   ^
| warning: failed to load external entity "/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/docbookx.dtd"
| validity error : Could not load the external subset "docbookx.dtd"
| Document /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/gr-trellis.xml does not validate

Cheers,
Philip Balister - May 19, 2013, 11:06 a.m.
On 05/19/2013 03:32 AM, Martin Jansa wrote:
> On Mon, May 13, 2013 at 10:59:45AM -0400, Philip Balister wrote:
>> Also updated the git repo address after recent changes in hosting.
>>
>> The recipe failed to build for machines without neon as a tune feature.
>> The cmake config options have been changed so that it configures properly
>> now.
>>
>> Test on armv7a, x86, and x86-64.
>>
>> Signed-off-by: Philip Balister <philip@balister.org>
>> ---
>>  meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb | 10 +++-------
>>  1 file changed, 3 insertions(+), 7 deletions(-)
>>
>> diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
>> index edd4615..9e6998b 100644
>> --- a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
>> +++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
>> @@ -70,7 +70,7 @@ SRCREV = "5f69899e059e9bea58f92af61f70fc3f63825087"
>>  GIT_REPO = "gnuradio.git"
>>  GIT_BRANCH = "master"
>>  
>> -SRC_URI = "git://gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \
>> +SRC_URI = "git://git.gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \
>>  "
>>  
>>  S="${WORKDIR}/git"
>> @@ -88,15 +88,11 @@ EXTRA_OECMAKE = "-DENABLE_GR_ATSC=FALSE \
>>                   -DQT_LIBRARY_DIR=${STAGING_LIBDIR} \
>>                   -DQT_QTCORE_LIBRARY_RELEASE=${STAGING_LIBDIR}/libQtCore.so \
>>                   -DQT_QTGUI_LIBRARY_RELEASE=${STAGING_LIBDIR}/libQtGui.so \
>> +                 ${@base_contains('TUNE_FEATURES', 'neon', \
>> +                     '-Dhave_mfpu_neon=1', '-Dhave_mfpu_neon=0', d)} \
>>  "
>>  
>>  inherit distutils-base cmake pkgconfig
>>  
>>  EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}"
>>  
>> -# Only builds for machines with neon instructions. Problem is in upstream cmake.
>> -python () {
>> -    if not oe.utils.contains ('TUNE_FEATURES', 'neon', True, False, d):
>> -        raise bb.parse.SkipPackage("'neon' not in TUNE_FEATURES")
>> -}
> 
> Hi, 
> 
> this enables gnuradio to build on qemu* MACHINEs I'm testing and it
> failed on all 3 because of docs generation, can you disable it?
> 
> | [ 20%] /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/gr-trellis.xml:6: warning: failed to load external entity "/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/docbookx.dtd"
> | ]>
> |   ^
> | warning: failed to load external entity "/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/docbookx.dtd"
> | validity error : Could not load the external subset "docbookx.dtd"
> | Document /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/gr-trellis.xml does not validate
> 

Thanks. Do you want me to make a new patch including that and resend?

It built on my machine, I wonder if there is a host contamination issue?

Philip

> Cheers,
> 
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
Martin Jansa - May 19, 2013, 11:52 a.m.
On Sun, May 19, 2013 at 07:06:02AM -0400, Philip Balister wrote:
> On 05/19/2013 03:32 AM, Martin Jansa wrote:
> > On Mon, May 13, 2013 at 10:59:45AM -0400, Philip Balister wrote:
> >> Also updated the git repo address after recent changes in hosting.
> >>
> >> The recipe failed to build for machines without neon as a tune feature.
> >> The cmake config options have been changed so that it configures properly
> >> now.
> >>
> >> Test on armv7a, x86, and x86-64.
> >>
> >> Signed-off-by: Philip Balister <philip@balister.org>
> >> ---
> >>  meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb | 10 +++-------
> >>  1 file changed, 3 insertions(+), 7 deletions(-)
> >>
> >> diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
> >> index edd4615..9e6998b 100644
> >> --- a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
> >> +++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
> >> @@ -70,7 +70,7 @@ SRCREV = "5f69899e059e9bea58f92af61f70fc3f63825087"
> >>  GIT_REPO = "gnuradio.git"
> >>  GIT_BRANCH = "master"
> >>  
> >> -SRC_URI = "git://gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \
> >> +SRC_URI = "git://git.gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \
> >>  "
> >>  
> >>  S="${WORKDIR}/git"
> >> @@ -88,15 +88,11 @@ EXTRA_OECMAKE = "-DENABLE_GR_ATSC=FALSE \
> >>                   -DQT_LIBRARY_DIR=${STAGING_LIBDIR} \
> >>                   -DQT_QTCORE_LIBRARY_RELEASE=${STAGING_LIBDIR}/libQtCore.so \
> >>                   -DQT_QTGUI_LIBRARY_RELEASE=${STAGING_LIBDIR}/libQtGui.so \
> >> +                 ${@base_contains('TUNE_FEATURES', 'neon', \
> >> +                     '-Dhave_mfpu_neon=1', '-Dhave_mfpu_neon=0', d)} \
> >>  "
> >>  
> >>  inherit distutils-base cmake pkgconfig
> >>  
> >>  EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}"
> >>  
> >> -# Only builds for machines with neon instructions. Problem is in upstream cmake.
> >> -python () {
> >> -    if not oe.utils.contains ('TUNE_FEATURES', 'neon', True, False, d):
> >> -        raise bb.parse.SkipPackage("'neon' not in TUNE_FEATURES")
> >> -}
> > 
> > Hi, 
> > 
> > this enables gnuradio to build on qemu* MACHINEs I'm testing and it
> > failed on all 3 because of docs generation, can you disable it?
> > 
> > | [ 20%] /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/gr-trellis.xml:6: warning: failed to load external entity "/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/docbookx.dtd"
> > | ]>
> > |   ^
> > | warning: failed to load external entity "/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/docbookx.dtd"
> > | validity error : Could not load the external subset "docbookx.dtd"
> > | Document /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/gr-trellis.xml does not validate
> > 
> 
> Thanks. Do you want me to make a new patch including that and resend?

Can be in separate patch, but I would like to apply them together (so
that I don't get new failure on world builds)

> It built on my machine, I wonder if there is a host contamination issue?

docs are broken for long time:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=2416

a lot of components is disabling docs (if configure option available) or
dropping them from SUBDIRs in Makefile.am with sed.

Cheers,

> 
> Philip
> 
> > Cheers,
> > 
> > 
> > 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> > 
>
Khem Raj - May 19, 2013, 8:04 p.m.
On Sunday, May 19, 2013, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Sun, May 19, 2013 at 07:06:02AM -0400, Philip Balister wrote:
>> On 05/19/2013 03:32 AM, Martin Jansa wrote:
>> > On Mon, May 13, 2013 at 10:59:45AM -0400, Philip Balister wrote:
>> >> Also updated the git repo address after recent changes in hosting.
>> >>
>> >> The recipe failed to build for machines without neon as a tune
feature.
>> >> The cmake config options have been changed so that it configures
properly
>> >> now.
>> >>
>> >> Test on armv7a, x86, and x86-64.
>> >>
>> >> Signed-off-by: Philip Balister <philip@balister.org>
>> >> ---
>> >>  meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb | 10 +++-------
>> >>  1 file changed, 3 insertions(+), 7 deletions(-)
>> >>
>> >> diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bbb/meta-oe/recipes-connectivity/gnuradio/
gnuradio_git.bb
>> >> index edd4615..9e6998b 100644
>> >> --- a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
>> >> +++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
>> >> @@ -70,7 +70,7 @@ SRCREV = "5f69899e059e9bea58f92af61f70fc3f63825087"
>> >>  GIT_REPO = "gnuradio.git"
>> >>  GIT_BRANCH = "master"
>> >>
>> >> -SRC_URI = "git://
gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \
>> >> +SRC_URI = "git://
git.gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \
>> >>  "
>> >>
>> >>  S="${WORKDIR}/git"
>> >> @@ -88,15 +88,11 @@ EXTRA_OECMAKE = "-DENABLE_GR_ATSC=FALSE \
>> >>                   -DQT_LIBRARY_DIR=${STAGING_LIBDIR} \
>> >>
-DQT_QTCORE_LIBRARY_RELEASE=${STAGING_LIBDIR}/libQtCore.so \
>> >>
-DQT_QTGUI_LIBRARY_RELEASE=${STAGING_LIBDIR}/libQtGui.so \
>> >> +                 ${@base_contains('TUNE_FEATURES', 'neon', \
>> >> +                     '-Dhave_mfpu_neon=1', '-Dhave_mfpu_neon=0', d)}
\
>> >>  "
>> >>
>> >>  inherit distutils-base cmake pkgconfig
>> >>
>> >>  EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}"
>> >>
>> >> -# Only builds for machines with neon instructions. Problem is in
upstream cmake.
>> >> -python () {
>> >> -    if not oe.utils.contains ('TUNE_FEATURES', 'neon', True, False,
d):
>> >> -        raise bb.parse.SkipPackage("'neon' not in TUNE_FEATURES")
>> >> -}
>> >
>> > Hi,
>> >
>> > this enables gnuradio to build on qemu* MACHINEs I'm testing and it
>> > failed on all 3 because of docs generation, can you disable it?
>> >
>> > | [ 20%]
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/gr-trellis.xml:6:
warning: failed to load external entity
"/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/docbookx.dtd"
>> > | ]>
>> > |   ^
>> > | warning: failed to load external entity
"/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/docbookx.dtd"
>> > | validity error : Could not load the external subset "docbookx.dtd"
>> > | Document
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/gr-trellis.xml
does not validate
>> >
> Can be in separate patch, but I would like to apply them together (so
> that I don't get new failure on world builds)
>
>> It built on my machine, I wonder if there is a host contamination issue?
>
> docs are broken for long time:
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=2416

Can you cook patches for these native recipes for oe-core seems you know
most about the issue
It would really be very helpful
>
> a lot of components is disabling docs (if configure option available) or
> dropping them from SUBDIRs in Makefile.am with sed.
>
> Cheers,
>
>>
>> Philip
>>
>> > Cheers,
>> >
>> >
>> >
>> > _______________________________________________
>> > Openembedded-devel mailing list
>> > Openembedded-devel@lists.openembedded.org
>> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>> >
>>
>
>
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>

Patch

diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
index edd4615..9e6998b 100644
--- a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
+++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
@@ -70,7 +70,7 @@  SRCREV = "5f69899e059e9bea58f92af61f70fc3f63825087"
 GIT_REPO = "gnuradio.git"
 GIT_BRANCH = "master"
 
-SRC_URI = "git://gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \
+SRC_URI = "git://git.gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \
 "
 
 S="${WORKDIR}/git"
@@ -88,15 +88,11 @@  EXTRA_OECMAKE = "-DENABLE_GR_ATSC=FALSE \
                  -DQT_LIBRARY_DIR=${STAGING_LIBDIR} \
                  -DQT_QTCORE_LIBRARY_RELEASE=${STAGING_LIBDIR}/libQtCore.so \
                  -DQT_QTGUI_LIBRARY_RELEASE=${STAGING_LIBDIR}/libQtGui.so \
+                 ${@base_contains('TUNE_FEATURES', 'neon', \
+                     '-Dhave_mfpu_neon=1', '-Dhave_mfpu_neon=0', d)} \
 "
 
 inherit distutils-base cmake pkgconfig
 
 EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}"
 
-# Only builds for machines with neon instructions. Problem is in upstream cmake.
-python () {
-    if not oe.utils.contains ('TUNE_FEATURES', 'neon', True, False, d):
-        raise bb.parse.SkipPackage("'neon' not in TUNE_FEATURES")
-}
-