From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Wed, 20 Nov 2019 19:25:51 +0000 (+0000)
Subject: u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00e0bc966cc21e8560587c73e72858b9d2e8c891;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a6c430b0077eb56b4adbe391a0a05a52133cc8f0)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 9a754fd09b0..d241347bf7f 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
 }