summaryrefslogtreecommitdiffstats
path: root/meta/classes/icecc.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-17 11:43:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-21 23:37:27 +0000
commit3be8a7a6b13a57905bcb57d42a08e71db27531da (patch)
tree8a6f3bdff1acecb7ff242716452a7f446483f49d /meta/classes/icecc.bbclass
parent71ef3191938da772b07274165dd3a85c2ed011f1 (diff)
downloadpoky-3be8a7a6b13a57905bcb57d42a08e71db27531da.tar.gz
icecc: Improve variables/terminology
The SYSTEM and USER seperation between variables seems odd and not necessary, drop it. Avoid the use of whitelist/blacklist and also change "packages" to "recipes" since that misuse causes confusion. (From OE-Core rev: 0df0eb6401a02139b9110bc95e21d97a67125ec5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/icecc.bbclass')
-rw-r--r--meta/classes/icecc.bbclass49
1 files changed, 22 insertions, 27 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 7a6be68aba..90ea3d8df6 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -19,22 +19,21 @@
19# or the default one provided by icecc-create-env.bb will be used 19# or the default one provided by icecc-create-env.bb will be used
20# (NOTE that this is a modified version of the script need it and *not the one that comes with icecc* 20# (NOTE that this is a modified version of the script need it and *not the one that comes with icecc*
21# 21#
22# User can specify if specific packages or packages belonging to class should not use icecc to distribute 22# User can specify if specific recipes or recipes belonging to class should not use icecc to distribute
23# compile jobs to remote machines, but handled locally, by defining ICECC_USER_CLASS_BL and ICECC_USER_PACKAGE_BL 23# compile jobs to remote machines, but handled locally, by defining ICECC_CLASS_DISABLE and ICECC_RECIPE_DISABLE
24# with the appropriate values in local.conf. In addition the user can force to enable icecc for packages 24# with the appropriate values in local.conf. In addition the user can force to enable icecc for recipes
25# which set an empty PARALLEL_MAKE variable by defining ICECC_USER_PACKAGE_WL. 25# which set an empty PARALLEL_MAKE variable by defining ICECC_RECIPE_ENABLE.
26# 26#
27######################################################################################### 27#########################################################################################
28#Error checking is kept to minimum so double check any parameters you pass to the class 28#Error checking is kept to minimum so double check any parameters you pass to the class
29########################################################################################### 29###########################################################################################
30 30
31BB_BASEHASH_IGNORE_VARS += "ICECC_PARALLEL_MAKE ICECC_DISABLED ICECC_USER_PACKAGE_BL \ 31BB_BASEHASH_IGNORE_VARS += "ICECC_PARALLEL_MAKE ICECC_DISABLED ICECC_RECIPE_DISABLE \
32 ICECC_USER_CLASS_BL ICECC_USER_PACKAGE_WL ICECC_PATH ICECC_ENV_EXEC \ 32 ICECC_CLASS_DISABLE ICECC_RECIPE_ENABLE ICECC_PATH ICECC_ENV_EXEC \
33 ICECC_CARET_WORKAROUND ICECC_CFLAGS ICECC_ENV_VERSION \ 33 ICECC_CARET_WORKAROUND ICECC_CFLAGS ICECC_ENV_VERSION \
34 ICECC_DEBUG ICECC_LOGFILE ICECC_REPEAT_RATE ICECC_PREFERRED_HOST \ 34 ICECC_DEBUG ICECC_LOGFILE ICECC_REPEAT_RATE ICECC_PREFERRED_HOST \
35 ICECC_CLANG_REMOTE_CPP ICECC_IGNORE_UNVERIFIED ICECC_TEST_SOCKET \ 35 ICECC_CLANG_REMOTE_CPP ICECC_IGNORE_UNVERIFIED ICECC_TEST_SOCKET \
36 ICECC_ENV_DEBUG ICECC_SYSTEM_PACKAGE_BL ICECC_SYSTEM_CLASS_BL \ 36 ICECC_ENV_DEBUG ICECC_REMOTE_CPP \
37 ICECC_REMOTE_CPP \
38 " 37 "
39 38
40ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env" 39ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env"
@@ -66,7 +65,7 @@ CXXFLAGS += "${ICECC_CFLAGS}"
66# Debug flags when generating environments 65# Debug flags when generating environments
67ICECC_ENV_DEBUG ??= "" 66ICECC_ENV_DEBUG ??= ""
68 67
69# "system" recipe blacklist contains a list of packages that can not distribute 68# Disable recipe list contains a list of recipes that can not distribute
70# compile tasks for one reason or the other. When adding new entry, please 69# compile tasks for one reason or the other. When adding new entry, please
71# document why (how it failed) so that we can re-evaluate it later e.g. when 70# document why (how it failed) so that we can re-evaluate it later e.g. when
72# there is new version 71# there is new version
@@ -79,21 +78,21 @@ ICECC_ENV_DEBUG ??= ""
79# inline assembly 78# inline assembly
80# target-sdk-provides-dummy - ${HOST_PREFIX} is empty which triggers the "NULL 79# target-sdk-provides-dummy - ${HOST_PREFIX} is empty which triggers the "NULL
81# prefix" error. 80# prefix" error.
82ICECC_SYSTEM_PACKAGE_BL += "\ 81ICECC_RECIPE_DISABLE += "\
83 libgcc-initial \ 82 libgcc-initial \
84 pixman \ 83 pixman \
85 systemtap \ 84 systemtap \
86 target-sdk-provides-dummy \ 85 target-sdk-provides-dummy \
87 " 86 "
88 87
89# "system" classes that should be blacklisted. When adding new entry, please 88# Classes that should not use icecc. When adding new entry, please
90# document why (how it failed) so that we can re-evaluate it later 89# document why (how it failed) so that we can re-evaluate it later
91# 90#
92# image - Image aren't compiling, but the testing framework for images captures 91# image - Image aren't compiling, but the testing framework for images captures
93# PARALLEL_MAKE as part of the test environment. Many tests won't use 92# PARALLEL_MAKE as part of the test environment. Many tests won't use
94# icecream, but leaving the high level of parallelism can cause them to 93# icecream, but leaving the high level of parallelism can cause them to
95# consume an unnecessary amount of resources. 94# consume an unnecessary amount of resources.
96ICECC_SYSTEM_CLASS_BL += "\ 95ICECC_CLASS_DISABLE += "\
97 image \ 96 image \
98 " 97 "
99 98
@@ -141,32 +140,28 @@ def use_icecc(bb,d):
141 pn = d.getVar('PN') 140 pn = d.getVar('PN')
142 bpn = d.getVar('BPN') 141 bpn = d.getVar('BPN')
143 142
144 # Blacklist/whitelist checks are made against BPN, because there is a good 143 # Enable/disable checks are made against BPN, because there is a good
145 # chance that if icecc should be skipped for a recipe, it should be skipped 144 # chance that if icecc should be skipped for a recipe, it should be skipped
146 # for all the variants of that recipe. PN is still checked in case a user 145 # for all the variants of that recipe. PN is still checked in case a user
147 # specified a more specific recipe. 146 # specified a more specific recipe.
148 check_pn = set([pn, bpn]) 147 check_pn = set([pn, bpn])
149 148
150 system_class_blacklist = (d.getVar('ICECC_SYSTEM_CLASS_BL') or "").split() 149 class_disable = (d.getVar('ICECC_CLASS_DISABLE') or "").split()
151 user_class_blacklist = (d.getVar('ICECC_USER_CLASS_BL') or "none").split()
152 package_class_blacklist = system_class_blacklist + user_class_blacklist
153 150
154 for black in package_class_blacklist: 151 for class in class_disable:
155 if bb.data.inherits_class(black, d): 152 if bb.data.inherits_class(class, d):
156 bb.debug(1, "%s: class %s found in blacklist, disable icecc" % (pn, black)) 153 bb.debug(1, "%s: class %s found in disable, disable icecc" % (pn, class))
157 return "no" 154 return "no"
158 155
159 system_package_blacklist = (d.getVar('ICECC_SYSTEM_PACKAGE_BL') or "").split() 156 disabled_recipes = (d.getVar('ICECC_RECIPE_DISABLE') or "").split()
160 user_package_blacklist = (d.getVar('ICECC_USER_PACKAGE_BL') or "").split() 157 enabled_recipes = (d.getVar('ICECC_RECIPE_ENABLE') or "").split()
161 user_package_whitelist = (d.getVar('ICECC_USER_PACKAGE_WL') or "").split()
162 package_blacklist = system_package_blacklist + user_package_blacklist
163 158
164 if check_pn & set(package_blacklist): 159 if check_pn & set(disabled_recipes):
165 bb.debug(1, "%s: found in blacklist, disable icecc" % pn) 160 bb.debug(1, "%s: found in disable list, disable icecc" % pn)
166 return "no" 161 return "no"
167 162
168 if check_pn & set(user_package_whitelist): 163 if check_pn & set(enabled_recipes):
169 bb.debug(1, "%s: found in whitelist, enable icecc" % pn) 164 bb.debug(1, "%s: found in enabled recipes list, enable icecc" % pn)
170 return "yes" 165 return "yes"
171 166
172 if d.getVar('PARALLEL_MAKE') == "": 167 if d.getVar('PARALLEL_MAKE') == "":