diff options
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r-- | meta/classes/base.bbclass | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index e80e874360..a76fe55b89 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -111,16 +111,17 @@ python base_do_unpack() { | |||
111 | raise bb.build.FuncFailed(e) | 111 | raise bb.build.FuncFailed(e) |
112 | } | 112 | } |
113 | 113 | ||
114 | GIT_CONFIG = "${STAGING_DIR_NATIVE}/usr/etc/gitconfig" | 114 | GIT_CONFIG_PATH = "${STAGING_DIR_NATIVE}/etc" |
115 | GIT_CONFIG = "${GIT_CONFIG_PATH}/gitconfig" | ||
115 | 116 | ||
116 | def generate_git_config(e): | 117 | def generate_git_config(e): |
117 | from bb import data | 118 | from bb import data |
118 | 119 | ||
119 | if data.getVar('GIT_CORE_CONFIG', e.data, True): | 120 | if data.getVar('GIT_CORE_CONFIG', e.data, True): |
120 | gitconfig_path = e.data.getVar('GIT_CONFIG', True) | 121 | gitconfig_path = e.data.getVar('GIT_CONFIG', True) |
121 | proxy_command = " gitproxy = %s\n" % data.getVar('GIT_PROXY_COMMAND', e.data, True) | 122 | proxy_command = " gitProxy = %s\n" % data.getVar('OE_GIT_PROXY_COMMAND', e.data, True) |
122 | 123 | ||
123 | bb.mkdirhier(bb.data.expand("${STAGING_DIR_NATIVE}/usr/etc/", e.data)) | 124 | bb.mkdirhier(bb.data.expand("${GIT_CONFIG_PATH}", e.data)) |
124 | if (os.path.exists(gitconfig_path)): | 125 | if (os.path.exists(gitconfig_path)): |
125 | os.remove(gitconfig_path) | 126 | os.remove(gitconfig_path) |
126 | 127 | ||
@@ -128,7 +129,7 @@ def generate_git_config(e): | |||
128 | f.write("[core]\n") | 129 | f.write("[core]\n") |
129 | ignore_hosts = data.getVar('GIT_PROXY_IGNORE', e.data, True).split() | 130 | ignore_hosts = data.getVar('GIT_PROXY_IGNORE', e.data, True).split() |
130 | for ignore_host in ignore_hosts: | 131 | for ignore_host in ignore_hosts: |
131 | f.write(" gitproxy = none for %s\n" % ignore_host) | 132 | f.write(" gitProxy = none for %s\n" % ignore_host) |
132 | f.write(proxy_command) | 133 | f.write(proxy_command) |
133 | f.close | 134 | f.close |
134 | 135 | ||