summaryrefslogtreecommitdiffstats
path: root/scripts/lib
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:50:16 +0000
commit358befb76ede4b111a9ee913ae2586ea30dc23b7 (patch)
tree7c6c72aa7cf8388ba26913f6a635348c87d6376b /scripts/lib
parent28c79d8aebb7f5ec054ba6996bbd0c5691120f33 (diff)
downloadpoky-358befb76ede4b111a9ee913ae2586ea30dc23b7.tar.gz
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.) (From OE-Core rev: 06127d0115ba449bf04e2579cd1010065e0ed6e3) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-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):
746 if not tinfoil: 746 if not tinfoil:
747 # Error already shown 747 # Error already shown
748 return 1 748 return 1
749 # We need to re-parse because tinfoil may have been re-initialised
750 rd = parse_recipe(config, tinfoil, args.recipename, True)
749 751
750 recipefile = rd.getVar('FILE') 752 recipefile = rd.getVar('FILE')
751 appendfile = recipe_to_append(recipefile, config, args.wildcard) 753 appendfile = recipe_to_append(recipefile, config, args.wildcard)