summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/buildhistory.bbclass2
-rw-r--r--meta/classes/populate_sdk_ext.bbclass4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index daa96f3b63..05f66d10b9 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -31,7 +31,7 @@ BUILDHISTORY_DIR_PACKAGE = "${BUILDHISTORY_DIR}/packages/${MULTIMACH_TARGET_SYS}
31# of failed builds. 31# of failed builds.
32# 32#
33# The expected usage is via auto.conf, but passing via the command line also works 33# The expected usage is via auto.conf, but passing via the command line also works
34# with: BB_ENV_EXTRAWHITE=BUILDHISTORY_RESET BUILDHISTORY_RESET=1 34# with: BB_ENV_PASSTHROUGH_ADDITIONS=BUILDHISTORY_RESET BUILDHISTORY_RESET=1
35BUILDHISTORY_RESET ?= "" 35BUILDHISTORY_RESET ?= ""
36 36
37BUILDHISTORY_OLD_DIR = "${BUILDHISTORY_DIR}/${@ "old" if "${BUILDHISTORY_RESET}" else ""}" 37BUILDHISTORY_OLD_DIR = "${BUILDHISTORY_DIR}/${@ "old" if "${BUILDHISTORY_RESET}" else ""}"
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index ef93b6a826..2a80659d9a 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -282,7 +282,7 @@ python copy_buildsystem () {
282 bb.utils.mkdirhier(uninative_outdir) 282 bb.utils.mkdirhier(uninative_outdir)
283 shutil.copy(uninative_file, uninative_outdir) 283 shutil.copy(uninative_file, uninative_outdir)
284 284
285 env_whitelist = (d.getVar('BB_ENV_EXTRAWHITE') or '').split() 285 env_whitelist = (d.getVar('BB_ENV_PASSTHROUGH_ADDITIONS') or '').split()
286 env_whitelist_values = {} 286 env_whitelist_values = {}
287 287
288 # Create local.conf 288 # Create local.conf
@@ -436,7 +436,7 @@ python copy_buildsystem () {
436 f.write('meta/conf\n') 436 f.write('meta/conf\n')
437 437
438 # Ensure any variables set from the external environment (by way of 438 # Ensure any variables set from the external environment (by way of
439 # BB_ENV_EXTRAWHITE) are set in the SDK's configuration 439 # BB_ENV_PASSTHROUGH_ADDITIONS) are set in the SDK's configuration
440 extralines = [] 440 extralines = []
441 for name, value in env_whitelist_values.items(): 441 for name, value in env_whitelist_values.items():
442 actualvalue = d.getVar(name) or '' 442 actualvalue = d.getVar(name) or ''