From 212397c87becd84261a8646d7af5830be923788a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 21 Nov 2012 09:06:35 +0000 Subject: package.bbclass: Adapt debugsrc code to workdir layout changes With the change to WORKDIR layout, splutting PN and PV into two directories, the debugsrc splutting code layout became suboptimal. This changes things to include the information as it was before. Ideally this code would be written to more generically support other layouts buts it not clear that the tools would even support that right now so this is the best immediate fix. (From OE-Core rev: 432cfbb403f0e864d1fad383c2bbb6f9bdb80770) Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 15e505d..3278d37 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -232,7 +232,7 @@ def splitfile(file, debugfile, debugsrcdir, d): objcopy = d.getVar("OBJCOPY", True) debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit") workdir = d.getVar("WORKDIR", True) - workparentdir = d.getVar("DEBUGSRC_OVERRIDE_PATH", True) or os.path.dirname(workdir) + workparentdir = d.getVar("DEBUGSRC_OVERRIDE_PATH", True) or os.path.dirname(os.path.dirname(workdir)) sourcefile = d.expand("${WORKDIR}/debugsources.list") # We ignore kernel modules, we don't generate debug info files. @@ -277,8 +277,8 @@ def splitfile2(debugsrcdir, d): objcopy = d.getVar("OBJCOPY", True) debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit") workdir = d.getVar("WORKDIR", True) - workparentdir = os.path.dirname(workdir) - workbasedir = os.path.basename(workdir) + workparentdir = os.path.dirname(os.path.dirname(workdir)) + workbasedir = os.path.basename(os.path.dirname(workdir)) + "/" + os.path.basename(workdir) nosuchdir = [] basepath = dvar -- cgit v1.1