Switch back to using our own qemu binary for locale generation by default

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2424 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/build/conf/local.conf.sample b/build/conf/local.conf.sample
index 0512ced85c4f8698f5c9e4ade0f4ec78e3dfd5f5..4816294f9cdacd0fc2e442ec8478bbdab75f06a5 100644 (file)
--- a/build/conf/local.conf.sample
+++ b/build/conf/local.conf.sample
@@ -75,8 +75,8 @@ TMPDIR = "${OEROOT}/build/tmp"
 # Also, make can be passed flags so it run parallel threads e.g.:
 # PARALLEL_MAKE = "-j 4"
 
-# Comment this out if you are *not* using provided qemu deb - see README
-ASSUME_PROVIDED += "qemu-native"
+# Uncomment this if you are using the Openedhand provided qemu deb - see README
+# ASSUME_PROVIDED += "qemu-native"
 
 # Uncomment these two if you want BitBake to build images useful for debugging.
 # DEBUG_BUILD = "1"

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 71dc26fa7d3373e8613514113942436446fc3951..2742dada7de1666d751e6168989b58f15318cfc4 100644 (file)
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -89,12 +89,18 @@ def check_sanity(e):
        if not check_app_exists('${BUILD_PREFIX}g++', e.data):
                missing = missing + "C++ Compiler,"
 
-       required_utilities = "patch diffstat help2man texi2html cvs svn bzip2 tar gzip gawk makeinfo qemu-arm"
+       required_utilities = "patch diffstat help2man texi2html cvs svn bzip2 tar gzip gawk makeinfo"
 
        for util in required_utilities.split():
                if not check_app_exists( util, e.data ):
                        missing = missing + "%s," % util
 
+       # qemu-native needs gcc 3.x
+       gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '")
+
+       if not check_app_exists('gcc-3.4', e.data) and not check_app_exists('gcc-3.3', e.data) and gcc_version[0] != '3':
+               missing = missing + "gcc-3.x (needed for qemu-native),"
+
        if missing != "":
                missing = missing.rstrip(',')
                messages = messages + "Please install following missing utilities: %s\n" % missing