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 | 8 +++-----
3 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 4c626238e7413417db002a21f45042d1eca9280a
Author: Richard Purdie <[EMAIL PROTECTED]>
Date: Tue Nov 4 13:32:35 2008 +0000
base.bbclass: Set GIT_CONFIG correctly
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 784f19e..e6b2851 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', 'http_proxy',
'ftp_proxy']
+ exportvars = ['PATH', 'GIT_PROXY_HOST', 'GIT_PROXY_PORT', 'GIT_CONFIG',
'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 784f19e..e6b2851 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', 'http_proxy',
'ftp_proxy']
+ exportvars = ['PATH', 'GIT_PROXY_HOST', 'GIT_PROXY_PORT', 'GIT_CONFIG',
'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 9c8cdd8..1b70bfd 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -725,13 +725,15 @@ def base_get_metadata_svn_revision(d):
pass
return revision
+GIT_CONFIG = "${STAGING_DIR_NATIVE}/usr/etc/gitconfig"
+
def generate_git_config(e):
import bb
import os
from bb import data
if data.getVar('GIT_CORE_CONFIG', e.data, True):
- gitconfig_path =
bb.data.expand("${STAGING_DIR_NATIVE}/usr/etc/gitconfig", e.data)
+ gitconfig_path = bb.data.getVar('GIT_CONFIG', e.data, True)
proxy_command = " gitproxy = %s\n" %
data.getVar('GIT_PROXY_COMMAND', e.data, True)
bb.mkdirhier(bb.data.expand("${STAGING_DIR_NATIVE}/usr/etc/",
e.data))
@@ -748,10 +750,6 @@ def generate_git_config(e):
ignore_host = data.getVar('GIT_PROXY_IGNORE_%s' %
ignore_count, e.data, True)
f.write(proxy_command)
f.close
- if not os.path.exists(os.path.expanduser("~/.gitconfig")):
- import shutil
- shutil.copyfile(gitconfig_path,
os.path.expanduser("~/.gitconfig"))
-
METADATA_REVISION ?= "[EMAIL PROTECTED](d)}"
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
