merge of '05ae7db20f9eaa0dd28712c87eb37d67106003e2'

     and '98967f30d170009882b65d09d686fc199579b15f'

4 files changed, 31 insertions, 48 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 0c62568107..a9b61d26b1 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -505,6 +505,9 @@ python base_eventhandler() {
 		monotone_revision = "<unknown>"
 		try:
 			monotone_revision = file( "%s/_MTN/revision" % path_to_packages ).read().strip()
+			if monotone_revision.startswith( "format_version" ):
+				monotone_revision_words = monotone_revision.split()
+				monotone_revision = monotone_revision_words[ monotone_revision_words.index( "old_revision" )+1][1:-1]
 		except IOError:
 			pass
 		bb.data.setVar( 'OE_REVISION', monotone_revision, e.data )
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 94e02925d7..3a7fd5b499 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -1,4 +1,4 @@
-inherit module_strip
+inherit linux-kernel-base module_strip
 
 PROVIDES += "virtual/kernel"
 DEPENDS += "virtual/${TARGET_PREFIX}depmod-${@get_kernelmajorversion('${PV}')} virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
@@ -43,37 +43,6 @@ KERNEL_IMAGEDEST = "boot"
 #
 export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
 
-# parse kernel ABI version out of <linux/version.h>
-def get_kernelversion(p):
-	import re, os
-
-	fn = p + '/include/linux/utsrelease.h'
-	if not os.path.isfile(fn):
-		fn = p + '/include/linux/version.h'
-	
-	import re
-	try:
-		f = open(fn, 'r')
-	except IOError:
-		return None
-
-	l = f.readlines()
-	f.close()
-	r = re.compile("#define UTS_RELEASE \"(.*)\"")
-	for s in l:
-		m = r.match(s)
-		if m:
-			return m.group(1)
-	return None
-
-def get_kernelmajorversion(p):
-	import re
-	r = re.compile("([0-9]+\.[0-9]+).*")
-	m = r.match(p);
-	if m:
-		return m.group(1)
-	return None
-
 KERNEL_VERSION = "${@get_kernelversion('${S}')}"
 KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}"
 
diff --git a/classes/linux_modules.bbclass b/classes/linux-kernel-base.bbclass
index d5c4e74ca1..e58c228080 100644
--- a/classes/linux_modules.bbclass
+++ b/classes/linux-kernel-base.bbclass
@@ -1,3 +1,26 @@
+# parse kernel ABI version out of <linux/version.h>
+def get_kernelversion(p):
+    import re, os
+
+    fn = p + '/include/linux/utsrelease.h'
+    if not os.path.isfile(fn):
+        fn = p + '/include/linux/version.h'
+
+    import re
+    try:
+        f = open(fn, 'r')
+    except IOError:
+        return None
+
+    l = f.readlines()
+    f.close()
+    r = re.compile("#define UTS_RELEASE \"(.*)\"")
+    for s in l:
+        m = r.match(s)
+        if m:
+            return m.group(1)
+    return None
+
 def get_kernelmajorversion(p):
 	import re
 	r = re.compile("([0-9]+\.[0-9]+).*")
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 23a8f656b2..d81def55a6 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -82,23 +82,11 @@ def check_sanity(e):
 	if not check_app_exists('${BUILD_PREFIX}g++', e.data):
 		raise_sanity_error('C++ Host-Compiler is missing, please install one' )
 
-	if not check_app_exists('patch', e.data):
-		raise_sanity_error('Please install the patch utility, preferable GNU patch.')
+	required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip"
 
-	if not check_app_exists('diffstat', e.data):
-		raise_sanity_error('Please install the diffstat utility')
-
-	if not check_app_exists('texi2html', e.data):
-		raise_sanity_error('Please install the texi2html binary')
-
-	if not check_app_exists('cvs', e.data):
-		raise_sanity_error('Please install the cvs utility')
-
-	if not check_app_exists('svn', e.data):
-		raise_sanity_error('Please install the svn utility')
-
-	if not check_app_exists('bzip2', e.data):
-		raise_sanity_error('Please install the bzip2 utility')
+	for util in required_utilities.split():
+		if not check_app_exists( util, e.data ):
+			raise_sanity_error( "Please install the %s utility." )
 
 	oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', e.data, True )
 	if not oes_bb_conf: