]> code.ossystems Code Review - openembedded-core.git/commitdiff
u-boot: fix condition to allow use of *.cfg
authorCharlie Davies <charles.davies@whitetree.xyz>
Thu, 9 Jul 2020 19:22:08 +0000 (20:22 +0100)
committerSteve Sakoman <steve@sakoman.com>
Tue, 14 Jul 2020 03:16:12 +0000 (17:16 -1000)
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.

Signed-off-by: Charlie Davies <charles.davies@whitetree.xyz>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 766f827df4c3f76b1ef06acaba3c4f160c3791aa)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/recipes-bsp/u-boot/u-boot.inc

index bed759c7c5e3aa8ed46940a455428623c135ecc0..23cc795cabaedfaafc8c771deb6ed7f7c61770b1 100644 (file)
@@ -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