From: Andreas Müller <schnitzeltony@googlemail.com>
Date: Mon, 22 Jul 2013 14:52:15 +0000 (+0200)
Subject: package.bbclass: avoid packing debug sources from other packages
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=054b932f7bb8b9c49a5663dfb6f32ae90d4a6046;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

package.bbclass: avoid packing debug sources from other packages

The error case was gcc-dbg packing files from libgcc-dbg reported in [1]

[1] http://lists.openembedded.org/pipermail/openembedded-core/2013-July/080728.html

(From OE-Core rev: fd2c0af422d67da870a5a11720d06a871e660215)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 5c2d1c6553b..2460d0ac628 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -307,7 +307,7 @@ def copydebugsources(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 += "fgrep -z '%s' | "
+        processdebugsrc += "fgrep -zw '%s' | "
         processdebugsrc += "(cd '%s' ; cpio -pd0mlL --no-preserve-owner '%s%s' 2>/dev/null)"
 
         cmd = processdebugsrc % (sourcefile, workbasedir, workparentdir, dvar, debugsrcdir)