From 7bb36e5da0d28404d7b272135045cdb5cb160472 Mon Sep 17 00:00:00 2001 From: Inaky Perez-Gonzalez Date: Thu, 1 Mar 2012 09:44:34 +0000 Subject: site.conf.sample: Fix broken SOCKS proxy setup and configuration SOCKS proxy specification with git was using conflicting methods and thus was failing when mixed SOCKS needs were in place (requiring no proxy for some hosts and proxy for the rest) - GIT_PROXY_COMMAND is an environment variable GIT uses to OVERRIDE all proxy configuration in ~/.gitconfig or any other gitconfig. By using it to configure, it was breaking havoc on site git configuration or the one generated by bitbake in tmp/. Renamed to OE_GIT_PROXY_COMMAND in meta/conf/site.conf.sample (with a doc tidbit on the name chosen), meta/classes/base.bbclass. - The gitconfig generated by bitbake was wrong. There was a typo error (gitproxy vs gitProxy), thus all lines were being ignored. Fixed in meta/classes/base.bbclass. - The gitconfig generated was being placed in ${STAGING_DIR_NATIVE}/usr/etc/gitconfig; git was looking for it in ${STAGING_DIR_NATIVE}/etc/gitconfig. Fixed that in meta/classes/base.bbclass, at the same time creating a GIT_CONFIG_PATH variable, since it is also referenced in generate_git_config() and have all instances refer to that. (From OE-Core rev: e579eb7f33462258c8e82a0936d970593614840d) Signed-off-by: Inaky Perez-Gonzalez Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'meta/classes/base.bbclass') 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() { raise bb.build.FuncFailed(e) } -GIT_CONFIG = "${STAGING_DIR_NATIVE}/usr/etc/gitconfig" +GIT_CONFIG_PATH = "${STAGING_DIR_NATIVE}/etc" +GIT_CONFIG = "${GIT_CONFIG_PATH}/gitconfig" def generate_git_config(e): from bb import data if data.getVar('GIT_CORE_CONFIG', e.data, True): gitconfig_path = e.data.getVar('GIT_CONFIG', True) - proxy_command = " gitproxy = %s\n" % data.getVar('GIT_PROXY_COMMAND', e.data, True) + proxy_command = " gitProxy = %s\n" % data.getVar('OE_GIT_PROXY_COMMAND', e.data, True) - bb.mkdirhier(bb.data.expand("${STAGING_DIR_NATIVE}/usr/etc/", e.data)) + bb.mkdirhier(bb.data.expand("${GIT_CONFIG_PATH}", e.data)) if (os.path.exists(gitconfig_path)): os.remove(gitconfig_path) @@ -128,7 +129,7 @@ def generate_git_config(e): f.write("[core]\n") ignore_hosts = data.getVar('GIT_PROXY_IGNORE', e.data, True).split() for ignore_host in ignore_hosts: - f.write(" gitproxy = none for %s\n" % ignore_host) + f.write(" gitProxy = none for %s\n" % ignore_host) f.write(proxy_command) f.close -- cgit v1.2.3-54-g00ecf