[oe-commits] [openembedded-core] 61/63: u-boot: Fix handling of CMD_LICENSE in u-boot-mkimage

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 66d308b22bb67b94b2aae5e0d3122a281b1e766b
Author: Marek Vasut <marex at denx.de>
AuthorDate: Tue Feb 28 20:41:10 2017 +0100

    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 <marex at denx.de>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 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 66edae8..c110226 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
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.