diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/buildhistory.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 4 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 2 | ||||
-rw-r--r-- | meta/recipes-core/meta/buildtools-tarball.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/meta/testexport-tarball.bb | 4 |
5 files changed, 8 insertions, 8 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 |
35 | BUILDHISTORY_RESET ?= "" | 35 | BUILDHISTORY_RESET ?= "" |
36 | 36 | ||
37 | BUILDHISTORY_OLD_DIR = "${BUILDHISTORY_DIR}/${@ "old" if "${BUILDHISTORY_RESET}" else ""}" | 37 | BUILDHISTORY_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 '' |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index fba99e8f0c..6cccc30fa7 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -926,7 +926,7 @@ BB_HASHEXCLUDE_COMMON ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DI | |||
926 | BB_HASHBASE_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} PSEUDO_IGNORE_PATHS BUILDHISTORY_DIR \ | 926 | BB_HASHBASE_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} PSEUDO_IGNORE_PATHS BUILDHISTORY_DIR \ |
927 | SSTATE_DIR SOURCE_DATE_EPOCH" | 927 | SSTATE_DIR SOURCE_DATE_EPOCH" |
928 | BB_HASHCONFIG_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} DATE TIME SSH_AGENT_PID \ | 928 | BB_HASHCONFIG_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} DATE TIME SSH_AGENT_PID \ |
929 | SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ | 929 | SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_PASSTHROUGH_ADDITIONS DISABLE_SANITY_CHECKS \ |
930 | PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ | 930 | PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ |
931 | GIT_PROXY_COMMAND ALL_PROXY all_proxy NO_PROXY no_proxy FTP_PROXY ftp_proxy \ | 931 | GIT_PROXY_COMMAND ALL_PROXY all_proxy NO_PROXY no_proxy FTP_PROXY ftp_proxy \ |
932 | HTTP_PROXY http_proxy HTTPS_PROXY https_proxy SOCKS5_USER SOCKS5_PASSWD \ | 932 | HTTP_PROXY http_proxy HTTPS_PROXY https_proxy SOCKS5_USER SOCKS5_PASSWD \ |
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 166671316a..60f6aac837 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb | |||
@@ -88,8 +88,8 @@ EOF | |||
88 | 88 | ||
89 | if [ "${SDKMACHINE}" = "i686" ]; then | 89 | if [ "${SDKMACHINE}" = "i686" ]; then |
90 | echo 'export NO32LIBS="0"' >>$script | 90 | echo 'export NO32LIBS="0"' >>$script |
91 | echo 'echo "$BB_ENV_EXTRAWHITE" | grep -q "NO32LIBS"' >>$script | 91 | echo 'echo "$BB_ENV_PASSTHROUGH_ADDITIONS" | grep -q "NO32LIBS"' >>$script |
92 | echo '[ $? != 0 ] && export BB_ENV_EXTRAWHITE="NO32LIBS $BB_ENV_EXTRAWHITE"' >>$script | 92 | echo '[ $? != 0 ] && export BB_ENV_PASSTHROUGH_ADDITIONS="NO32LIBS $BB_ENV_PASSTHROUGH_ADDITIONS"' >>$script |
93 | fi | 93 | fi |
94 | } | 94 | } |
95 | 95 | ||
diff --git a/meta/recipes-core/meta/testexport-tarball.bb b/meta/recipes-core/meta/testexport-tarball.bb index 7cb84a0104..bb9f8ded48 100644 --- a/meta/recipes-core/meta/testexport-tarball.bb +++ b/meta/recipes-core/meta/testexport-tarball.bb | |||
@@ -57,8 +57,8 @@ create_sdk_files:append () { | |||
57 | 57 | ||
58 | if [ "${SDKMACHINE}" = "i686" ]; then | 58 | if [ "${SDKMACHINE}" = "i686" ]; then |
59 | echo 'export NO32LIBS="0"' >>$script | 59 | echo 'export NO32LIBS="0"' >>$script |
60 | echo 'echo "$BB_ENV_EXTRAWHITE" | grep -q "NO32LIBS"' >>$script | 60 | echo 'echo "$BB_ENV_PASSTHROUGH_ADDITIONS" | grep -q "NO32LIBS"' >>$script |
61 | echo '[ $? != 0 ] && export BB_ENV_EXTRAWHITE="NO32LIBS $BB_ENV_EXTRAWHITE"' >>$script | 61 | echo '[ $? != 0 ] && export BB_ENV_PASSTHROUGH_ADDITIONS="NO32LIBS $BB_ENV_PASSTHROUGH_ADDITIONS"' >>$script |
62 | fi | 62 | fi |
63 | } | 63 | } |
64 | 64 | ||