summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-13 21:25:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-14 09:25:31 +0000
commit58aa9f81554a76b877a267ab98e0fae4fb9ed73c (patch)
tree9c8f3393d55872e7dcba32e783ccc311d2233fea
parent641149f449cfc7addad994cedf3b029814363f8e (diff)
downloadpoky-58aa9f81554a76b877a267ab98e0fae4fb9ed73c.tar.gz
sanity: Drop TUNEABI, TUNEABI_WHITELIST, TUNEABI_OVERRIDE
These were added nearly a decade ago but there are no users in OE-Core. I checked with the likely users and they seem to have no current usage either. Therefore remove them. If needed for some prebuilt library somewhere, they could be implemented in the layer using them instead but I doubt these are in use any longer. (From OE-Core rev: 95e196babc3c18dcf0aedfb03e85493c8ae54700) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sanity.bbclass42
-rw-r--r--meta/conf/documentation.conf3
2 files changed, 0 insertions, 45 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 0e20589b22..f288b4c84c 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -185,37 +185,6 @@ def raise_sanity_error(msg, d, network_error=False):
185 185
186 %s""" % msg) 186 %s""" % msg)
187 187
188# Check flags associated with a tuning.
189def check_toolchain_tune_args(data, tune, multilib, errs):
190 found_errors = False
191 if check_toolchain_args_present(data, tune, multilib, errs, 'CCARGS'):
192 found_errors = True
193 if check_toolchain_args_present(data, tune, multilib, errs, 'ASARGS'):
194 found_errors = True
195 if check_toolchain_args_present(data, tune, multilib, errs, 'LDARGS'):
196 found_errors = True
197
198 return found_errors
199
200def check_toolchain_args_present(data, tune, multilib, tune_errors, which):
201 args_set = (data.getVar("TUNE_%s" % which) or "").split()
202 args_wanted = (data.getVar("TUNEABI_REQUIRED_%s:tune-%s" % (which, tune)) or "").split()
203 args_missing = []
204
205 # If no args are listed/required, we are done.
206 if not args_wanted:
207 return
208 for arg in args_wanted:
209 if arg not in args_set:
210 args_missing.append(arg)
211
212 found_errors = False
213 if args_missing:
214 found_errors = True
215 tune_errors.append("TUNEABI for %s requires '%s' in TUNE_%s (%s)." %
216 (tune, ' '.join(args_missing), which, ' '.join(args_set)))
217 return found_errors
218
219# Check a single tune for validity. 188# Check a single tune for validity.
220def check_toolchain_tune(data, tune, multilib): 189def check_toolchain_tune(data, tune, multilib):
221 tune_errors = [] 190 tune_errors = []
@@ -247,17 +216,6 @@ def check_toolchain_tune(data, tune, multilib):
247 bb.debug(2, " %s: %s" % (feature, valid_tunes[feature])) 216 bb.debug(2, " %s: %s" % (feature, valid_tunes[feature]))
248 else: 217 else:
249 tune_errors.append("Feature '%s' is not defined." % feature) 218 tune_errors.append("Feature '%s' is not defined." % feature)
250 whitelist = localdata.getVar("TUNEABI_WHITELIST")
251 if whitelist:
252 tuneabi = localdata.getVar("TUNEABI:tune-%s" % tune)
253 if not tuneabi:
254 tuneabi = tune
255 if True not in [x in whitelist.split() for x in tuneabi.split()]:
256 tune_errors.append("Tuning '%s' (%s) cannot be used with any supported tuning/ABI." %
257 (tune, tuneabi))
258 else:
259 if not check_toolchain_tune_args(localdata, tuneabi, multilib, tune_errors):
260 bb.debug(2, "Sanity check: Compiler args OK for %s." % tune)
261 if tune_errors: 219 if tune_errors:
262 return "Tuning '%s' has the following errors:\n" % tune + '\n'.join(tune_errors) 220 return "Tuning '%s' has the following errors:\n" % tune + '\n'.join(tune_errors)
263 221
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index f63f4b223a..6b50ad08a8 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -440,9 +440,6 @@ TOOLCHAIN_TARGET_TASK[doc] = "This variable lists packages the OpenEmbedded buil
440TOPDIR[doc] = "The Build Directory. BitBake automatically sets this variable. The OpenEmbedded build system uses the Build Directory when building images." 440TOPDIR[doc] = "The Build Directory. BitBake automatically sets this variable. The OpenEmbedded build system uses the Build Directory when building images."
441TRANSLATED_TARGET_ARCH[doc] = "A sanitized version of TARGET_ARCH. This variable is used where the architecture is needed in a value where underscores are not allowed." 441TRANSLATED_TARGET_ARCH[doc] = "A sanitized version of TARGET_ARCH. This variable is used where the architecture is needed in a value where underscores are not allowed."
442TUNE_PKGARCH[doc] = "The package architecture understood by the packaging system to define the architecture, ABI, and tuning of output packages." 442TUNE_PKGARCH[doc] = "The package architecture understood by the packaging system to define the architecture, ABI, and tuning of output packages."
443TUNEABI[doc] = "An underlying ABI used by a particular tuning in a given toolchain layer. This feature allows providers using prebuilt libraries to check compatibility of a tuning against their selection of libraries."
444TUNEABI_OVERRIDE[doc] = "If set, ignores TUNEABI_WHITELIST."
445TUNEABI_WHITELIST[doc] = "A whitelist of permissible TUNEABI values. If the variable is not set, all values are allowed."
446TUNECONFLICTS[doc] = "List of conflicting features for a given feature." 443TUNECONFLICTS[doc] = "List of conflicting features for a given feature."
447TUNEVALID[doc] = "Descriptions, stored as flags, of valid tuning features." 444TUNEVALID[doc] = "Descriptions, stored as flags, of valid tuning features."
448 445