[1.30][PATCH 0/1] Backport fetch environment fix to 1.30

[1.30][PATCH 0/1] Backport fetch environment fix to 1.30

[Paul Eggleton]

This will allow variables such as GIT_SSL_CAINFO through from the
external environment to the fetch environment, which in OE will allow
buildtools-tarball's included git version to find the included
ca-certificates data.


The following changes since commit 9ea7d3ec59c2b09ae60cf0c7f18472355bfb98d7:

  toaster: fix progress bar in MySQL environment (2016-05-13 17:45:31 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib paule/bb-git-ssl-cainfo-1.30
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/bb-git-ssl-cainfo-1.30

Ross Burton (1):
  fetch2: export DBUS_SESSION_BUS_ADDRESS to support authentication
    agents

 lib/bb/fetch2/__init__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
2.5.5

[1.30][PATCH 1/1] fetch2: export DBUS_SESSION_BUS_ADDRESS to support authentication agents

[Paul Eggleton]

From: Ross Burton <ross.burton@intel.com>

Some users may want to use authenticated SSH connections with credentials stored
in a keyring, such as gnome-keyring.  These typically need a DBus session bus
connection, so pass DBUS_SESSION_BUS_ADDRESS into the fetcher environment.

To avoid the user needing to set it in their local.conf (which wouldn't be
usable) or adding it to the environment-cleansing whitelist (which would
potentially impact builds) allow the variables being passed to the fetchers to
come from the data store (first) or the original environment (second).

From bitbake master rev: 20ad1ea87712d042bd5d89ce1957793f7ff71da0

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 lib/bb/fetch2/__init__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index 1fa6702..e8fbe89 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -807,13 +807,14 @@ def runfetchcmd(cmd, d, quiet=False, cleanup=None):
                   'GIT_SSL_CAINFO',
                   'GIT_SMART_HTTP',
                   'SSH_AUTH_SOCK', 'SSH_AGENT_PID',
-                  'SOCKS5_USER', 'SOCKS5_PASSWD']
+                  'SOCKS5_USER', 'SOCKS5_PASSWD',
+                  'DBUS_SESSION_BUS_ADDRESS']
 
     if not cleanup:
         cleanup = []
 
     for var in exportvars:
-        val = d.getVar(var, True)
+        val = d.getVar(var, True) or d.getVar("BB_ORIGENV", False).getVar(var, True)
         if val:
             cmd = 'export ' + var + '=\"%s\"; %s' % (val, cmd)
 
-- 
2.5.5