diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2013-02-08 14:27:23 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-11 22:54:04 +0000 |
| commit | 54728735d67b567cdb067f793490ad15c448c828 (patch) | |
| tree | dbd6a4b1a5d49e17a30ea7c2fa2250bec877024f /meta-yocto/conf/site.conf.sample | |
| parent | 2df83a53ba68f57eb7caa7d11a8873ed97b583b4 (diff) | |
| download | ast2050-yocto-poky-54728735d67b567cdb067f793490ad15c448c828.zip ast2050-yocto-poky-54728735d67b567cdb067f793490ad15c448c828.tar.gz | |
meta-yocto: Document new oe-git-proxy in site.conf.sample
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
(From meta-yocto rev: 4be5040a4d0b0fee0118ce31b233c666b8708b6a)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto/conf/site.conf.sample')
| -rw-r--r-- | 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..b2d01d0 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" +#ALL_PROXY="socks://socks.example.com:1080" +#or +#ALL_PROXY="https://proxy.example.com:8080" +# If you wish to use certain hosts without the proxy, specify them in NO_PROXY. +# See the script for details on syntax. # Uncomment this to use a shared download directory #DL_DIR = "/some/shared/download/directory/" |
