[oe-commits] Paul Eggleton : devtool: prevent extract/modify use with image recipes
git at git.openembedded.org
git at git.openembedded.org
Sat Feb 21 22:06:27 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: e8396e731c1b6496da0e7a26c5b0157843ca3ad9
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e8396e731c1b6496da0e7a26c5b0157843ca3ad9
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Thu Feb 19 16:40:01 2015 +0000
devtool: prevent extract/modify use with image recipes
There wouldn't be any point to using these with an image recipe, so
disallow it.
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
scripts/lib/devtool/standard.py | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 3a8c66c..9ab3aa6 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):
logger.error("The %s recipe uses a shared workdir which this tool does not currently support" % pn)
return None
+ if bb.data.inherits_class('image', d):
+ logger.error("The %s recipe is an image, and therefore is not supported by this tool" % pn)
+ return None
+
if bb.data.inherits_class('externalsrc', d) and d.getVar('EXTERNALSRC', True):
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)
return None
@@ -290,6 +294,10 @@ def modify(args, config, basepath, workspace):
return -1
rd = oe.recipeutils.parse_recipe(recipefile, tinfoil.config_data)
+ if bb.data.inherits_class('image', rd):
+ logger.error("The %s recipe is an image, and therefore is not supported by this tool" % args.recipename)
+ return None
+
initial_rev = None
commits = []
srctree = os.path.abspath(args.srctree)
More information about the Openembedded-commits
mailing list