This email list is read-only. Emails sent to this list will be discarded
----------------------------------
bitbake-dev/lib/bb/fetch/__init__.py | 2 +-
bitbake/lib/bb/fetch/__init__.py | 2 +-
meta/classes/base.bbclass | 15 ++++++++-------
3 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 921cbb2626f0b6acdca4cbe528b9b5fe757bad6a
Author: Richard Purdie <[EMAIL PROTECTED]>
Date: Fri Oct 31 14:38:11 2008 +0000
base.bbclass: Fix the git config file writing code
commit b1046ef7439aa1acee6f6bbbdd0cfb97f34bf824
Author: Richard Purdie <[EMAIL PROTECTED]>
Date: Fri Oct 31 14:37:24 2008 +0000
bitbake: Don't export the GIT_PROXY_COMMAND in the fetcher code since it
means selective proxying isn't possible
Diff in this email is a maximum of 400 lines.
diff --git a/bitbake-dev/lib/bb/fetch/__init__.py
b/bitbake-dev/lib/bb/fetch/__init__.py
index db2ea6a..784f19e 100644
--- a/bitbake-dev/lib/bb/fetch/__init__.py
+++ b/bitbake-dev/lib/bb/fetch/__init__.py
@@ -274,7 +274,7 @@ def runfetchcmd(cmd, d, quiet = False):
# rather than host provided
# Also include some other variables.
# FIXME: Should really include all export varaiables?
- exportvars = ['PATH', 'GIT_PROXY_HOST', 'GIT_PROXY_PORT',
'GIT_PROXY_COMMAND', 'http_proxy', 'ftp_proxy']
+ exportvars = ['PATH', 'GIT_PROXY_HOST', 'GIT_PROXY_PORT', 'http_proxy',
'ftp_proxy']
for var in exportvars:
val = data.getVar(var, d, True)
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py
index db2ea6a..784f19e 100644
--- a/bitbake/lib/bb/fetch/__init__.py
+++ b/bitbake/lib/bb/fetch/__init__.py
@@ -274,7 +274,7 @@ def runfetchcmd(cmd, d, quiet = False):
# rather than host provided
# Also include some other variables.
# FIXME: Should really include all export varaiables?
- exportvars = ['PATH', 'GIT_PROXY_HOST', 'GIT_PROXY_PORT',
'GIT_PROXY_COMMAND', 'http_proxy', 'ftp_proxy']
+ exportvars = ['PATH', 'GIT_PROXY_HOST', 'GIT_PROXY_PORT', 'http_proxy',
'ftp_proxy']
for var in exportvars:
val = data.getVar(var, d, True)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 4ce18f0..a9ad1a0 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -731,23 +731,24 @@ def generate_git_config(e):
from bb import data
if data.getVar('GIT_CORE_CONFIG', e.data, True):
- gitconfig_path = "${STAGING_DIR_HOST}/usr/etc/gitconfig"
- proxy_command = "gitproxy = %s" %
data.getVar('GIT_PROXY_COMMAND', e.data, True)
+ gitconfig_path =
bb.data.expand("${STAGING_DIR_NATTIVE}/usr/etc/gitconfig", e.data)
+ proxy_command = " gitproxy = %s\n" %
data.getVar('GIT_PROXY_COMMAND', e.data, True)
- bb.mkdirhier("${STAGING_DIR_HOST}/usr/etc/")
+ bb.mkdirhier(bb.data.expand("${STAGING_DIR_NATTIVE}/usr/etc/",
e.data))
if (os.path.exists(gitconfig_path)):
os.remove(gitconfig_path)
f = open(gitconfig_path, 'w')
f.write("[core]\n")
- f.write(proxy_command)
-
ignore_count = 1
- ignore_host = data.getVar('GIT_PROXY_IGNORE_1', e.data, True)
+ ignore_host = " gitproxy = non for %s" %
data.getVar('GIT_PROXY_IGNORE_1', e.data, True)
while (ignore_host):
f.write(ignore_host)
ignore_count += 1
- ignore_host = data.getVar('GIT_PROXY_IGNORE_%s' %
ignore_count, e.data, True)
+ ignore_host = " gitproxy = non for %s\n" %
data.getVar('GIT_PROXY_IGNORE_%s' % ignore_count, e.data, True)
+ f.write(proxy_command)
+ f.close
+
METADATA_REVISION ?= "[EMAIL PROTECTED](d)}"
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
