[PATCH 1/2] bitbake/fetch2: add support for wrapper command

[PATCH 1/2] bitbake/fetch2: add support for wrapper command

[Matthew McClintock]

cc: bitbake-devel@lists.openembedded.org
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 bitbake/lib/bb/fetch2/__init__.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 3af56e5..1d7d5c7 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -389,6 +389,8 @@ def runfetchcmd(cmd, d, quiet = False, cleanup = []):
     Optionally remove the files/directories listed in cleanup upon failure
     """
 
+    cmd = "%s %s" % (bb.data.getVar("BB_FETCH_WRAPPER", d, True), cmd)
+
     # Need to export PATH as binary could be in metadata paths
     # rather than host provided
     # Also include some other variables.
-- 
1.7.6.1

[PATCH 2/2] bitbake/fetch2: add support for wrapper command

[Matthew McClintock]

This is for getting around things like CVS over SOCKS5 with authentication
which does not seem to be supported by configuring CVS or some other means
that I can find.

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 meta/conf/bitbake.conf       |    1 +
 scripts/oe-buildenv-internal |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b858364..5bb9430 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -553,6 +553,7 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases"
 # You can use the mirror of your country to get faster downloads by putting
 #  export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool"
 #     into your local.conf
+BB_FETCH_WRAPPER ?= ""
 
 FETCHCMD_svn = "/usr/bin/env svn"
 FETCHCMD_cvs = "/usr/bin/env cvs"
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index 21b92b0..72fc458 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -70,4 +70,4 @@ unset BITBAKEDIR
 # Used by the runqemu script
 export BUILDDIR
 export PATH
-export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD SOCKS5_USER"
+export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD SOCKS5_USER BB_FETCH_WRAPPER"
-- 
1.7.6.1

Re: [PATCH 1/2] bitbake/fetch2: add support for wrapper command

[Saul Wold]

On 01/12/2012 03:03 PM, Matthew McClintock wrote:
> cc: bitbake-devel@lists.openembedded.org
> Signed-off-by: Matthew McClintock<msm@freescale.com>
> ---
>   bitbake/lib/bb/fetch2/__init__.py |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
> index 3af56e5..1d7d5c7 100644
> --- a/bitbake/lib/bb/fetch2/__init__.py
> +++ b/bitbake/lib/bb/fetch2/__init__.py
> @@ -389,6 +389,8 @@ def runfetchcmd(cmd, d, quiet = False, cleanup = []):
>       Optionally remove the files/directories listed in cleanup upon failure
>       """
>
> +    cmd = "%s %s" % (bb.data.getVar("BB_FETCH_WRAPPER", d, True), cmd)
> +
I am guessing you really want a check here if BB_FETCH_WRAPPER is set, 
otherwise I am not sure this will work correctly, did you test without 
this new variable set?

Sau!

>       # Need to export PATH as binary could be in metadata paths
>       # rather than host provided
>       # Also include some other variables.

Re: [PATCH 1/2] bitbake/fetch2: add support for wrapper command

[Richard Purdie]

On Sun, 2012-01-15 at 20:53 -0800, Saul Wold wrote:
> On 01/12/2012 03:03 PM, Matthew McClintock wrote:
> > cc: bitbake-devel@lists.openembedded.org
> > Signed-off-by: Matthew McClintock<msm@freescale.com>
> > ---
> >   bitbake/lib/bb/fetch2/__init__.py |    2 ++
> >   1 files changed, 2 insertions(+), 0 deletions(-)
> >
> > diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
> > index 3af56e5..1d7d5c7 100644
> > --- a/bitbake/lib/bb/fetch2/__init__.py
> > +++ b/bitbake/lib/bb/fetch2/__init__.py
> > @@ -389,6 +389,8 @@ def runfetchcmd(cmd, d, quiet = False, cleanup = []):
> >       Optionally remove the files/directories listed in cleanup upon failure
> >       """
> >
> > +    cmd = "%s %s" % (bb.data.getVar("BB_FETCH_WRAPPER", d, True), cmd)
> > +
> I am guessing you really want a check here if BB_FETCH_WRAPPER is set, 
> otherwise I am not sure this will work correctly, did you test without 
> this new variable set?

We've had this conversation on the bitbake list. I think Matthew has an
alternative fix to use instead of this so we'll likely drop this patch
anyway.

Cheers,

Richard

Re: [PATCH 1/2] bitbake/fetch2: add support for wrapper command

[McClintock Matthew-B29882]

On Mon, Jan 16, 2012 at 6:32 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>> > +    cmd = "%s %s" % (bb.data.getVar("BB_FETCH_WRAPPER", d, True), cmd)
>> > +
>> I am guessing you really want a check here if BB_FETCH_WRAPPER is set,
>> otherwise I am not sure this will work correctly, did you test without
>> this new variable set?
>
> We've had this conversation on the bitbake list. I think Matthew has an
> alternative fix to use instead of this so we'll likely drop this patch
> anyway.

Yes, please drop this patch.

-M