[oe-commits] [openembedded-core] 06/25: devtool: modify: fix usage on the kernel

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 06127d0115ba449bf04e2579cd1010065e0ed6e3
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Fri Dec 16 10:17:37 2016 +1300

    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 at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at 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 e662e3b..8944b0a 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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.