diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-09-22 17:21:31 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-23 09:53:17 +0100 |
commit | a34f733d3a8cb300c2737a4b67f179c627efc46f (patch) | |
tree | d15101bb32c6b9fc4372b0488db6ed1b25e7b488 | |
parent | 5bc437b9853e9a52b0672edc8ecb40a0e9911e02 (diff) | |
download | poky-a34f733d3a8cb300c2737a4b67f179c627efc46f.tar.gz |
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.
(From OE-Core rev: 0bab8086fdef93b88d5ec6b88b07ccc921dd786f)
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.py | 2 |
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): | |||
288 | if bb.data.inherits_class('kernel', d): | 288 | if bb.data.inherits_class('kernel', d): |
289 | crd.setVar('S', '${WORKDIR}/source') | 289 | crd.setVar('S', '${WORKDIR}/source') |
290 | else: | 290 | else: |
291 | crd.setVar('S', '${WORKDIR}/${BP}') | 291 | crd.setVar('S', '${WORKDIR}/%s' % os.path.basename(d.getVar('S', True))) |
292 | if bb.data.inherits_class('kernel', d): | 292 | if bb.data.inherits_class('kernel', d): |
293 | # We don't want to move the source to STAGING_KERNEL_DIR here | 293 | # We don't want to move the source to STAGING_KERNEL_DIR here |
294 | crd.setVar('STAGING_KERNEL_DIR', '${S}') | 294 | crd.setVar('STAGING_KERNEL_DIR', '${S}') |