diff options
author | Charlie Davies <charles.davies@whitetree.xyz> | 2020-07-09 20:22:08 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-22 22:46:37 +0100 |
commit | 15de675ce832eaca20dc05ad5f7be128a9ee9708 (patch) | |
tree | a51aeea995c2fc6ba1187cf9cc37faef9a5fe4ee | |
parent | 6fe120ca96f65a5e2c83a5d2fe97f35e097d4164 (diff) | |
download | poky-15de675ce832eaca20dc05ad5f7be128a9ee9708.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.
(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.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 () { | |||
89 | j=$(expr $j + 1); | 89 | j=$(expr $j + 1); |
90 | if [ $j -eq $i ]; then | 90 | if [ $j -eq $i ]; then |
91 | oe_runmake -C ${S} O=${B}/${config} ${config} | 91 | oe_runmake -C ${S} O=${B}/${config} ${config} |
92 | if [ test -n "${@' '.join(find_cfgs(d))}" ]; then | 92 | if [ -n "${@' '.join(find_cfgs(d))}" ]; then |
93 | merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))} | 93 | merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))} |
94 | oe_runmake -C ${S} O=${B}/${config} oldconfig | 94 | oe_runmake -C ${S} O=${B}/${config} oldconfig |
95 | fi | 95 | fi |