diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/makepkg.conf | 6 | ||||
| -rw-r--r-- | etc/pacman.conf | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/etc/makepkg.conf b/etc/makepkg.conf index c73d9889..b2d8a893 100644 --- a/etc/makepkg.conf +++ b/etc/makepkg.conf @@ -5,6 +5,11 @@ # the top-level directory of all your PKGBUILDs export ABSROOT="/usr/abs" +# The FTP/HTTP download utility that makepkg should use to acquire sources +export FTPAGENT="/usr/bin/wget --continue --passive-ftp --tries=3 --waitretry=3" +#export FTPAGENT="/usr/bin/snarf" +#export FTPAGENT="/usr/bin/lftpget -c" + # Pentium Pro/Pentium II/Pentium III+/Pentium 4/Athlon optimized (but binaries # will run on any x86 system) #export CHOST="i686-pc-linux-gnu" @@ -22,3 +27,4 @@ export CXXFLAGS="-march=i686 -O2 -pipe" # if you want your name to show up in the packages you build, set this. #export PACKAGER="John Doe <john@doe.com>" + diff --git a/etc/pacman.conf b/etc/pacman.conf index ad77cfec..8262aad3 100644 --- a/etc/pacman.conf +++ b/etc/pacman.conf @@ -2,14 +2,21 @@ # /etc/pacman.conf # -# Currently the only option directive is NoUpgrade. Use this with a -# space-delimited list of files that should never be touched by pacman -# during an install/upgrade. (note: do not include the leading slash) +# GENERAL OPTIONS +# NoUpgrade: a space-delimited list of files that should never +# be touched by pacman during an install/upgrade. +# (note: do not include the leading slash) +# IgnorePkg: a space-delimited list of packages that pacman should NOT +# upgrade when doing a --sysupgrade [options] NoUpgrade = etc/passwd etc/group etc/shadow NoUpgrade = etc/fstab etc/rc.conf etc/rc.local NoUpgrade = etc/lilo.conf etc/raidtab +#IgnorePkg = lilo gcc +# +# REPOSITORIES +# [current] Server = ftp://ftp.archlinux.org/current Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/current |