kernel.bbclass: Give sanity check function an opt-out variable
Having no opt-out method and adding the task to linux-yocto.inc was causing issues. For example, linux-yocto-dev would often fail because it uses AUTOREV with no way to dynamically change the PV. Add a variable to turn off the sanity check, allowing an easy opt out, and set the opt-out variable in linux-yocto-dev, fixing the issue with AUTOREV. (From OE-Core rev: 1b6a3c17874ead7ee0957e67329aa3bd019fa129) Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
f3881e63fd
commit
132b4d13e0
|
@ -327,6 +327,10 @@ do_install[prefuncs] += "package_get_auto_pr"
|
||||||
|
|
||||||
# Must be ran no earlier than after do_kernel_checkout or else Makefile won't be in ${S}/Makefile
|
# Must be ran no earlier than after do_kernel_checkout or else Makefile won't be in ${S}/Makefile
|
||||||
do_kernel_version_sanity_check() {
|
do_kernel_version_sanity_check() {
|
||||||
|
if [ "x${KERNEL_VERSION_SANITY_SKIP}" = "x1" ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
# The Makefile determines the kernel version shown at runtime
|
# The Makefile determines the kernel version shown at runtime
|
||||||
# Don't use KERNEL_VERSION because the headers it grabs the version from aren't generated until do_compile
|
# Don't use KERNEL_VERSION because the headers it grabs the version from aren't generated until do_compile
|
||||||
VERSION=$(grep "^VERSION =" ${S}/Makefile | sed s/.*=\ *//)
|
VERSION=$(grep "^VERSION =" ${S}/Makefile | sed s/.*=\ *//)
|
||||||
|
@ -350,7 +354,7 @@ do_kernel_version_sanity_check() {
|
||||||
reg="${reg}${EXTRAVERSION}"
|
reg="${reg}${EXTRAVERSION}"
|
||||||
|
|
||||||
if [ -z `echo ${PV} | grep -E "${reg}"` ]; then
|
if [ -z `echo ${PV} | grep -E "${reg}"` ]; then
|
||||||
bbfatal "Package Version (${PV}) does not match of kernel being built (${vers}). Please update the PV variable to match the kernel source."
|
bbfatal "Package Version (${PV}) does not match of kernel being built (${vers}). Please update the PV variable to match the kernel source or set KERNEL_VERSION_SANITY_SKIP=\"1\" in your recipe."
|
||||||
fi
|
fi
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,3 +44,4 @@ KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
|
||||||
KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
|
KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
|
||||||
KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
|
KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
|
||||||
|
|
||||||
|
KERNEL_VERSION_SANITY_SKIP = "1"
|
||||||
|
|
Loading…
Reference in New Issue