diff options
| -rw-r--r-- | build/conf/local.conf.sample | 2 | ||||
| -rw-r--r-- | meta/classes/sanity.bbclass | 7 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-native_3.4.4.bb | 2 | ||||
| -rw-r--r-- | meta/packages/qemu/qemu-native.inc | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/build/conf/local.conf.sample b/build/conf/local.conf.sample index 149cd81ab..122a6f720 100644 --- a/build/conf/local.conf.sample +++ b/build/conf/local.conf.sample @@ -94,7 +94,7 @@ TMPDIR = "${OEROOT}/build/tmp" # Comment this out if you don't have a 3.x gcc version available and wish # poky to build one for you. The 3.x gcc is required to build qemu-native. -ASSUME_PROVIDED += "gcc-native3" +ASSUME_PROVIDED += "gcc3-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 85a38ba28..46bc7c66b 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -85,12 +85,15 @@ def check_sanity(e): required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum" # qemu-native needs gcc 3.x - if "qemu-native" not in assume_provided: + if "qemu-native" not in assume_provided and "gcc3-native" in assume_provided: gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '") if not check_gcc3(e.data) and gcc_version[0] != '3': + messages = messages + "gcc3-native was in ASSUME_PROVIDED but the gcc-3.x binary can't be found in PATH" missing = missing + "gcc-3.x (needed for qemu-native)," - else: + + if "qemu-native" in assume_provided: + messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries can't be found in PATH" required_utilities = required_utilities + " qemu-arm" for util in required_utilities.split(): diff --git a/meta/packages/gcc/gcc-native_3.4.4.bb b/meta/packages/gcc/gcc-native_3.4.4.bb index eb1fb5716..d70a4f546 100644 --- a/meta/packages/gcc/gcc-native_3.4.4.bb +++ b/meta/packages/gcc/gcc-native_3.4.4.bb @@ -1,3 +1,3 @@ require gcc_${PV}.bb require gcc-native.inc -PROVIDES += "gcc-native3"
\ No newline at end of file +PROVIDES += "gcc3-native" diff --git a/meta/packages/qemu/qemu-native.inc b/meta/packages/qemu/qemu-native.inc index db405c940..8a25383c5 100644 --- a/meta/packages/qemu/qemu-native.inc +++ b/meta/packages/qemu/qemu-native.inc @@ -1,5 +1,5 @@ inherit native -DEPENDS = "zlib-native gcc-native3" +DEPENDS = "zlib-native gcc3-native" require qemu-gcc3-check.inc |