summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-12-16 10:17:37 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-22 08:46:35 +0000
commit06127d0115ba449bf04e2579cd1010065e0ed6e3 (patch)
treea2378a758434eab562f0b4c9db8159f9c7db2466 /scripts
parent803b5fa798cf7580c7c10401eb04a1cccf51b8ab (diff)
downloadopenembedded-core-contrib-06127d0115ba449bf04e2579cd1010065e0ed6e3.tar.gz
openembedded-core-contrib-06127d0115ba449bf04e2579cd1010065e0ed6e3.tar.bz2
openembedded-core-contrib-06127d0115ba449bf04e2579cd1010065e0ed6e3.zip
devtool: modify: fix usage on the kernel
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> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
-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 e662e3b505..8944b0a34b 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')
appendfile = recipe_to_append(recipefile, config, args.wildcard)