[OE-core] [PATCH 2/2] oe-buildenv-internal: preserve existing BB_ENV_EXTRAWHITE

[Bystricky, Juro]

Thanks, it is a legitimate bug, certainly not intended.
 I already posted a patch to the mailing list last week. 

> -----Original Message-----
> From: Andre McCurdy [mailto:armccurdy at gmail.com]
> Sent: Monday, December 14, 2015 3:47 PM
> To: Bystricky, Juro
> Cc: OE Core mailing list; jurobystricky at hotmail.com
> Subject: Re: [OE-core] [PATCH 2/2] oe-buildenv-internal: preserve existing
> BB_ENV_EXTRAWHITE
> 
> On Thu, Dec 3, 2015 at 3:09 PM, Juro Bystricky <juro.bystricky at intel.com>
> wrote:
> > According to the BitBake User Manual the environment variable
> > BB_ENV_EXTRAWHITE specifies an additional set of variables to allow
> > through (whitelist) from the external environment into BitBake's datastore.
> However, running:
> >
> >   $ source oe-init-build-env build-name
> >
> > will overwrite any pre-existing BB_ENV_EXTRAWHITE variables.
> > This patch modifies this behaviour: all oe-build-internal
> > BB_ENV_EXTRAWHITE variables are appended to any potentially already
> > existing BB_ENV_EXTRAWHITE variables. (The variables are only appended
> > if not already in BB_ENV_EXTRAWHITE)
> >
> > Signed-off-by: Juro Bystricky <juro.bystricky at intel.com>
> > ---
> >  scripts/oe-buildenv-internal | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/scripts/oe-buildenv-internal
> > b/scripts/oe-buildenv-internal index 9ed2721..51e449a 100755
> > --- a/scripts/oe-buildenv-internal
> > +++ b/scripts/oe-buildenv-internal
> > @@ -102,8 +102,12 @@ unset BITBAKEDIR NEWPATHS  # Used by the
> runqemu
> > script  export BUILDDIR  export PATH -export
> > BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC HTTP_PROXY
> http_proxy
> > \
> > +
> > +BB_ENV_EXTRAWHITE_OE="MACHINE DISTRO TCMODE TCLIBC
> HTTP_PROXY
> > +http_proxy \
> >  HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy
> > ALL_PROXY \  all_proxy NO_PROXY no_proxy SSH_AGENT_PID
> SSH_AUTH_SOCK
> > BB_SRCREV_POLICY \  SDKMACHINE BB_NUMBER_THREADS
> BB_NO_NETWORK
> > PARALLEL_MAKE GIT_PROXY_COMMAND \  SOCKS5_PASSWD
> SOCKS5_USER SCREENDIR STAMPS_DIR"
> > +
> > +echo "$BB_ENV_EXTRAWHITE" | grep -q "${BB_ENV_EXTRAWHITE_OE}"
> > +[ $? != 0 ] && export
> BB_ENV_EXTRAWHITE="${BB_ENV_EXTRAWHITE_OE}
> $BB_ENV_EXTRAWHITE"
> 
> If ${BB_ENV_EXTRAWHITE_OE} is found in ${BB_ENV_EXTRAWHITE} (e.g. if
> oe-init-build-env is re-run from a shell where it has already been run before),
> then this change cause oe-buildenv-internal to exit with a non-zero status,
> which will prevent oe-init-build-env from calling oe-setup-builddir or cd'ing to
> ${BUILDDIR}. Is that really the intention? It breaks my typical work flow...
> 
> 
> > --
> > 1.9.1
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core at lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core