[PATCH 5/5] poky.conf: whitelist shell variables which are volatile to build system

[PATCH 5/5] poky.conf: whitelist shell variables which are volatile to build system

[Kevin Tian]

Bitbake preserves a list of good shell variables which are required by some
shell based tasks. When scheduling a new shell task, bitbake always appends
all those shell variables which become a trouble for task checksum, because
most of those variables (GNOME_KEYRING_PID, XDG_SESSION_COOKIE, etc.) are
specific to the build system and desktop session.

Previously I came up an approach to explicitly seperate external shell variables
from the ones defined by bitbake, which however ends up to be complex.

So here I simply whitelist all preserved shell variables from current definition.
This should allow wider test on sstate when the better option is under discussion.

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
---
 meta/conf/distro/poky.conf |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index ae13d9a..dd29d9d 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -144,4 +144,5 @@ require conf/distro/include/distro_tracking_fields.inc
 # Setup our 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 TIME DATE BBPATH OEROOT DL_DIR SSTATE_DIR THISDIR _"
+BB_HASHBASE_WHITELIST = "TMPDIR FILE TIME DATE BBPATH OEROOT DL_DIR SSTATE_DIR THISDIR _"
+BB_HASHBASE_WHITELIST += "PATH PWD COLORTERM DBUS_SESSION_BUS_ADDRESS DESKTOP_SESSION DESKTOP_STARTUP_ID DISPLAY GNOME_KEYRING_PID GNOME_KEYRING_SOCKET GPG_AGENT_INFO GTK_RC_FILES HOME LANG LOGNAME SESSION_MANAGER SHELL SSH_AUTH_SOCK TERM USER USERNAME XAUTHORITY XDG_DATA_DIRS XDG_SESSION_COOKIE http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK GIT_PROXY_COMMAND"
-- 
1.6.0.4

Re: [PATCH 5/5] poky.conf: whitelist shell variables which are volatile to build system

[Tom Rini]

On 11/22/2010 11:14 PM, Kevin Tian wrote:
> Bitbake preserves a list of good shell variables which are required by some
> shell based tasks. When scheduling a new shell task, bitbake always appends
> all those shell variables which become a trouble for task checksum, because
> most of those variables (GNOME_KEYRING_PID, XDG_SESSION_COOKIE, etc.) are
> specific to the build system and desktop session.
>
> Previously I came up an approach to explicitly seperate external shell variables
> from the ones defined by bitbake, which however ends up to be complex.
>
> So here I simply whitelist all preserved shell variables from current definition.
> This should allow wider test on sstate when the better option is under discussion.
>
> Signed-off-by: Kevin Tian<kevin.tian@intel.com>
> ---
>   meta/conf/distro/poky.conf |    3 ++-
>   1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
> index ae13d9a..dd29d9d 100644
> --- a/meta/conf/distro/poky.conf
> +++ b/meta/conf/distro/poky.conf
> @@ -144,4 +144,5 @@ require conf/distro/include/distro_tracking_fields.inc
>   # Setup our 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 TIME DATE BBPATH OEROOT DL_DIR SSTATE_DIR THISDIR _"
> +BB_HASHBASE_WHITELIST = "TMPDIR FILE TIME DATE BBPATH OEROOT DL_DIR SSTATE_DIR THISDIR _"
> +BB_HASHBASE_WHITELIST += "PATH PWD COLORTERM DBUS_SESSION_BUS_ADDRESS DESKTOP_SESSION DESKTOP_STARTUP_ID DISPLAY GNOME_KEYRING_PID GNOME_KEYRING_SOCKET GPG_AGENT_INFO GTK_RC_FILES HOME LANG LOGNAME SESSION_MANAGER SHELL SSH_AUTH_SOCK TERM USER USERNAME XAUTHORITY XDG_DATA_DIRS XDG_SESSION_COOKIE http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK GIT_PROXY_COMMAND"

Looking over our signature code you may also need:
FILE_DIRNAME PARALLEL_MAKE MIRRORS PREMIRRORS SSH_TTY SSH_CLIENT 
SSH_CONNECTION SESSION_MANAGER GTK_RC_FILES GREP_OPTIONS
and you have SSH_AUTH_SOCK listed twice (can I suggest splitting this 
into more lines?).

-- 
Tom Rini
Mentor Graphics Corporation

Re: [PATCH 5/5] poky.conf: whitelist shell variables which are volatile to build system

[Paul Eggleton]

On Tuesday 23 November 2010 16:09:30 Tom Rini wrote:
> Looking over our signature code you may also need:
> FILE_DIRNAME PARALLEL_MAKE MIRRORS PREMIRRORS SSH_TTY SSH_CLIENT 
> SSH_CONNECTION SESSION_MANAGER GTK_RC_FILES GREP_OPTIONS
> and you have SSH_AUTH_SOCK listed twice (can I suggest splitting this 
> into more lines?).

I've split it onto multiple lines and added your vars to the list in the contrib/paule/sstate branch.

Cheers,
Paul
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

[PATCH 5/5] poky.conf: whitelist shell variables which are volatile to build system

[Kevin Tian]

Bitbake preserves a list of good shell variables which are required by some
shell based tasks. When scheduling a new shell task, bitbake always appends
all those shell variables which become a trouble for task checksum, because
most of those variables (GNOME_KEYRING_PID, XDG_SESSION_COOKIE, etc.) are
specific to the build system and desktop session.

Previously I came up an approach to explicitly seperate external shell variables
from the ones defined by bitbake, which however ends up to be complex.

So here I simply whitelist all preserved shell variables from current definition.
This should allow wider test on sstate when the better option is under discussion.

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
---
 meta/conf/distro/poky.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index a4c5991..ac2ec36 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -144,3 +144,4 @@ require conf/distro/include/world-broken.inc
 BB_SIGNATURE_HANDLER = "basic"
 BB_HASHTASK_WHITELIST = "(.*-cross$|.*-native$|.*-cross-initial$|.*-cross-intermediate$|^virtual:native:.*|^virtual:nativesdk:.*)"
 BB_HASHBASE_WHITELIST = "TMPDIR FILE PATH PWD TIME DATE BBPATH DL_DIR SSTATE_DIR THISDIR _ FILESEXTRPATHS"
+BB_HASHBASE_WHITELIST += "PATH PWD COLORTERM DBUS_SESSION_BUS_ADDRESS DESKTOP_SESSION DESKTOP_STARTUP_ID DISPLAY GNOME_KEYRING_PID GNOME_KEYRING_SOCKET GPG_AGENT_INFO GTK_RC_FILES HOME LANG LOGNAME SESSION_MANAGER SHELL SSH_AUTH_SOCK TERM USER USERNAME XAUTHORITY XDG_DATA_DIRS XDG_SESSION_COOKIE http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK GIT_PROXY_COMMAND"
-- 
1.6.0.4