aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-21 09:06:35 +0000
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2012-11-29 12:00:34 +0100
commit0f0f10b5b6d36ab12525dfc98c653d778922bcc7 (patch)
treefe0aa6c0f75eb0927a15d1811f68a0e7f32a3f8a
parent03c527d22efaab178dd64ed502e4f154e7d353ed (diff)
downloadopenembedded-core-contrib-0f0f10b5b6d36ab12525dfc98c653d778922bcc7.tar.gz
openembedded-core-contrib-0f0f10b5b6d36ab12525dfc98c653d778922bcc7.tar.bz2
openembedded-core-contrib-0f0f10b5b6d36ab12525dfc98c653d778922bcc7.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 15e505d4d6..3278d37b53 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