aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-12-16 10:05:53 +1300
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-12-16 10:16:34 +1300
commit0da624f81c0d1ff1156464927878b718db955d48 (patch)
treefcd9db6e2cb596f92b3765bf407600f696183dea
parent91f856426c7523e1ebdf6d6f93f5fa7e509d6e49 (diff)
downloadopenembedded-core-contrib-paule/devtool-tinfoil2-fix.tar.gz
openembedded-core-contrib-paule/devtool-tinfoil2-fix.tar.bz2
openembedded-core-contrib-paule/devtool-tinfoil2-fix.zip
devtool: modify: fix usage on the kernelpaule/devtool-tinfoil2-fix
When using devtool modify on the kernel, we have to do a bit of a dance with tinfoil instances because we only find out that we're working on a kernel recipe after tinfoil is initialised, but then we need to build kern-tools-native which we're doing just by running bitbake directly. With the tinfoil2 changes, a datastore for the recipe that we were keeping around across the opening and closing of tinfoil is no longer able to be used. Re-parse the recipe to avoid this problem. (In future this whole thing will be able to be done in the same tinfoil instance thanks to tinfoil2, but that refactoring is yet to be done.) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--scripts/lib/devtool/standard.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index c52b00678e..793fdaf013 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -746,6 +746,8 @@ def modify(args, config, basepath, workspace):
if not tinfoil:
# Error already shown
return 1
+ # We need to re-parse because tinfoil may have been re-initialised
+ rd = parse_recipe(config, tinfoil, args.recipename, True)
recipefile = rd.getVar('FILE', True)
appendfile = recipe_to_append(recipefile, config, args.wildcard)