summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-11-04 13:32:35 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-11-04 13:32:35 +0000
commit4c626238e7413417db002a21f45042d1eca9280a (patch)
tree91a0ad1ab3f8614fa66e9e064eca60a636faf0b7 /meta/classes
parent66481d67f46755a86d2ad426bab049eddf4efa81 (diff)
downloadpoky-4c626238e7413417db002a21f45042d1eca9280a.tar.gz
base.bbclass: Set GIT_CONFIG correctly
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/base.bbclass8
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 9c8cdd8d15..1b70bfdd5f 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -725,13 +725,15 @@ def base_get_metadata_svn_revision(d):
725 pass 725 pass
726 return revision 726 return revision
727 727
728GIT_CONFIG = "${STAGING_DIR_NATIVE}/usr/etc/gitconfig"
729
728def generate_git_config(e): 730def generate_git_config(e):
729 import bb 731 import bb
730 import os 732 import os
731 from bb import data 733 from bb import data
732 734
733 if data.getVar('GIT_CORE_CONFIG', e.data, True): 735 if data.getVar('GIT_CORE_CONFIG', e.data, True):
734 gitconfig_path = bb.data.expand("${STAGING_DIR_NATIVE}/usr/etc/gitconfig", e.data) 736 gitconfig_path = bb.data.getVar('GIT_CONFIG', e.data, True)
735 proxy_command = " gitproxy = %s\n" % data.getVar('GIT_PROXY_COMMAND', e.data, True) 737 proxy_command = " gitproxy = %s\n" % data.getVar('GIT_PROXY_COMMAND', e.data, True)
736 738
737 bb.mkdirhier(bb.data.expand("${STAGING_DIR_NATIVE}/usr/etc/", e.data)) 739 bb.mkdirhier(bb.data.expand("${STAGING_DIR_NATIVE}/usr/etc/", e.data))
@@ -748,10 +750,6 @@ def generate_git_config(e):
748 ignore_host = data.getVar('GIT_PROXY_IGNORE_%s' % ignore_count, e.data, True) 750 ignore_host = data.getVar('GIT_PROXY_IGNORE_%s' % ignore_count, e.data, True)
749 f.write(proxy_command) 751 f.write(proxy_command)
750 f.close 752 f.close
751 if not os.path.exists(os.path.expanduser("~/.gitconfig")):
752 import shutil
753 shutil.copyfile(gitconfig_path, os.path.expanduser("~/.gitconfig"))
754
755 753
756METADATA_REVISION ?= "${@base_get_metadata_monotone_revision(d)}" 754METADATA_REVISION ?= "${@base_get_metadata_monotone_revision(d)}"
757 755