From f7d4375146af22c72e2bdc9426329cd37f610a47 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Tue, 28 Feb 2017 20:41:10 +0100 Subject: 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. Signed-off-by: Marek Vasut Signed-off-by: Ross Burton --- meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 () { # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and # generating it requires bin2header tool, which for target build # is built with target tools and thus cannot be executed on host. - sed -i "s/CONFIG_CMD_LICENSE.*/# CONFIG_CMD_LICENSE is not set/" .config + sed -i "s/CONFIG_CMD_LICENSE=.*/# CONFIG_CMD_LICENSE is not set/" .config oe_runmake cross_tools NO_SDL=1 } -- cgit 1.2.3-korg