summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-02-19 16:40:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-23 17:35:29 +0000
commite2ce29fef25b8eba8fa6cec0a87c5412b51ec813 (patch)
tree09645521609ae5d7ab348b8f0f477fadd79bbd81 /scripts
parentefedd4323b719679b3f6c050e1c7c29e2804cd10 (diff)
downloadpoky-e2ce29fef25b8eba8fa6cec0a87c5412b51ec813.tar.gz
devtool: prevent extract/modify use with image recipes
There wouldn't be any point to using these with an image recipe, so disallow it. (From OE-Core rev: 611c27182a6e52e159a1ce1b5bac054405c611d2) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/standard.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 3a8c66c131..9ab3aa608c 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -141,6 +141,10 @@ def _extract_source(srctree, keep_temp, devbranch, d):
141 logger.error("The %s recipe uses a shared workdir which this tool does not currently support" % pn) 141 logger.error("The %s recipe uses a shared workdir which this tool does not currently support" % pn)
142 return None 142 return None
143 143
144 if bb.data.inherits_class('image', d):
145 logger.error("The %s recipe is an image, and therefore is not supported by this tool" % pn)
146 return None
147
144 if bb.data.inherits_class('externalsrc', d) and d.getVar('EXTERNALSRC', True): 148 if bb.data.inherits_class('externalsrc', d) and d.getVar('EXTERNALSRC', True):
145 logger.error("externalsrc is currently enabled for the %s recipe. This prevents the normal do_patch task from working. You will need to disable this first." % pn) 149 logger.error("externalsrc is currently enabled for the %s recipe. This prevents the normal do_patch task from working. You will need to disable this first." % pn)
146 return None 150 return None
@@ -290,6 +294,10 @@ def modify(args, config, basepath, workspace):
290 return -1 294 return -1
291 rd = oe.recipeutils.parse_recipe(recipefile, tinfoil.config_data) 295 rd = oe.recipeutils.parse_recipe(recipefile, tinfoil.config_data)
292 296
297 if bb.data.inherits_class('image', rd):
298 logger.error("The %s recipe is an image, and therefore is not supported by this tool" % args.recipename)
299 return None
300
293 initial_rev = None 301 initial_rev = None
294 commits = [] 302 commits = []
295 srctree = os.path.abspath(args.srctree) 303 srctree = os.path.abspath(args.srctree)