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>
This commit is contained in:
Paul Barker
2020-02-06 12:35:49 -05:00
committed by Richard Purdie
parent f88946d48d
commit 83c1977475

View File

@@ -359,8 +359,10 @@ do_kernel_configme() {
bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
fi
echo "# Global settings from linux recipe" >> ${B}/.config
echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config
if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then
echo "# Global settings from linux recipe" >> ${B}/.config
echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config
fi
}
addtask kernel_configme before do_configure after do_patch