summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2017-02-28 20:41:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-04 23:18:20 +0000
commitbbb1a0781a7be6efed6b43c0e22e31efc4c63dd5 (patch)
tree845b44955cf488dd91aa25611a30d92b849c05e5
parent624bf097904f51f46dacf441440edeb7e47303a9 (diff)
downloadpoky-bbb1a0781a7be6efed6b43c0e22e31efc4c63dd5.tar.gz
u-boot: Fix handling of CMD_LICENSE in u-boot-mkimage
Only ever change the CMD_LICENSE in the u-boot config if it is enabled to prevent corruption of the config file. In case the CMD_LICENSE was already disabled, the sed substitution inserted another "# " in front of the CMD_LICENSE which triggered a restart of Kconfig oldconfig and failed the build. (From OE-Core rev: f7d4375146af22c72e2bdc9426329cd37f610a47) Signed-off-by: Marek Vasut <marex@denx.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb
index 66edae812f..c110226710 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb
@@ -13,7 +13,7 @@ do_compile () {
13 # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and 13 # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and
14 # generating it requires bin2header tool, which for target build 14 # generating it requires bin2header tool, which for target build
15 # is built with target tools and thus cannot be executed on host. 15 # is built with target tools and thus cannot be executed on host.
16 sed -i "s/CONFIG_CMD_LICENSE.*/# CONFIG_CMD_LICENSE is not set/" .config 16 sed -i "s/CONFIG_CMD_LICENSE=.*/# CONFIG_CMD_LICENSE is not set/" .config
17 17
18 oe_runmake cross_tools NO_SDL=1 18 oe_runmake cross_tools NO_SDL=1
19} 19}