summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-09-22 17:21:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-23 09:53:16 +0100
commit5bc437b9853e9a52b0672edc8ecb40a0e9911e02 (patch)
tree414c1e8619e22b06d98d7e052c7f03fd701fe512 /scripts/lib
parent210d9590230d0168fb0fdf8a70f8f0f3239894f2 (diff)
downloadpoky-5bc437b9853e9a52b0672edc8ecb40a0e9911e02.tar.gz
devtool: show proper error when extracting source for recipes with disabled unpack task
If you try to use "devtool modify -x" or "devtool extract" on a recipe where do_unpack has been set as noexec (e.g. glibc-locale), then we get an error because the expected source wasn't ever unpacked. Do a check up front for noexec being set on do_unpack and error out with a reasonable message if that's the case. (From OE-Core rev: 39a93c85e798e72edd6ab3c05f8adbb1a97e893e) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/devtool/standard.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 700a56b4ed..72ec97b68a 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -261,6 +261,10 @@ def _extract_source(srctree, keep_temp, devbranch, d):
261 raise DevtoolError("output path %s already exists and is " 261 raise DevtoolError("output path %s already exists and is "
262 "non-empty" % srctree) 262 "non-empty" % srctree)
263 263
264 if 'noexec' in (d.getVarFlags('do_unpack', False) or []):
265 raise DevtoolError("The %s recipe has do_unpack disabled, unable to "
266 "extract source" % pn)
267
264 # Prepare for shutil.move later on 268 # Prepare for shutil.move later on
265 bb.utils.mkdirhier(srctree) 269 bb.utils.mkdirhier(srctree)
266 os.rmdir(srctree) 270 os.rmdir(srctree)