diff options
author | Jens Rehsack <rehsack@gmail.com> | 2020-06-11 16:30:14 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-07 23:15:09 +0100 |
commit | 2d47263d7519e587443aace383c3fd0c50921c34 (patch) | |
tree | 939cee8130719a09511f80c76df8c515944da0bd /meta/site/common-mingw | |
parent | 29513a7d1cda1b82969085f7c3c0d021d2725a7e (diff) | |
download | poky-2d47263d7519e587443aace383c3fd0c50921c34.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.
(From OE-Core rev: 8c2f4dc79f69df2174b8ab4f8b69a749aee16129)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/site/common-mingw')
0 files changed, 0 insertions, 0 deletions