diff options
| author |   Richard Purdie <richard@openedhand.com> | 2007-08-09 10:52:43 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-08-09 10:52:43 +0000 |
| commit | b14c8cd294f4a9e96bad8e097a7eaae221a8e14e (patch) | |
| tree | 7bb9649032d01da0faf53ee37f800b93e64efe41 | |
| parent | 6e909eb80ea2c94b53c9bfbd3b7f56f26dadbc0d (diff) | |
| download | openembedded-core-contrib-b14c8cd294f4a9e96bad8e097a7eaae221a8e14e.tar.gz | |
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
| -rw-r--r-- | build/conf/local.conf.sample | 4 | ||||
| -rw-r--r-- | meta/classes/sanity.bbclass | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/build/conf/local.conf.sample b/build/conf/local.conf.sample index 0512ced85c..4816294f9c 100644 --- 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 71dc26fa7d..2742dada7d 100644 --- 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 |