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 | |
| parent | 2df83a53ba68f57eb7caa7d11a8873ed97b583b4 (diff) | |
| download | 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')
| -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 68d1da91a9..b2d01d0c59 100644 --- a/meta-yocto/conf/site.conf.sample +++ b/meta-yocto/conf/site.conf.sample | |||
| @@ -16,32 +16,15 @@ SCONF_VERSION = "1" | |||
| 16 | #http-proxy-port = 81 | 16 | #http-proxy-port = 81 |
| 17 | # | 17 | # |
| 18 | 18 | ||
| 19 | # Uncomment to cause git to use the proxy host specificed | 19 | # To use git with a proxy, you must use an external git proxy command, such as |
| 20 | # although this only works for http | 20 | # the one provided by scripts/oe-git-proxy.sh. To use this script, copy it to |
| 21 | #GIT_PROXY_HOST = "proxy.example.com" | 21 | # your PATH and uncomment the following: |
| 22 | #GIT_PROXY_PORT = "81" | 22 | #GIT_PROXY_COMMAND="oe-git-proxy" |
| 23 | #export GIT_PROXY_COMMAND = "${COREBASE}/scripts/oe-git-proxy-command" | 23 | #ALL_PROXY="socks://socks.example.com:1080" |
| 24 | 24 | #or | |
| 25 | # Set to yes to have a gitconfig generated for handling proxies; you | 25 | #ALL_PROXY="https://proxy.example.com:8080" |
| 26 | # might not want this if you have all that set in your global git | 26 | # If you wish to use certain hosts without the proxy, specify them in NO_PROXY. |
| 27 | # configuration. If you don't enable it, the rest of the entries | 27 | # See the script for details on syntax. |
| 28 | # (_PROXY_IGNORE, etc) don't really work that well | ||
| 29 | #GIT_CORE_CONFIG = "Yes" | ||
| 30 | |||
| 31 | # Space separate list of hosts to ignore for GIT proxy | ||
| 32 | #GIT_PROXY_IGNORE = "host.server.com another.server.com" | ||
| 33 | |||
| 34 | # If SOCKS is available run the following command to comple a simple transport | ||
| 35 | # gcc scripts/oe-git-proxy-socks.c -o oe-git-proxy-socks | ||
| 36 | # and then share that binary somewhere in PATH, then use the following settings | ||
| 37 | #GIT_PROXY_HOST = "proxy.example.com" | ||
| 38 | #GIT_PROXY_PORT = "81" | ||
| 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" | ||
| 44 | |||
| 45 | 28 | ||
| 46 | # Uncomment this to use a shared download directory | 29 | # Uncomment this to use a shared download directory |
| 47 | #DL_DIR = "/some/shared/download/directory/" | 30 | #DL_DIR = "/some/shared/download/directory/" |