diff options
| -rw-r--r-- | classes/icecc.bbclass | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index 8c950b0281..b5a858bb1f 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -154,7 +154,7 @@ def create_cross_kernel_env(bb,d): try: os.stat(os.path.join(ice_dir, 'bin', kernel_cc)) except: # no cross compiler built yet - bb.error('no cross compiler built yet') + bb.error('no kernel cross compiler built yet') return "" VERSION = icc_determine_gcc_version( os.path.join(ice_dir,"bin",kernel_cc) ) @@ -251,23 +251,16 @@ 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-intermediate", "gcc", "qemu", "bind", "u-boot", "dhcp-forwarder", "enchant" ] + system_package_blacklist = [ "uclibc", "glibc", "gcc", "qemu", "bind", "u-boot", "dhcp-forwarder", "enchant" ] + user_package_blacklist = (bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or "").split() + package_blacklist = system_package_blacklist + user_package_blacklist - for black in system_package_blacklist: + for black in package_blacklist: if black in package_tmp: bb.note(package_tmp, ' found in blacklist, disable icecc') bb.data.setVar("PARALLEL_MAKE" , "", d) return "" - #user defined exclusion list - user_package_blacklist = bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or "" - user_package_blacklist = user_package_blacklist.split() - - for black in user_package_blacklist: - if black in package_tmp: - bb.data.setVar("PARALLEL_MAKE" , "", d) - return "" - prefix = bb.data.expand('${HOST_PREFIX}', d) if bb.data.inherits_class("cross", d): |