diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2020-02-05 20:15:40 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-11 23:05:12 +0000 |
commit | 743578651661a8de67574474cbd96df1a7f1190e (patch) | |
tree | 194e3439fc29287133220cb099167c44ce7e007a | |
parent | 8a398c5fab8594a6d985298dd796ab4e84c41ad9 (diff) | |
download | poky-743578651661a8de67574474cbd96df1a7f1190e.tar.gz |
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
(From OE-Core rev: 803391ef7ba662a5ee58609d9c81aeffa494287c)
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | scripts/lib/devtool/standard.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 60c9a046f9..b43c725cf8 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -940,8 +940,10 @@ def modify(args, config, basepath, workspace): | |||
940 | '}\n') | 940 | '}\n') |
941 | if rd.getVarFlag('do_menuconfig','task'): | 941 | if rd.getVarFlag('do_menuconfig','task'): |
942 | f.write('\ndo_configure_append() {\n' | 942 | f.write('\ndo_configure_append() {\n' |
943 | ' cp ${B}/.config ${S}/.config.baseline\n' | 943 | ' if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n' |
944 | ' ln -sfT ${B}/.config ${S}/.config.new\n' | 944 | ' cp ${B}/.config ${S}/.config.baseline\n' |
945 | ' ln -sfT ${B}/.config ${S}/.config.new\n' | ||
946 | ' fi\n' | ||
945 | '}\n') | 947 | '}\n') |
946 | if initial_rev: | 948 | if initial_rev: |
947 | f.write('\n# initial_rev: %s\n' % initial_rev) | 949 | f.write('\n# initial_rev: %s\n' % initial_rev) |