diff options
author | Marius Mauch <genone@gentoo.org> | 2006-03-19 17:36:50 +0000 |
---|---|---|
committer | Marius Mauch <genone@gentoo.org> | 2006-03-19 17:36:50 +0000 |
commit | dd5b5fe7182be46e7d753a03a67369eb5ae7ec13 (patch) | |
tree | 9543a72dcd0d1e0f50eee02d2e72fcc6aa74ac0e /cnf | |
parent | 864b12bbd9e2ef833f9222a31594c476fc0c42c9 (diff) | |
download | portage-dd5b5fe7182be46e7d753a03a67369eb5ae7ec13.tar.gz portage-dd5b5fe7182be46e7d753a03a67369eb5ae7ec13.tar.bz2 portage-dd5b5fe7182be46e7d753a03a67369eb5ae7ec13.zip |
Add support for generic PORTAGE_RSYNC_{EXTRA_,}OPTS, deprecate existing RSYNC_ variables, rename RSYNC_RETRIES to PORTAGE_RSYNC_RETRIES
svn path=/main/trunk/; revision=2955
Diffstat (limited to 'cnf')
-rw-r--r-- | cnf/make.conf | 19 | ||||
-rw-r--r-- | cnf/make.conf.alpha | 19 | ||||
-rw-r--r-- | cnf/make.conf.amd64 | 19 | ||||
-rw-r--r-- | cnf/make.conf.arm | 19 | ||||
-rw-r--r-- | cnf/make.conf.hppa | 19 | ||||
-rw-r--r-- | cnf/make.conf.ia64 | 19 | ||||
-rw-r--r-- | cnf/make.conf.mac | 6 | ||||
-rw-r--r-- | cnf/make.conf.mips | 19 | ||||
-rw-r--r-- | cnf/make.conf.ppc | 19 | ||||
-rw-r--r-- | cnf/make.conf.ppc64 | 19 | ||||
-rw-r--r-- | cnf/make.conf.s390 | 19 | ||||
-rw-r--r-- | cnf/make.conf.sparc | 19 | ||||
-rw-r--r-- | cnf/make.conf.x86 | 19 | ||||
-rw-r--r-- | cnf/make.conf.x86-fbsd | 19 | ||||
-rw-r--r-- | cnf/make.globals | 6 |
15 files changed, 121 insertions, 138 deletions
diff --git a/cnf/make.conf b/cnf/make.conf index 863fb957e..4c8b56012 100644 --- a/cnf/make.conf +++ b/cnf/make.conf @@ -207,18 +207,17 @@ CHOST="i686-pc-linux-gnu" # Australia: "rsync://rsync.au.gentoo.org/gentoo-portage" #SYNC="rsync://rsync.gentoo.org/gentoo-portage" # -# RSYNC_RETRIES sets the number of times portage will attempt to retrieve +# PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve # a current portage tree before it exits with an error. This allows # for a more successful retrieval without user intervention most times. -#RSYNC_RETRIES="3" -# -# RSYNC_TIMEOUT sets the length of time rsync will wait before it times out -# on a connection. Most users will benefit from this setting as it will -# reduce the amount of 'dead air' they experience when they run across -# the occasional, unreachable mirror. Dialup users might want to set this -# value up around the 300 second mark. -#RSYNC_TIMEOUT=180 - +#PORTAGE_RSYNC_RETRIES="3" +# +# PORTAGE_RSYNC_EXTRA_OPTS can be used to feed additional options to the rsync +# command used by `emerge --sync`. This will not change the default options +# which are set by PORTAGE_RSYNC_OPTS (don't change those unless you know +# exactly what you're doing). +#PORTAGE_RSYNC_EXTRA_OPTS="" +# # Advanced Features # ================= # diff --git a/cnf/make.conf.alpha b/cnf/make.conf.alpha index 613c2abb4..6a5609d61 100644 --- a/cnf/make.conf.alpha +++ b/cnf/make.conf.alpha @@ -193,18 +193,17 @@ CFLAGS="-mcpu=ev5 -O3 -pipe " # Australia: "rsync://rsync.au.gentoo.org/gentoo-portage" #SYNC="rsync://rsync.gentoo.org/gentoo-portage" # -# RSYNC_RETRIES sets the number of times portage will attempt to retrieve +# PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve # a current portage tree before it exits with an error. This allows # for a more successful retrieval without user intervention most times. -#RSYNC_RETRIES="3" -# -# RSYNC_TIMEOUT sets the length of time rsync will wait before it times out -# on a connection. Most users will benefit from this setting as it will -# reduce the amount of 'dead air' they experience when they run across -# the occasional, unreachable mirror. Dialup users might want to set this -# value up around the 300 second mark. -#RSYNC_TIMEOUT=180 - +#PORTAGE_RSYNC_RETRIES="3" +# +# PORTAGE_RSYNC_EXTRA_OPTS can be used to feed additional options to the rsync +# command used by `emerge --sync`. This will not change the default options +# which are set by PORTAGE_RSYNC_OPTS (don't change those unless you know +# exactly what you're doing). +#PORTAGE_RSYNC_EXTRA_OPTS="" +# # Advanced Features # ================= # diff --git a/cnf/make.conf.amd64 b/cnf/make.conf.amd64 index ef4ef3212..2b83eb566 100644 --- a/cnf/make.conf.amd64 +++ b/cnf/make.conf.amd64 @@ -204,18 +204,17 @@ CHOST="x86_64-pc-linux-gnu" # Australia: "rsync://rsync.au.gentoo.org/gentoo-portage" #SYNC="rsync://rsync.gentoo.org/gentoo-portage" # -# RSYNC_RETRIES sets the number of times portage will attempt to retrieve +# PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve # a current portage tree before it exits with an error. This allows # for a more successful retrieval without user intervention most times. -#RSYNC_RETRIES="3" -# -# RSYNC_TIMEOUT sets the length of time rsync will wait before it times out -# on a connection. Most users will benefit from this setting as it will -# reduce the amount of 'dead air' they experience when they run across -# the occasional, unreachable mirror. Dialup users might want to set this -# value up around the 300 second mark. -#RSYNC_TIMEOUT=180 - +#PORTAGE_RSYNC_RETRIES="3" +# +# PORTAGE_RSYNC_EXTRA_OPTS can be used to feed additional options to the rsync +# command used by `emerge --sync`. This will not change the default options +# which are set by PORTAGE_RSYNC_OPTS (don't change those unless you know +# exactly what you're doing). +#PORTAGE_RSYNC_EXTRA_OPTS="" +# # Advanced Features # ================= # diff --git a/cnf/make.conf.arm b/cnf/make.conf.arm index ccb4e47b5..d9a4bdacb 100644 --- a/cnf/make.conf.arm +++ b/cnf/make.conf.arm @@ -201,18 +201,17 @@ CHOST="armv4l-unknown-linux-gnu" # Australia: "rsync://rsync.au.gentoo.org/gentoo-portage" #SYNC="rsync://rsync.gentoo.org/gentoo-portage" # -# RSYNC_RETRIES sets the number of times portage will attempt to retrieve +# PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve # a current portage tree before it exits with an error. This allows # for a more successful retrieval without user intervention most times. -#RSYNC_RETRIES="3" -# -# RSYNC_TIMEOUT sets the length of time rsync will wait before it times out -# on a connection. Most users will benefit from this setting as it will -# reduce the amount of 'dead air' they experience when they run across -# the occasional, unreachable mirror. Dialup users might want to set this -# value up around the 300 second mark. -#RSYNC_TIMEOUT=180 - +#PORTAGE_RSYNC_RETRIES="3" +# +# PORTAGE_RSYNC_EXTRA_OPTS can be used to feed additional options to the rsync +# command used by `emerge --sync`. This will not change the default options +# which are set by PORTAGE_RSYNC_OPTS (don't change those unless you know +# exactly what you're doing). +#PORTAGE_RSYNC_EXTRA_OPTS="" +# # Advanced Features # ================= # diff --git a/cnf/make.conf.hppa b/cnf/make.conf.hppa index 892fa51c4..ffe0e32db 100644 --- a/cnf/make.conf.hppa +++ b/cnf/make.conf.hppa @@ -210,18 +210,17 @@ CHOST="hppa-unknown-linux-gnu" # Australia: "rsync://rsync.au.gentoo.org/gentoo-portage" #SYNC="rsync://rsync.gentoo.org/gentoo-portage" # -# RSYNC_RETRIES sets the number of times portage will attempt to retrieve +# PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve # a current portage tree before it exits with an error. This allows # for a more successful retrieval without user intervention most times. -#RSYNC_RETRIES="3" -# -# RSYNC_TIMEOUT sets the length of time rsync will wait before it times out -# on a connection. Most users will benefit from this setting as it will -# reduce the amount of 'dead air' they experience when they run across -# the occasional, unreachable mirror. Dialup users might want to set this -# value up around the 300 second mark. -#RSYNC_TIMEOUT=180 - +#PORTAGE_RSYNC_RETRIES="3" +# +# PORTAGE_RSYNC_EXTRA_OPTS can be used to feed additional options to the rsync +# command used by `emerge --sync`. This will not change the default options +# which are set by PORTAGE_RSYNC_OPTS (don't change those unless you know +# exactly what you're doing). +#PORTAGE_RSYNC_EXTRA_OPTS="" +# # Advanced Features # ================= # diff --git a/cnf/make.conf.ia64 b/cnf/make.conf.ia64 index 95df49395..270111443 100644 --- a/cnf/make.conf.ia64 +++ b/cnf/make.conf.ia64 @@ -172,18 +172,17 @@ CHOST="ia64-unknown-linux-gnu" # Australia: "rsync://rsync.au.gentoo.org/gentoo-portage" #SYNC="rsync://rsync.gentoo.org/gentoo-portage" # -# RSYNC_RETRIES sets the number of times portage will attempt to retrieve +# PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve # a current portage tree before it exits with an error. This allows # for a more successful retrieval without user intervention most times. -#RSYNC_RETRIES="3" -# -# RSYNC_TIMEOUT sets the length of time rsync will wait before it times out -# on a connection. Most users will benefit from this setting as it will -# reduce the amount of 'dead air' they experience when they run across -# the occasional, unreachable mirror. Dialup users might want to set this -# value up around the 300 second mark. -#RSYNC_TIMEOUT=180 - +#PORTAGE_RSYNC_RETRIES="3" +# +# PORTAGE_RSYNC_EXTRA_OPTS can be used to feed additional options to the rsync +# command used by `emerge --sync`. This will not change the default options +# which are set by PORTAGE_RSYNC_OPTS (don't change those unless you know +# exactly what you're doing). +#PORTAGE_RSYNC_EXTRA_OPTS="" +# # Advanced Features # ================= # diff --git a/cnf/make.conf.mac b/cnf/make.conf.mac deleted file mode 100644 index 292d9a510..000000000 --- a/cnf/make.conf.mac +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/cnf/make.conf.mac,v 1.2 2004/09/30 06:34:27 vapier Exp $ -# Contains local system settings for Portage system - -#Nothing needed here diff --git a/cnf/make.conf.mips b/cnf/make.conf.mips index 8602b00e2..16ac25b9d 100644 --- a/cnf/make.conf.mips +++ b/cnf/make.conf.mips @@ -190,18 +190,17 @@ CHOST="mips-unknown-linux-gnu" # Australia: "rsync://rsync.au.gentoo.org/gentoo-portage" #SYNC="rsync://rsync.gentoo.org/gentoo-portage" # -# RSYNC_RETRIES sets the number of times portage will attempt to retrieve +# PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve # a current portage tree before it exits with an error. This allows # for a more successful retrieval without user intervention most times. -#RSYNC_RETRIES="3" -# -# RSYNC_TIMEOUT sets the length of time rsync will wait before it times out -# on a connection. Most users will benefit from this setting as it will -# reduce the amount of 'dead air' they experience when they run across -# the occasional, unreachable mirror. Dialup users might want to set this -# value up around the 300 second mark. -#RSYNC_TIMEOUT=180 - +#PORTAGE_RSYNC_RETRIES="3" +# +# PORTAGE_RSYNC_EXTRA_OPTS can be used to feed additional options to the rsync +# command used by `emerge --sync`. This will not change the default options +# which are set by PORTAGE_RSYNC_OPTS (don't change those unless you know +# exactly what you're doing). +#PORTAGE_RSYNC_EXTRA_OPTS="" +# # Advanced Features # ================= # diff --git a/cnf/make.conf.ppc b/cnf/make.conf.ppc index 1b6ebcc77..5bfc411bb 100644 --- a/cnf/make.conf.ppc +++ b/cnf/make.conf.ppc @@ -230,18 +230,17 @@ CHOST="powerpc-unknown-linux-gnu" # Australia: "rsync://rsync.au.gentoo.org/gentoo-portage" #SYNC="rsync://rsync.gentoo.org/gentoo-portage" # -# RSYNC_RETRIES sets the number of times portage will attempt to retrieve +# PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve # a current portage tree before it exits with an error. This allows # for a more successful retrieval without user intervention most times. -#RSYNC_RETRIES="3" -# -# RSYNC_TIMEOUT sets the length of time rsync will wait before it times out -# on a connection. Most users will benefit from this setting as it will -# reduce the amount of 'dead air' they experience when they run across -# the occasional, unreachable mirror. Dialup users might want to set this -# value up around the 300 second mark. -#RSYNC_TIMEOUT=180 - +#PORTAGE_RSYNC_RETRIES="3" +# +# PORTAGE_RSYNC_EXTRA_OPTS can be used to feed additional options to the rsync +# command used by `emerge --sync`. This will not change the default options +# which are set by PORTAGE_RSYNC_OPTS (don't change those unless you know +# exactly what you're doing). +#PORTAGE_RSYNC_EXTRA_OPTS="" +# # Advanced Features # ================= # diff --git a/cnf/make.conf.ppc64 b/cnf/make.conf.ppc64 index 80c4e1fba..f0816ead8 100644 --- a/cnf/make.conf.ppc64 +++ b/cnf/make.conf.ppc64 @@ -214,18 +214,17 @@ CHOST="powerpc64-unknown-linux-gnu" # Australia: "rsync://rsync.au.gentoo.org/gentoo-portage" #SYNC="rsync://rsync.gentoo.org/gentoo-portage" # -# RSYNC_RETRIES sets the number of times portage will attempt to retrieve +# PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve # a current portage tree before it exits with an error. This allows # for a more successful retrieval without user intervention most times. -#RSYNC_RETRIES="3" -# -# RSYNC_TIMEOUT sets the length of time rsync will wait before it times out -# on a connection. Most users will benefit from this setting as it will -# reduce the amount of 'dead air' they experience when they run across -# the occasional, unreachable mirror. Dialup users might want to set this -# value up around the 300 second mark. -#RSYNC_TIMEOUT=180 - +#PORTAGE_RSYNC_RETRIES="3" +# +# PORTAGE_RSYNC_EXTRA_OPTS can be used to feed additional options to the rsync +# command used by `emerge --sync`. This will not change the default options +# which are set by PORTAGE_RSYNC_OPTS (don't change those unless you know +# exactly what you're doing). +#PORTAGE_RSYNC_EXTRA_OPTS="" +# # Advanced Features # ================= # diff --git a/cnf/make.conf.s390 b/cnf/make.conf.s390 index f1f612711..55f727b4f 100644 --- a/cnf/make.conf.s390 +++ b/cnf/make.conf.s390 @@ -172,18 +172,17 @@ CHOST="s390-ibm-linux-gnu" # Australia: "rsync://rsync.au.gentoo.org/gentoo-portage" #SYNC="rsync://rsync.gentoo.org/gentoo-portage" # -# RSYNC_RETRIES sets the number of times portage will attempt to retrieve +# PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve # a current portage tree before it exits with an error. This allows # for a more successful retrieval without user intervention most times. -#RSYNC_RETRIES="3" -# -# RSYNC_TIMEOUT sets the length of time rsync will wait before it times out -# on a connection. Most users will benefit from this setting as it will -# reduce the amount of 'dead air' they experience when they run across -# the occasional, unreachable mirror. Dialup users might want to set this -# value up around the 300 second mark. -#RSYNC_TIMEOUT=180 - +#PORTAGE_RSYNC_RETRIES="3" +# +# PORTAGE_RSYNC_EXTRA_OPTS can be used to feed additional options to the rsync +# command used by `emerge --sync`. This will not change the default options +# which are set by PORTAGE_RSYNC_OPTS (don't change those unless you know +# exactly what you're doing). +#PORTAGE_RSYNC_EXTRA_OPTS="" +# # Advanced Features # ================= # diff --git a/cnf/make.conf.sparc b/cnf/make.conf.sparc index 637bc174e..13605c53c 100644 --- a/cnf/make.conf.sparc +++ b/cnf/make.conf.sparc @@ -208,18 +208,17 @@ # Australia: "rsync://rsync.au.gentoo.org/gentoo-portage" #SYNC="rsync://rsync.gentoo.org/gentoo-portage" # -# RSYNC_RETRIES sets the number of times portage will attempt to retrieve +# PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve # a current portage tree before it exits with an error. This allows # for a more successful retrieval without user intervention most times. -#RSYNC_RETRIES="3" -# -# RSYNC_TIMEOUT sets the length of time rsync will wait before it times out -# on a connection. Most users will benefit from this setting as it will -# reduce the amount of 'dead air' they experience when they run across -# the occasional, unreachable mirror. Dialup users might want to set this -# value up around the 300 second mark. -#RSYNC_TIMEOUT=180 - +#PORTAGE_RSYNC_RETRIES="3" +# +# PORTAGE_RSYNC_EXTRA_OPTS can be used to feed additional options to the rsync +# command used by `emerge --sync`. This will not change the default options +# which are set by PORTAGE_RSYNC_OPTS (don't change those unless you know +# exactly what you're doing). +#PORTAGE_RSYNC_EXTRA_OPTS="" +# # Advanced Features # ================= # diff --git a/cnf/make.conf.x86 b/cnf/make.conf.x86 index f1272ccd3..c053d7256 100644 --- a/cnf/make.conf.x86 +++ b/cnf/make.conf.x86 @@ -207,18 +207,17 @@ CHOST="i686-pc-linux-gnu" # Australia: "rsync://rsync.au.gentoo.org/gentoo-portage" #SYNC="rsync://rsync.gentoo.org/gentoo-portage" # -# RSYNC_RETRIES sets the number of times portage will attempt to retrieve +# PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve # a current portage tree before it exits with an error. This allows # for a more successful retrieval without user intervention most times. -#RSYNC_RETRIES="3" -# -# RSYNC_TIMEOUT sets the length of time rsync will wait before it times out -# on a connection. Most users will benefit from this setting as it will -# reduce the amount of 'dead air' they experience when they run across -# the occasional, unreachable mirror. Dialup users might want to set this -# value up around the 300 second mark. -#RSYNC_TIMEOUT=180 - +#PORTAGE_RSYNC_RETRIES="3" +# +# PORTAGE_RSYNC_EXTRA_OPTS can be used to feed additional options to the rsync +# command used by `emerge --sync`. This will not change the default options +# which are set by PORTAGE_RSYNC_OPTS (don't change those unless you know +# exactly what you're doing). +#PORTAGE_RSYNC_EXTRA_OPTS="" +# # Advanced Features # ================= # diff --git a/cnf/make.conf.x86-fbsd b/cnf/make.conf.x86-fbsd index 8e4ba3541..53571185a 100644 --- a/cnf/make.conf.x86-fbsd +++ b/cnf/make.conf.x86-fbsd @@ -207,18 +207,17 @@ CHOST="i686-unknown-freebsd5.3" # Australia: "rsync://rsync.au.gentoo.org/gentoo-portage" #SYNC="rsync://rsync.gentoo.org/gentoo-portage" # -# RSYNC_RETRIES sets the number of times portage will attempt to retrieve +# PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve # a current portage tree before it exits with an error. This allows # for a more successful retrieval without user intervention most times. -#RSYNC_RETRIES="3" -# -# RSYNC_TIMEOUT sets the length of time rsync will wait before it times out -# on a connection. Most users will benefit from this setting as it will -# reduce the amount of 'dead air' they experience when they run across -# the occasional, unreachable mirror. Dialup users might want to set this -# value up around the 300 second mark. -#RSYNC_TIMEOUT=180 - +#PORTAGE_RSYNC_RETRIES="3" +# +# PORTAGE_RSYNC_EXTRA_OPTS can be used to feed additional options to the rsync +# command used by `emerge --sync`. This will not change the default options +# which are set by PORTAGE_RSYNC_OPTS (don't change those unless you know +# exactly what you're doing). +#PORTAGE_RSYNC_EXTRA_OPTS="" +# # Advanced Features # ================= # diff --git a/cnf/make.globals b/cnf/make.globals index cdcceb198..36f1d3042 100644 --- a/cnf/make.globals +++ b/cnf/make.globals @@ -49,10 +49,12 @@ EMERGE_WARNING_DELAY="10" AUTOCLEAN="yes" # Number of times 'emerge --sync' will run before giving up. -RSYNC_RETRIES="3" +PORTAGE_RSYNC_RETRIES="3" # Number of seconds rsync will wait before timing out. -RSYNC_TIMEOUT="180" +#RSYNC_TIMEOUT="180" + +PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --delete-after --stats --timeout=180 --exclude='/distfiles' --exclude='/local' --exclude='/packages'" # Minimal CONFIG_PROTECT CONFIG_PROTECT="/etc" |