[oe-commits] [openembedded-core] 19/23: devtool/standard.py: Allow recipe to disable menuconfig logic

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

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

commit 107cdf298fb03930e82f3b50f97d608fab12fb50
Author: Tom Hochstein <tom.hochstein at nxp.com>
AuthorDate: Wed Nov 20 19:25:44 2019 +0000

    devtool/standard.py: Allow recipe to disable menuconfig logic
    
    u-boot.inc supports u-boot recipes with or without menuconfig [1].
    However, running devtool on a u-boot recipe that does not support menuconfig
    results in an error:
    
    cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory
    
    The problem is the devtool logic assumes that any recipe with a do_menuconfig task
    will generate a .config in do_configure().
    
    Fix the problem by removing the assumption with a flag that the recipe can control,
    like this:
    
    do_configure() {
        if [ menuconfig-supported ]; then
            ...
        else
            DEVTOOL_DISABLE_MENUCONFIG=true
        fi
    }
    
    [1] https://github.com/openembedded/openembedded-core/commit/11278e3b2c75be80645b9841763a97dbb35daadc
    
    Signed-off-by: Tom Hochstein <tom.hochstein at nxp.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/lib/devtool/standard.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 52efeae..bab644b 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -936,8 +936,10 @@ def modify(args, config, basepath, workspace):
                         '}\n')
             if rd.getVarFlag('do_menuconfig','task'):
                 f.write('\ndo_configure_append() {\n'
-                '    cp ${B}/.config ${S}/.config.baseline\n'
-                '    ln -sfT ${B}/.config ${S}/.config.new\n'
+                '    if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n'
+                '        cp ${B}/.config ${S}/.config.baseline\n'
+                '        ln -sfT ${B}/.config ${S}/.config.new\n'
+                '    fi\n'
                 '}\n')
             if initial_rev:
                 f.write('\n# initial_rev: %s\n' % initial_rev)

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