summaryrefslogtreecommitdiffstats
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-22 18:12:56 +0100
commit39a93c85e798e72edd6ab3c05f8adbb1a97e893e (patch)
tree8b0412c79c377297ee05242750707bdc65c7e4cd
parent58dc726808817210764eab963a4d453dc4ff49aa (diff)
downloadopenembedded-core-contrib-39a93c85e798e72edd6ab3c05f8adbb1a97e893e.tar.gz
openembedded-core-contrib-39a93c85e798e72edd6ab3c05f8adbb1a97e893e.tar.bz2
openembedded-core-contrib-39a93c85e798e72edd6ab3c05f8adbb1a97e893e.zip
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. 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.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):
raise DevtoolError("output path %s already exists and is "
"non-empty" % srctree)
+ if 'noexec' in (d.getVarFlags('do_unpack', False) or []):
+ raise DevtoolError("The %s recipe has do_unpack disabled, unable to "
+ "extract source" % pn)
+
# Prepare for shutil.move later on
bb.utils.mkdirhier(srctree)
os.rmdir(srctree)