From 225923454722bd9911e150e3289ce42b4687dccf Mon Sep 17 00:00:00 2001
From: Stelios Koroneos <skoroneos@digital-opsis.com>
Date: Tue, 19 Dec 2006 11:47:42 +0000
Subject: Fixed error in the way the user specified exclusion lists were
handled Remove debug messages
---
classes/icecc.bbclass | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass
index 438859b55a..cf1ab630fa 100644
--- a/classes/icecc.bbclass
+++ b/classes/icecc.bbclass
@@ -232,11 +232,15 @@ def use_icc_version(bb,d):
icecc_ver = "yes"
system_class_blacklist = [ "none" ]
- user_class_blacklist = bb.data.getVar('ICECC_USER_CLASS_BL', d) or "none"
- system_class_blacklist = user_class_blacklist.split()
-
for black in system_class_blacklist:
- print("Class value is %s " %black)
+ if bb.data.inherits_class(black, d):
+ icecc_ver = "no"
+
+
+ user_class_blacklist = bb.data.getVar('ICECC_USER_CLASS_BL', d) or "none"
+ user_class_blacklist = user_class_blacklist.split()
+
+ for black in user_class_blacklist:
if bb.data.inherits_class(black, d):
icecc_ver = "no"
@@ -251,11 +255,15 @@ def icc_path(bb,d,compile):
#for one reason or the other
system_package_blacklist = [ "ulibc", "glibc", "qemu" ]
+ for black in system_package_blacklist:
+ if black in package_tmp:
+ return ""
+
#user defined exclusion list
user_package_blacklist = bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or "none"
- system_package_blacklist = user_package_blacklist.split()
+ user_package_blacklist = user_package_blacklist.split()
- for black in system_package_blacklist:
+ for black in user_package_blacklist:
if black in package_tmp:
return ""
--
cgit v1.2.3