summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-03-21 18:14:02 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-25 10:29:13 +0000
commiteab3f06e39d7d97bf7204c1cb649db67fcd7926f (patch)
tree24a9d7a3a6c6bdc81c0361de99cfeb3f02c477ba /meta/conf
parent58d2e5625fc80cf1b857864687d47445d7a3eb74 (diff)
downloadpoky-eab3f06e39d7d97bf7204c1cb649db67fcd7926f.tar.gz
bitbake.conf: whitelist proxy variables in config hash
We don't need these variables incorporated in the config hash (i.e. we don't need to reparse if they change). This fixes an issue with the extensible SDK where the cache generated at installation time not to be used afterwards due to the way we're allowing through the proxy variables into the install environment (such that they get set to "" if not set externally). (From OE-Core rev: 3dc7c58b7b3224f3ed2d59d95313e70e4c57d7c4) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7ed5ffb3b5..e3db5041f3 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -807,7 +807,9 @@ BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR \
807 WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH" 807 WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH"
808BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ 808BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \
809 SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ 809 SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \
810 PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED" 810 PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \
811 GIT_PROXY_COMMAND ALL_PROXY all_proxy NO_PROXY no_proxy FTP_PROXY ftp_proxy \
812 HTTP_PROXY http_proxy HTTPS_PROXY https_proxy SOCKS5_USER SOCKS5_PASSWD"
811BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc deps depends \ 813BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc deps depends \
812 lockfiles type vardepsexclude vardeps vardepvalue vardepvalueexclude \ 814 lockfiles type vardepsexclude vardeps vardepvalue vardepvalueexclude \
813 file-checksums python func task export unexport noexec nostamp dirs cleandirs \ 815 file-checksums python func task export unexport noexec nostamp dirs cleandirs \