[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4962/8267] u-boot: Fix handling of CMD_LICENSE in u-boot-mkimage
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 4962/8267] u-boot: Fix handling of CMD_LICENSE in u-boot-mkimage
- Date: Sun, 17 Dec 2017 02:46:19 +0000 (UTC)
commit bbb1a0781a7be6efed6b43c0e22e31efc4c63dd5
Author: Marek Vasut <marex denx de>
Date: 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.
(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>
meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb | 2 +-
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 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
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]