[oe-commits] [openembedded-core] branch master-next updated: Revert "kernel.bbclass: Add kernel_version_sanity_check function"

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

The following commit(s) were added to refs/heads/master-next by this push:
       new  080018a   Revert "kernel.bbclass: Add kernel_version_sanity_check function"
080018a is described below

commit 080018a28b480fc318d83d2794a8b4d8c9b72c59
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Sep 20 00:02:11 2016 +0100

    Revert "kernel.bbclass: Add kernel_version_sanity_check function"
    
    This reverts commit 8344cc08f8b504ef74c38a4cb50b28fc3d2b16cd.
---
 meta/classes/kernel.bbclass               | 30 ------------------------------
 meta/recipes-kernel/linux/linux-yocto.inc |  1 -
 2 files changed, 31 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 25a153c..bfb7350 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -327,36 +327,6 @@ kernel_do_install() {
 }
 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
-do_kernel_version_sanity_check() {
-	# 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
-	VERSION=$(grep "^VERSION =" ${S}/Makefile | sed s/.*=\ *//)
-	PATCHLEVEL=$(grep "^PATCHLEVEL =" ${S}/Makefile | sed s/.*=\ *//)
-	SUBLEVEL=$(grep "^SUBLEVEL =" ${S}/Makefile | sed s/.*=\ *//)
-	EXTRAVERSION=$(grep "^EXTRAVERSION =" ${S}/Makefile | sed s/.*=\ *//)
-
-	# Build a string for regex and a plain version string
-	reg="^${VERSION}\.${PATCHLEVEL}"
-	vers="${VERSION}.${PATCHLEVEL}"
-	if [ -n "${SUBLEVEL}" ]; then
-		# Ignoring a SUBLEVEL of zero is fine
-		if [ "${SUBLEVEL}" = "0" ]; then
-			reg="${reg}(\.${SUBLEVEL})?"
-		else
-			reg="${reg}\.${SUBLEVEL}"
-			vers="${vers}.${SUBLEVEL}"
-		fi
-	fi
-	vers="${vers}${EXTRAVERSION}"
-	reg="${reg}${EXTRAVERSION}"
-
-	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."
-	fi
-	exit 0
-}
-
 addtask shared_workdir after do_compile before do_compile_kernelmodules
 addtask shared_workdir_setscene
 
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc
index d979662..98a48ec 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -55,7 +55,6 @@ do_install_append(){
 }
 
 # extra tasks
-addtask kernel_version_sanity_check after do_kernel_checkout before do_compile
 addtask kernel_link_images after do_compile before do_install
 addtask validate_branches before do_patch after do_kernel_checkout
 addtask kernel_configcheck after do_configure before do_compile

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.