diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/icecc.bbclass | 2 | ||||
| -rw-r--r-- | classes/qemu.bbclass | 12 | ||||
| -rw-r--r-- | classes/sanity.bbclass | 9 |
3 files changed, 1 insertions, 22 deletions
diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index 8e539db0b8..fb6045d21b 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -250,7 +250,7 @@ def icc_path(bb,d): #"system" package blacklist contains a list of packages that can not distribute compile tasks #for one reason or the other - system_package_blacklist = [ "uclibc", "glibc", "gcc", "qemu", "bind", "u-boot", "dhcp-forwarder", "enchant", "connman" ] + system_package_blacklist = [ "uclibc", "glibc", "gcc", "bind", "u-boot", "dhcp-forwarder", "enchant", "connman" ] user_package_blacklist = (bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or "").split() package_blacklist = system_package_blacklist + user_package_blacklist diff --git a/classes/qemu.bbclass b/classes/qemu.bbclass index 40a3542450..66dfb2b0d2 100644 --- a/classes/qemu.bbclass +++ b/classes/qemu.bbclass @@ -3,18 +3,6 @@ # existance. # -def check_gcc3(data): - # Used by qemu to make sure we have a workable gcc-3.x. - # Start by checking for the program name as we build it as there - # are some distribtuion provided gcc-3.x's that will not work. - gcc3_versions = 'gcc-3.4.6 gcc-3.4.4 gcc34 gcc-3.4 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32' - - for gcc3 in gcc3_versions.split(): - if check_app_exists(gcc3, data): - return gcc3 - - return False - def qemu_target_binary(data): import bb diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 19310cbd9c..e8b6587500 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -87,15 +87,6 @@ def check_sanity(e): # If we'll be running qemu, perform some sanity checks if data.getVar('ENABLE_BINARY_LOCALE_GENERATION', e.data, True): - # Some versions of qemu-native needs gcc 3.x. Do a special - # check here to allow for host 'gcc' is 3.x. - 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)," - if "qemu-native" in assume_provided: required_utilities += " %s" % (qemu_target_binary(e.data)) |