summaryrefslogtreecommitdiffstats
path: root/meta-yocto
diff options
context:
space:
mode:
authorInaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>2012-03-01 09:44:34 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-01 16:35:53 (GMT)
commit7bb36e5da0d28404d7b272135045cdb5cb160472 (patch)
tree4b8938cdb645adc42d2738696add2b4d4a2a34bc /meta-yocto
parent18af1f5b19eb61615aee6eb6d4238f6b2f403e25 (diff)
downloadpoky-7bb36e5da0d28404d7b272135045cdb5cb160472.tar.gz
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 <inaky.perez-gonzalez@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto')
-rw-r--r--meta-yocto/conf/site.conf.sample16
1 files changed, 12 insertions, 4 deletions
diff --git a/meta-yocto/conf/site.conf.sample b/meta-yocto/conf/site.conf.sample
index d438298..68d1da9 100644
--- a/meta-yocto/conf/site.conf.sample
+++ b/meta-yocto/conf/site.conf.sample
@@ -22,17 +22,25 @@ SCONF_VERSION = "1"
22#GIT_PROXY_PORT = "81" 22#GIT_PROXY_PORT = "81"
23#export GIT_PROXY_COMMAND = "${COREBASE}/scripts/oe-git-proxy-command" 23#export GIT_PROXY_COMMAND = "${COREBASE}/scripts/oe-git-proxy-command"
24 24
25# GIT_PROXY_IGNORE_* lines define hosts which do not require a proxy to access 25# Set to yes to have a gitconfig generated for handling proxies; you
26# might not want this if you have all that set in your global git
27# configuration. If you don't enable it, the rest of the entries
28# (_PROXY_IGNORE, etc) don't really work that well
26#GIT_CORE_CONFIG = "Yes" 29#GIT_CORE_CONFIG = "Yes"
27#GIT_PROXY_IGNORE_1 = "host.server.com" 30
28#GIT_PROXY_IGNORE_2 = "another.server.com" 31# Space separate list of hosts to ignore for GIT proxy
32#GIT_PROXY_IGNORE = "host.server.com another.server.com"
29 33
30# If SOCKS is available run the following command to comple a simple transport 34# If SOCKS is available run the following command to comple a simple transport
31# gcc scripts/oe-git-proxy-socks.c -o oe-git-proxy-socks 35# gcc scripts/oe-git-proxy-socks.c -o oe-git-proxy-socks
32# and then share that binary somewhere in PATH, then use the following settings 36# and then share that binary somewhere in PATH, then use the following settings
33#GIT_PROXY_HOST = "proxy.example.com" 37#GIT_PROXY_HOST = "proxy.example.com"
34#GIT_PROXY_PORT = "81" 38#GIT_PROXY_PORT = "81"
35#export GIT_PROXY_COMMAND = "${COREBASE}/scripts/oe-git-proxy-socks-command" 39
40# GIT_PROXY_COMMAND is used by git to override all proxy settings from
41# configuration files, so we prefix OE_ to avoid breaking havoc on the
42# generated (or local) gitconfig's.
43#OE_GIT_PROXY_COMMAND = "${COREBASE}/scripts/oe-git-proxy-socks-command"
36 44
37 45
38# Uncomment this to use a shared download directory 46# Uncomment this to use a shared download directory