[OE-core] [poky] [PATCH 1/6] package.bbclass: Fix missing debug src files

Richard Purdie richard.purdie at linuxfoundation.org
Wed Mar 16 16:47:53 UTC 2011


On Wed, 2011-03-16 at 11:25 -0500, Mark Hatle wrote:
> On 3/16/11 11:22 AM, Richard Purdie wrote:
> > On Wed, 2011-03-16 at 11:15 -0500, Mark Hatle wrote:
> >> The previous change used egrep instead of fgrep.  We need to use fgrep because
> >> there are expression like syntaxes in some file names, we need exact matches.
> >>
> >> Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
> >> ---
> >>  meta/classes/package.bbclass |    3 ++-
> >>  1 files changed, 2 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
> >> index a7a5894..ac30cbe 100644
> >> --- a/meta/classes/package.bbclass
> >> +++ b/meta/classes/package.bbclass
> >> @@ -233,9 +233,10 @@ def splitfile2(debugsrcdir, d):
> >>         processdebugsrc =  "LC_ALL=C ; sort -z -u '%s' | egrep -v -z '(<internal>|<built-in>)$' | "
> >>         # We need to ignore files that are not actually ours
> >>         # we do this by only paying attention to items from this package
> >> -       processdebugsrc += "egrep -z '%s' | "
> >> +       processdebugsrc += "fgrep -z '%s' | "
> >>         processdebugsrc += "(cd '%s' ; cpio -pd0mL '%s%s' 2>/dev/null)"
> >>  
> >> +       bb.note(processdebugsrc % (sourcefile, workbasedir, workparentdir, dvar, debugsrcdir))
> >>         os.system(processdebugsrc % (sourcefile, workbasedir, workparentdir, dvar, debugsrcdir))
> >>  
> >>         # The copy by cpio may have resulted in some empty directories!  Remove these
> > 
> > Did you mean to leave the bb.note() in?
> 
> No, that was supposed to be removed.  Should I yank it and re-push the commit?

Since I'd looked through the rest and they were ok, I just tweaked this
one.

Cheers,

Richard






More information about the Openembedded-core mailing list