diff options
| author |   Charlie Davies <charles.davies@whitetree.xyz> | 2020-07-09 20:22:08 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2020-07-13 17:16:12 -1000 |
| commit | 4fc386279ef4616d1e103cb70facee5716d335ff (patch) | |
| tree | 98c27208922e4c579102805bbed3fe3d352c548e | |
| parent | 3b78a39535089bbafbeb1ebd854efe180890f375 (diff) | |
| download | openembedded-core-4fc386279ef4616d1e103cb70facee5716d335ff.tar.gz | |
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.
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>
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot.inc | 2 |
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 |