[OE-core] [PATCH] Nothing uses USERNAME, remove it - can cause sstate-cache conflicts
Saul Wold
sgw at linux.intel.com
Thu Nov 24 00:50:39 UTC 2011
On 11/17/2011 02:36 PM, Matthew McClintock wrote:
> USER is the correct variable to use, also this can affect sstate
> cache as well.
>
> Signed-off-by: Matthew McClintock<msm at freescale.com>
> ---
> I'm not 100% sure about this one but it seems like nothing is using this
> variable?
>
> Also one of my build machines (Jenkins specifically) was exporting
> USERNAME=root for some reason to the build environment. This was preventing
> sstate-cache from being used on other machines where it was not even
> defined/used AFAICT
>
> bitbake/lib/bb/utils.py | 1 -
> meta/conf/bitbake.conf | 2 +-
> 2 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
> index 1f55407..bb3409d 100644
> --- a/bitbake/lib/bb/utils.py
> +++ b/bitbake/lib/bb/utils.py
> @@ -505,7 +505,6 @@ def preserved_envvars_exported():
> 'SHELL',
> 'TERM',
> 'USER',
> - 'USERNAME',
> ]
>
> def preserved_envvars_exported_interactive():
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index b7bcc23..b4335c9 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -751,7 +751,7 @@ TRANSLATED_TARGET_ARCH ??= "${@d.getVar('TARGET_ARCH', True).replace("_", "-")}"
> # Setup our default hash policy
> BB_SIGNATURE_HANDLER ?= "basic"
> BB_HASHTASK_WHITELIST ?= "(.*-cross$|.*-native$|.*-cross-initial$|.*-cross-intermediate$|^virtual:native:.*|^virtual:nativesdk:.*)"
> -BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM USER FILESPATH USERNAME STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE"
> +BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE"
>
> MLPREFIX ??= ""
> MULTILIB_VARIANTS ??= ""
This should really be 2 patches, I know they are small, but they should
be broken down.
Thanks
Sau!
More information about the Openembedded-core
mailing list