diff options
-rw-r--r-- | bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst | 2 | ||||
-rw-r--r-- | bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/data_smart.py | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst index 31ee4e349e..088eb818d6 100644 --- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst +++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst | |||
@@ -228,7 +228,7 @@ and then reload it. | |||
228 | Where possible, subsequent BitBake commands reuse this cache of recipe | 228 | Where possible, subsequent BitBake commands reuse this cache of recipe |
229 | information. The validity of this cache is determined by first computing | 229 | information. The validity of this cache is determined by first computing |
230 | a checksum of the base configuration data (see | 230 | a checksum of the base configuration data (see |
231 | :term:`BB_HASHCONFIG_WHITELIST`) and | 231 | :term:`BB_HASHCONFIG_IGNORE_VARS`) and |
232 | then checking if the checksum matches. If that checksum matches what is | 232 | then checking if the checksum matches. If that checksum matches what is |
233 | in the cache and the recipe and class files have not changed, BitBake is | 233 | in the cache and the recipe and class files have not changed, BitBake is |
234 | able to use the cache. BitBake then reloads the cached information about | 234 | able to use the cache. BitBake then reloads the cached information about |
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst index b2379e62af..1dc03611bb 100644 --- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst +++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst | |||
@@ -358,7 +358,7 @@ overview of their function and contents. | |||
358 | However, the more accurate the data returned, the more efficient the | 358 | However, the more accurate the data returned, the more efficient the |
359 | build will be. | 359 | build will be. |
360 | 360 | ||
361 | :term:`BB_HASHCONFIG_WHITELIST` | 361 | :term:`BB_HASHCONFIG_IGNORE_VARS` |
362 | Lists variables that are excluded from base configuration checksum, | 362 | Lists variables that are excluded from base configuration checksum, |
363 | which is used to determine if the cache can be reused. | 363 | which is used to determine if the cache can be reused. |
364 | 364 | ||
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 97da43fff4..66fddb9050 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
@@ -37,6 +37,7 @@ bitbake_renamed_vars = { | |||
37 | "BB_ENV_WHITELIST": "BB_ENV_PASSTHROUGH", | 37 | "BB_ENV_WHITELIST": "BB_ENV_PASSTHROUGH", |
38 | "BB_ENV_EXTRAWHITE": "BB_ENV_PASSTHROUGH_ADDITIONS", | 38 | "BB_ENV_EXTRAWHITE": "BB_ENV_PASSTHROUGH_ADDITIONS", |
39 | "BB_HASHBASE_WHITELIST": "BB_BASEHASH_IGNORE_VARS", | 39 | "BB_HASHBASE_WHITELIST": "BB_BASEHASH_IGNORE_VARS", |
40 | "BB_HASHCONFIG_WHITELIST": "BB_HASHCONFIG_IGNORE_VARS", | ||
40 | "BB_HASHTASK_WHITELIST": "BB_TASKHASH_IGNORE_TASKS", | 41 | "BB_HASHTASK_WHITELIST": "BB_TASKHASH_IGNORE_TASKS", |
41 | } | 42 | } |
42 | 43 | ||
@@ -1054,10 +1055,10 @@ class DataSmart(MutableMapping): | |||
1054 | d = self.createCopy() | 1055 | d = self.createCopy() |
1055 | bb.data.expandKeys(d) | 1056 | bb.data.expandKeys(d) |
1056 | 1057 | ||
1057 | config_whitelist = set((d.getVar("BB_HASHCONFIG_WHITELIST") or "").split()) | 1058 | config_ignore_vars = set((d.getVar("BB_HASHCONFIG_IGNORE_VARS") or "").split()) |
1058 | keys = set(key for key in iter(d) if not key.startswith("__")) | 1059 | keys = set(key for key in iter(d) if not key.startswith("__")) |
1059 | for key in keys: | 1060 | for key in keys: |
1060 | if key in config_whitelist: | 1061 | if key in config_ignore_vars: |
1061 | continue | 1062 | continue |
1062 | 1063 | ||
1063 | value = d.getVar(key, False) or "" | 1064 | value = d.getVar(key, False) or "" |