From 15de675ce832eaca20dc05ad5f7be128a9ee9708 Mon Sep 17 00:00:00 2001 From: Charlie Davies Date: Thu, 9 Jul 2020 20:22:08 +0100 Subject: u-boot: fix condition to allow use of *.cfg U-boot recipe supports .cfg files in SRC_URI, but bug in conditional statement meant that the code was unreachable and the .cfg files were never applied. (From OE-Core rev: 4fc386279ef4616d1e103cb70facee5716d335ff) Signed-off-by: Charlie Davies Signed-off-by: Richard Purdie (cherry picked from commit 766f827df4c3f76b1ef06acaba3c4f160c3791aa) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/u-boot.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index bed759c7c5..23cc795cab 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -89,7 +89,7 @@ do_configure () { j=$(expr $j + 1); if [ $j -eq $i ]; then oe_runmake -C ${S} O=${B}/${config} ${config} - if [ test -n "${@' '.join(find_cfgs(d))}" ]; then + if [ -n "${@' '.join(find_cfgs(d))}" ]; then merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))} oe_runmake -C ${S} O=${B}/${config} oldconfig fi -- cgit v1.2.3-54-g00ecf