[PATCH 0/1] devtool: modify: fix usage on the kernel

[PATCH 0/1] devtool: modify: fix usage on the kernel

[Paul Eggleton]

Fix for a regression caused by my tinfoil2 changes.


The following changes since commit 91f856426c7523e1ebdf6d6f93f5fa7e509d6e49:

  oeqa/utils/commands.py: Fix get_bb_vars() when called without arguments (2016-12-14 16:14:59 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib paule/devtool-tinfoil2-fix
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/devtool-tinfoil2-fix

Paul Eggleton (1):
  devtool: modify: fix usage on the kernel

 scripts/lib/devtool/standard.py | 2 ++
 1 file changed, 2 insertions(+)

-- 
2.5.5

[PATCH 1/1] devtool: modify: fix usage on the kernel

[Paul Eggleton]

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>
---
 scripts/lib/devtool/standard.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index c52b006..793fdaf 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)
-- 
2.5.5