On 02/05/2013 04:24 PM, Otavio Salvador wrote: > On Tue, Feb 5, 2013 at 8:52 PM, Darren Hart <[email protected]> wrote: >> The new oe-git-proxy.sh should address all git proxying needs. Document >> its usage in meta-yocto/conf/site.conf.sample and remove references to >> the old mechanisms. >> >> V2: Separate out the meta-yocto changes from the oe-core changes >> >> Signed-off-by: Darren Hart <[email protected]> >> --- >> meta-yocto/conf/site.conf.sample | 35 +++++++++-------------------------- >> 1 files changed, 9 insertions(+), 26 deletions(-) >> >> diff --git a/meta-yocto/conf/site.conf.sample >> b/meta-yocto/conf/site.conf.sample >> index 68d1da9..2834702 100644 >> --- a/meta-yocto/conf/site.conf.sample >> +++ b/meta-yocto/conf/site.conf.sample >> @@ -16,32 +16,15 @@ SCONF_VERSION = "1" >> #http-proxy-port = 81 >> # >> >> -# Uncomment to cause git to use the proxy host specificed >> -# although this only works for http >> -#GIT_PROXY_HOST = "proxy.example.com" >> -#GIT_PROXY_PORT = "81" >> -#export GIT_PROXY_COMMAND = "${COREBASE}/scripts/oe-git-proxy-command" >> - >> -# Set to yes to have a gitconfig generated for handling proxies; you >> -# might not want this if you have all that set in your global git >> -# configuration. If you don't enable it, the rest of the entries >> -# (_PROXY_IGNORE, etc) don't really work that well >> -#GIT_CORE_CONFIG = "Yes" >> - >> -# Space separate list of hosts to ignore for GIT proxy >> -#GIT_PROXY_IGNORE = "host.server.com another.server.com" >> - >> -# If SOCKS is available run the following command to comple a simple >> transport >> -# gcc scripts/oe-git-proxy-socks.c -o oe-git-proxy-socks >> -# and then share that binary somewhere in PATH, then use the following >> settings >> -#GIT_PROXY_HOST = "proxy.example.com" >> -#GIT_PROXY_PORT = "81" >> - >> -# GIT_PROXY_COMMAND is used by git to override all proxy settings from >> -# configuration files, so we prefix OE_ to avoid breaking havoc on the >> -# generated (or local) gitconfig's. >> -#OE_GIT_PROXY_COMMAND = "${COREBASE}/scripts/oe-git-proxy-socks-command" >> - >> +# To use git with a proxy, you must use an external git proxy command, such >> as >> +# the one provided by scripts/oe-git-proxy.sh. To use this script, copy it >> to >> +# your PATH and uncomment the following: >> +#GIT_PROXY_COMMAND="oe-git-proxy.sh" > > .sh
Fixed > A similar change ought to be done for oe-core .sample, no? I didn't see any git proxy documentation there and no conf.sample files in oe-core at all. Perhaps someone would like to add a site.conf.sample for oe-core? -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
