diff options
author | Jens Rehsack <rehsack@gmail.com> | 2020-06-11 16:30:14 +0200 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2020-07-06 05:24:15 -1000 |
commit | 8c2f4dc79f69df2174b8ab4f8b69a749aee16129 (patch) | |
tree | 22960eac773e0e0d6491d2bdade731c9b4476b24 /meta/recipes-bsp | |
parent | cd7ca887f79f67f2cf0499481a4032825c3077f2 (diff) | |
download | openembedded-core-contrib-8c2f4dc79f69df2174b8ab4f8b69a749aee16129.tar.gz |
u-boot: avoid blind merging all *.cfg
This fixes u-boot-qoriq breakage of:
commit 4fde8c8f479f5acd24fb6e0d0b9b4dc94d6f560b
Author: Ming Liu <ming.liu@toradex.com>
Date: Wed Jun 3 13:56:01 2020 +0200
u-boot: support merging .cfg files for UBOOT_CONFIG
U-boot recipe supports .cfg files in SRC_URI, but they would be merged
to .config during do_configure only when UBOOT_MACHINE is set, we
should also support merging .cfg files for UBOOT_CONFIG.
The intension of 4fde8c8 looks more than append delta-config snippets to
u-boot config and should probably be rewritten to express that much better
than implicitely assume all "*.cfg" are for merging into .config.
Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b4644f231a1463123d4100fcaf1448b3d174ef1a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index f905dfed4e..bed759c7c5 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -89,8 +89,10 @@ do_configure () { j=$(expr $j + 1); if [ $j -eq $i ]; then oe_runmake -C ${S} O=${B}/${config} ${config} - merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))} - oe_runmake -C ${S} O=${B}/${config} oldconfig + if [ test -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 fi done unset j @@ -123,7 +125,7 @@ do_compile () { echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion fi - if [ -n "${UBOOT_CONFIG}" ] + if [ -n "${UBOOT_CONFIG}" -o -n "${UBOOT_DELTA_CONFIG}" ] then unset i j k for config in ${UBOOT_MACHINE}; do |