[oe-commits] Bruce Ashfield : kernel-yocto: quote kconfig mode check

git at git.openembedded.org git at git.openembedded.org
Tue May 6 17:01:30 UTC 2014


Module: openembedded-core.git
Branch: master-next
Commit: aad19e4381a8a09c354e5899885997c5b4cd115b
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=aad19e4381a8a09c354e5899885997c5b4cd115b

Author: Bruce Ashfield <bruce.ashfield at windriver.com>
Date:   Thu Apr 24 14:09:39 2014 -0400

kernel-yocto: quote kconfig mode check

We allow inheriting recipes to control the kconfig mode used by merge_config.sh
via the KCONFIG_MODE variable. An error crept into the variable reference, and
since it is not quoted, the true condition always runs.

The result is that operations without an explicit kconfig mode cannot trigger
allnoconfig for defconfig builds, which can result in some options being
dropped from the final .config.

Quoting the reference allows it to evaluate properly.

Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/kernel-yocto.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 53bc6d4..6010dc9 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -241,7 +241,7 @@ do_kernel_configme() {
 	echo "[INFO] doing kernel configme"
 	export KMETA=${KMETA}
 
-	if [ -n ${KCONFIG_MODE} ]; then
+	if [ -n "${KCONFIG_MODE}" ]; then
 		configmeflags=${KCONFIG_MODE}
 	else
 		# If a defconfig was passed, use =n as the baseline, which is achieved



More information about the Openembedded-commits mailing list