summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/makepkg.conf14
-rw-r--r--etc/pacman.conf38
2 files changed, 28 insertions, 24 deletions
diff --git a/etc/makepkg.conf b/etc/makepkg.conf
index b2d8a893..77e62936 100644
--- a/etc/makepkg.conf
+++ b/etc/makepkg.conf
@@ -10,21 +10,23 @@ 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"
-#export CFLAGS="-mcpu=i686 -O2 -pipe"
-#export CXXFLAGS="-mcpu=i686 -O2 -pipe"
-
# Pentium Pro/Pentium II/Pentium III+/Pentium 4/Athlon exclusive (binaries
# will use the P6 instruction set and only run on P6+ systems)
export CHOST="i686-pc-linux-gnu"
export CFLAGS="-march=i686 -O2 -pipe"
export CXXFLAGS="-march=i686 -O2 -pipe"
+# Pentium Pro/Pentium II/Pentium III+/Pentium 4/Athlon optimized (but binaries
+# will run on any x86 system)
+#export CHOST="i686-pc-linux-gnu"
+#export CFLAGS="-mcpu=i686 -O2 -pipe"
+#export CXXFLAGS="-mcpu=i686 -O2 -pipe"
# SMP Systems
#export MAKEFLAGS="-j 2"
+# Enable fakeroot for building packages as a non-root user
+export USE_FAKEROOT="y"
+
# 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 aacf95ba..a11b383d 100644
--- a/etc/pacman.conf
+++ b/etc/pacman.conf
@@ -8,9 +8,11 @@
# GENERAL OPTIONS
#
[options]
+UseSyslog
NoUpgrade = etc/passwd etc/group etc/shadow
-NoUpgrade = etc/fstab etc/rc.conf etc/rc.local
-NoUpgrade = etc/lilo.conf etc/raidtab
+NoUpgrade = etc/fstab etc/raidtab
+NoUpgrade = etc/rc.conf etc/rc.local
+NoUpgrade = etc/lilo.conf boot/grub/menu.lst
#IgnorePkg = lilo gcc
#
@@ -28,6 +30,20 @@ Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/current
Server = ftp://saule.mintis.lt/pub/linux/current
Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/current
+# The "unofficial" package set
+#
+[unofficial]
+Server = ftp://ftp.archlinux.org/unofficial
+Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/unofficial
+Server = ftp://ftp.webtrek.com/pub/mirrors/archlinux/unofficial
+Server = ftp://ftp.mpi-sb.mpg.de/pub/linux/mirror/ftp.ibiblio.org/pub/Linux/distributions/archlinux/unofficial
+Server = ftp://ftp.oit.unc.edu/pub/Linux/distributions/archlinux/unofficial
+Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/unofficial
+Server = ftp://ftp.parrswood.net/Mirrors/ftp.archlinux.org/unofficial
+Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/unofficial
+Server = ftp://saule.mintis.lt/pub/linux/unofficial
+Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/unofficial
+
# If you use the 'stable' tree, you should disable the 'current'
# tree to avoid conflicts
#
@@ -43,26 +59,12 @@ Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/current
#Server = ftp://saule.mintis.lt/pub/linux/stable
#Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/stable
-# Uncomment this block to access the 'unofficial' package set
-#
-#[unofficial]
-#Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/unofficial
-#Server = ftp://ftp.webtrek.com/pub/mirrors/archlinux/unofficial
-#Server = ftp://ftp.archlinux.org/unofficial
-#Server = ftp://ftp.mpi-sb.mpg.de/pub/linux/mirror/ftp.ibiblio.org/pub/Linux/distributions/archlinux/unofficial
-#Server = ftp://ftp.oit.unc.edu/pub/Linux/distributions/archlinux/unofficial
-#Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/unofficial
-#Server = ftp://ftp.parrswood.net/Mirrors/ftp.archlinux.org/unofficial
-#Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/unofficial
-#Server = ftp://saule.mintis.lt/pub/linux/unofficial
-#Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/unofficial
-
# Uncomment this block to access the 'unstable' package set
#
#[unstable]
+#Server = ftp://ftp.archlinux.org/unstable
#Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/unstable
#Server = ftp://ftp.webtrek.com/pub/mirrors/archlinux/unstable
-#Server = ftp://ftp.archlinux.org/unstable
#Server = ftp://ftp.mpi-sb.mpg.de/pub/linux/mirror/ftp.ibiblio.org/pub/Linux/distributions/archlinux/unstable
#Server = ftp://ftp.oit.unc.edu/pub/Linux/distributions/archlinux/unstable
#Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/unstable
@@ -74,5 +76,5 @@ Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/current
# An example of a custom package repository. See the pacman manpage for
# tips on creating your own repositories.
#[custom]
-#Server = local:///home/custompkgs
+#Server = file:///home/custompkgs