summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharlie Davies <charles.davies@whitetree.xyz>2020-07-09 20:22:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-22 22:46:37 +0100
commit15de675ce832eaca20dc05ad5f7be128a9ee9708 (patch)
treea51aeea995c2fc6ba1187cf9cc37faef9a5fe4ee
parent6fe120ca96f65a5e2c83a5d2fe97f35e097d4164 (diff)
downloadpoky-15de675ce832eaca20dc05ad5f7be128a9ee9708.tar.gz
poky-15de675ce832eaca20dc05ad5f7be128a9ee9708.tar.bz2
poky-15de675ce832eaca20dc05ad5f7be128a9ee9708.zip
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 <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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc2
1 files changed, 1 insertions, 1 deletions
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