summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-21 09:06:35 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-21 09:10:02 +0000
commit212397c87becd84261a8646d7af5830be923788a (patch)
tree1801cee5fbce6779add225f580fe202c20452e8f /meta/classes
parent6208572a7c300c1415df507326ccd520d7216f2c (diff)
downloadpoky-212397c87becd84261a8646d7af5830be923788a.tar.gz
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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):
232 objcopy = d.getVar("OBJCOPY", True) 232 objcopy = d.getVar("OBJCOPY", True)
233 debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit") 233 debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit")
234 workdir = d.getVar("WORKDIR", True) 234 workdir = d.getVar("WORKDIR", True)
235 workparentdir = d.getVar("DEBUGSRC_OVERRIDE_PATH", True) or os.path.dirname(workdir) 235 workparentdir = d.getVar("DEBUGSRC_OVERRIDE_PATH", True) or os.path.dirname(os.path.dirname(workdir))
236 sourcefile = d.expand("${WORKDIR}/debugsources.list") 236 sourcefile = d.expand("${WORKDIR}/debugsources.list")
237 237
238 # We ignore kernel modules, we don't generate debug info files. 238 # We ignore kernel modules, we don't generate debug info files.
@@ -277,8 +277,8 @@ def splitfile2(debugsrcdir, d):
277 objcopy = d.getVar("OBJCOPY", True) 277 objcopy = d.getVar("OBJCOPY", True)
278 debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit") 278 debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit")
279 workdir = d.getVar("WORKDIR", True) 279 workdir = d.getVar("WORKDIR", True)
280 workparentdir = os.path.dirname(workdir) 280 workparentdir = os.path.dirname(os.path.dirname(workdir))
281 workbasedir = os.path.basename(workdir) 281 workbasedir = os.path.basename(os.path.dirname(workdir)) + "/" + os.path.basename(workdir)
282 282
283 nosuchdir = [] 283 nosuchdir = []
284 basepath = dvar 284 basepath = dvar