summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2019-11-20 19:25:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-02 16:57:21 +0000
commite209b9f0bfc5092e0ebb0fbbed963fe3d960eca7 (patch)
tree5e15f7ca719927f3a8f5a1bb3c322f6dc1a0ce9a /scripts/lib/devtool
parent753cffb1057ddb2c5eba87393087329a8fd51e0e (diff)
downloadpoky-e209b9f0bfc5092e0ebb0fbbed963fe3d960eca7.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: 6cc17e658c3dbadc772353f0f200561d2d988658) Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool')
-rw-r--r--scripts/lib/devtool/standard.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 52efeae938..bab644b83a 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -936,8 +936,10 @@ def modify(args, config, basepath, workspace):
936 '}\n') 936 '}\n')
937 if rd.getVarFlag('do_menuconfig','task'): 937 if rd.getVarFlag('do_menuconfig','task'):
938 f.write('\ndo_configure_append() {\n' 938 f.write('\ndo_configure_append() {\n'
939 ' cp ${B}/.config ${S}/.config.baseline\n' 939 ' if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n'
940 ' ln -sfT ${B}/.config ${S}/.config.new\n' 940 ' cp ${B}/.config ${S}/.config.baseline\n'
941 ' ln -sfT ${B}/.config ${S}/.config.new\n'
942 ' fi\n'
941 '}\n') 943 '}\n')
942 if initial_rev: 944 if initial_rev:
943 f.write('\n# initial_rev: %s\n' % initial_rev) 945 f.write('\n# initial_rev: %s\n' % initial_rev)