summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-04-24 14:09:39 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-06 17:59:17 +0100
commitee4f09a8506b60470edc313511da9c0d0260856a (patch)
tree08c370537b4b7190c111a4d6271e751fc0071a46
parent8de1de82274316c3425a1d9baf333db789792fe1 (diff)
downloadpoky-ee4f09a8506b60470edc313511da9c0d0260856a.tar.gz
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. (From OE-Core rev: aad19e4381a8a09c354e5899885997c5b4cd115b) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-yocto.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 53bc6d443c..6010dc94e0 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -241,7 +241,7 @@ do_kernel_configme() {
241 echo "[INFO] doing kernel configme" 241 echo "[INFO] doing kernel configme"
242 export KMETA=${KMETA} 242 export KMETA=${KMETA}
243 243
244 if [ -n ${KCONFIG_MODE} ]; then 244 if [ -n "${KCONFIG_MODE}" ]; then
245 configmeflags=${KCONFIG_MODE} 245 configmeflags=${KCONFIG_MODE}
246 else 246 else
247 # If a defconfig was passed, use =n as the baseline, which is achieved 247 # If a defconfig was passed, use =n as the baseline, which is achieved