diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-12-08 10:21:04 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-08 10:21:04 -0800 |
| commit | 2f0a800ef2de88feadec7ab060580fac5fde1ad9 (patch) | |
| tree | ce8e09d448a18a33f1f57a45d2c56c55dc7f13e5 /cnf | |
| parent | etc-update: experimental prefix support (diff) | |
| download | portage-2f0a800ef2de88feadec7ab060580fac5fde1ad9.tar.gz portage-2f0a800ef2de88feadec7ab060580fac5fde1ad9.tar.bz2 portage-2f0a800ef2de88feadec7ab060580fac5fde1ad9.zip | |
Use 'wget' instead of /usr/bin/wget everywhere.
This reduces the amount of patching needed for prefix installs.
Diffstat (limited to 'cnf')
| -rw-r--r-- | cnf/make.conf | 8 | ||||
| -rw-r--r-- | cnf/make.globals | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cnf/make.conf b/cnf/make.conf index 9d0389200..ef570bcb4 100644 --- a/cnf/make.conf +++ b/cnf/make.conf @@ -137,12 +137,12 @@ # at \${DISTDIR}/\${FILE}. # # Default fetch command (3 tries, passive ftp for firewall compatibility) -#FETCHCOMMAND="/usr/bin/wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" -#RESUMECOMMAND="/usr/bin/wget -c -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" +#FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" +#RESUMECOMMAND="wget -c -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" # # Using wget, ratelimiting downloads -#FETCHCOMMAND="/usr/bin/wget -t 3 -T 60 --passive-ftp --limit-rate=200k -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" -#RESUMECOMMAND="/usr/bin/wget -c -t 3 -T 60 --passive-ftp --limit-rate=200k -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" +#FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp --limit-rate=200k -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" +#RESUMECOMMAND="wget -c -t 3 -T 60 --passive-ftp --limit-rate=200k -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" # # Lukemftp (BSD ftp): #FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" diff --git a/cnf/make.globals b/cnf/make.globals index aef2695fc..f7f178004 100644 --- a/cnf/make.globals +++ b/cnf/make.globals @@ -39,8 +39,8 @@ RPMDIR=/usr/portage/rpm PORTAGE_TMPDIR=/var/tmp # Fetching command (3 tries, passive ftp for firewall compatibility) -FETCHCOMMAND="/usr/bin/wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" -RESUMECOMMAND="/usr/bin/wget -c -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" +FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" +RESUMECOMMAND="wget -c -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" FETCHCOMMAND_RSYNC="rsync -avP \"\${URI}\" \"\${DISTDIR}/\${FILE}\"" RESUMECOMMAND_RSYNC="rsync -avP \"\${URI}\" \"\${DISTDIR}/\${FILE}\"" |