summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-09-22 17:21:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-22 18:12:57 +0100
commit0bab8086fdef93b88d5ec6b88b07ccc921dd786f (patch)
tree22443b8eca0cc8e3cc78a55c77cb45e9a9338d9c
parent39a93c85e798e72edd6ab3c05f8adbb1a97e893e (diff)
downloadopenembedded-core-contrib-0bab8086fdef93b88d5ec6b88b07ccc921dd786f.tar.gz
openembedded-core-contrib-0bab8086fdef93b88d5ec6b88b07ccc921dd786f.tar.bz2
openembedded-core-contrib-0bab8086fdef93b88d5ec6b88b07ccc921dd786f.zip
devtool: fix extracting source for work-shared recipes
Recipes that use work-shared (such as libgcc) are capable of unpacking the source, but it doesn't necessarily unpack to ${WORKDIR}/${BP}. Use the last part of the actual S value instead which is more likely to work. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/devtool/standard.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 72ec97b68a..2dbe37263c 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -288,7 +288,7 @@ def _extract_source(srctree, keep_temp, devbranch, d):
if bb.data.inherits_class('kernel', d):
crd.setVar('S', '${WORKDIR}/source')
else:
- crd.setVar('S', '${WORKDIR}/${BP}')
+ crd.setVar('S', '${WORKDIR}/%s' % os.path.basename(d.getVar('S', True)))
if bb.data.inherits_class('kernel', d):
# We don't want to move the source to STAGING_KERNEL_DIR here
crd.setVar('STAGING_KERNEL_DIR', '${S}')