From 65d341daaf1edf7241b0ea518ef9beb4328f16e9 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 20 Nov 2019 19:25:51 +0000 Subject: u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig For u-boot recipes without menuconfig support, running devtool results in a do_configure 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 arises because u-boot.inc supports recipes with and without menuconfig. Fix the problem by properly setting DEVTOOL_DISABLE_MENUCONFIG so that devtool can control logic that applies only for menuconfig support. (From OE-Core rev: 00e0bc966cc21e8560587c73e72858b9d2e8c891) Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie (cherry picked from commit a6c430b0077eb56b4adbe391a0a05a52133cc8f0) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/u-boot.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 9a754fd09b..d241347bf7 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -87,6 +87,8 @@ do_configure () { fi merge_config.sh -m .config ${@" ".join(find_cfgs(d))} cml1_do_configure + else + DEVTOOL_DISABLE_MENUCONFIG=true fi } -- cgit v1.2.3-54-g00ecf