From 4c626238e7413417db002a21f45042d1eca9280a Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Tue, 4 Nov 2008 13:32:35 +0000
Subject: base.bbclass: Set GIT_CONFIG correctly
---
meta/classes/base.bbclass | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
(limited to 'meta/classes')
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 9c8cdd8d1..1b70bfdd5 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 ?= "${@base_get_metadata_monotone_revision(d)}"
--
cgit v1.2.3