Patchwork [1/6] kernel-yocto: quote kconfig mode check

login
register
mail settings
Submitter Bruce Ashfield
Date May 5, 2014, 2:10 p.m.
Message ID <6e326495b27935d351c2a3c89d5b73603eba52c3.1399297986.git.bruce.ashfield@windriver.com>
Download mbox | patch
Permalink /patch/71511/
State New
Headers show

Comments

Bruce Ashfield - May 5, 2014, 2:10 p.m.
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@windriver.com>
---
 meta/classes/kernel-yocto.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 53bc6d443cdb..6010dc94e026 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