summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <pbarker@konsulko.com>2020-02-06 12:35:49 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-08 13:20:02 +0000
commit83c19774758595d5648282c0568aadee087c6527 (patch)
tree2030aba7d9d95fb348bf5876ade0d67f78acb849
parentf88946d48db8cb66d541781e853fa4281d63dc44 (diff)
downloadpoky-83c19774758595d5648282c0568aadee087c6527.tar.gz
kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set
CONFIG_LOCALVERSION may already be set in a defconfig or config fragment and this should not be unconditionally overridden. (From OE-Core rev: 613c43f910cbdf5e03ef3d5bbf92de69082a30c9) Signed-off-by: Paul Barker <pbarker@konsulko.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-yocto.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 9a4d2864eb..e8a9b1f18e 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -359,8 +359,10 @@ do_kernel_configme() {
359 bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" 359 bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
360 fi 360 fi
361 361
362 echo "# Global settings from linux recipe" >> ${B}/.config 362 if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then
363 echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config 363 echo "# Global settings from linux recipe" >> ${B}/.config
364 echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config
365 fi
364} 366}
365 367
366addtask kernel_configme before do_configure after do_patch 368addtask kernel_configme before do_configure after do_patch