summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-03-14 15:16:03 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-14 13:17:44 +0000
commita80203625a59461972b5f4d3c48dbf80d85be90d (patch)
tree88caa4957fcd168eca58ee122073920d6e362275
parentf65d96ba2aa35643fb53e0f1178f77f0b8ef00a2 (diff)
downloadpoky-a80203625a59461972b5f4d3c48dbf80d85be90d.tar.gz
package.bbclass: do not split debug pkg when no debugsources.list
We don't have to split the debug pkg if it is null (No debugsources.list since the find-debuginfo.sh would not generate it for the null pkg). Serval pkg's debug pkg is null, and there were a few errors: (53 pkgs had such errors in a core-image-sato build): log.do_package:sort: open failed: debugsources.list: No such file or directory [YOCTO #2076] (From OE-Core rev: f88e3f420b4e95ab5ba4a075df8ed65b817f8b45) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package.bbclass18
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 7bcfa02755..bdc4d37af6 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -234,17 +234,17 @@ def splitfile2(debugsrcdir, d):
234 234
235 import commands, stat 235 import commands, stat
236 236
237 dvar = d.getVar('PKGD', True)
238 pathprefix = "export PATH=%s; " % d.getVar('PATH', True)
239 strip = d.getVar("STRIP", True)
240 objcopy = d.getVar("OBJCOPY", True)
241 debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit")
242 workdir = d.getVar("WORKDIR", True)
243 workparentdir = os.path.dirname(workdir)
244 workbasedir = os.path.basename(workdir)
245 sourcefile = d.expand("${WORKDIR}/debugsources.list") 237 sourcefile = d.expand("${WORKDIR}/debugsources.list")
238 if debugsrcdir and os.path.isfile(sourcefile):
239 dvar = d.getVar('PKGD', True)
240 pathprefix = "export PATH=%s; " % d.getVar('PATH', True)
241 strip = d.getVar("STRIP", True)
242 objcopy = d.getVar("OBJCOPY", True)
243 debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit")
244 workdir = d.getVar("WORKDIR", True)
245 workparentdir = os.path.dirname(workdir)
246 workbasedir = os.path.basename(workdir)
246 247
247 if debugsrcdir:
248 nosuchdir = [] 248 nosuchdir = []
249 basepath = dvar 249 basepath = dvar
250 for p in debugsrcdir.split("/"): 250 for p in debugsrcdir.split("/"):