diff options
Diffstat (limited to 'etc')
-rw-r--r-- | etc/makepkg.conf | 61 | ||||
-rw-r--r-- | etc/pacman.conf | 6 |
2 files changed, 45 insertions, 22 deletions
diff --git a/etc/makepkg.conf b/etc/makepkg.conf index 081ad038..792d1dac 100644 --- a/etc/makepkg.conf +++ b/etc/makepkg.conf @@ -2,35 +2,58 @@ # /etc/makepkg.conf # -# The FTP/HTTP download utility that makepkg should use to acquire sources -export FTPAGENT="/usr/bin/wget --continue --passive-ftp --tries=3 --waitretry=3" +######################################################################### +# SOURCE ACQUISITION +######################################################################### +# +#-- The FTP/HTTP download utility that makepkg should use to acquire sources +export FTPAGENT="/usr/bin/wget --continue --passive-ftp --tries=3 --waitretry=3 --no-check-certificate" #export FTPAGENT="/usr/bin/snarf" #export FTPAGENT="/usr/bin/lftpget -c" +######################################################################### +# ARCHITECTURE, COMPILE FLAGS +######################################################################### +# export CARCH="i686" export CHOST="i686-pc-linux-gnu" - -# Pentium Pro/Pentium II/Pentium III+/Pentium 4/Athlon exclusive (binaries -# will use the P6 instruction set and only run on P6+ systems) +#-- Exclusive: will only run on i686 or higher (P6, Athlon) 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 CFLAGS="-mtune=i686 -O2 -pipe" -#export CXXFLAGS="-mtune=i686 -O2 -pipe" - -# SMP Systems -#export MAKEFLAGS="-j 2" - -# Enable fakeroot for building packages as a non-root user +#-- Optimized: will run on any x86, but optimized for i686 +#export CFLAGS="-mcpu=i686 -O2 -pipe" +#export CXXFLAGS="-mcpu=i686 -O2 -pipe" +#-- Make Flags: change this for DistCC/SMP systems +#export MAKEFLAGS="-j2" + +######################################################################### +# BUILD ENVIRONMENT +######################################################################### +# +#-- Fakeroot: for building packages as a non-root user export USE_FAKEROOT="y" - -# Enable colorized output messages +#-- DistCC: a distributed C/C++/ObjC compiler (modify MAKEFLAGS too) +export DISTCC="n" +#-- A space-delimited list of hosts running in the DistCC cluster +export DISTCC_HOSTS="" +#-- Colorized output messages export USE_COLOR="y" -# Specify a fixed directory where all packages will be placed +######################################################################### +# GLOBAL PACKAGE OPTIONS +######################################################################### +# +#-- Don't strip symbols from binaries/libraries +#export NOSTRIP="1" +#-- Keep doc and info directories +#export KEEPDOCS="1" + +######################################################################### +# PACKAGE OUTPUT +######################################################################### +# +#-- Destination: specify a fixed directory where all packages will be placed #export PKGDEST=/home/packages - -# If you want your name to show up in the packages you build, set this. +#-- Packager: name/email of the person or organization building packages #export PACKAGER="John Doe <john@doe.com>" diff --git a/etc/pacman.conf b/etc/pacman.conf index 42578338..345eb8c1 100644 --- a/etc/pacman.conf +++ b/etc/pacman.conf @@ -19,10 +19,10 @@ [options] LogFile = /var/log/pacman.log NoUpgrade = etc/passwd etc/group etc/shadow etc/sudoers -NoUpgrade = etc/fstab etc/raidtab etc/ld.so.conf -NoUpgrade = etc/rc.conf etc/rc.local +NoUpgrade = etc/fstab etc/raidtab etc/mdadm.conf etc/ld.so.conf +NoUpgrade = etc/inittab etc/rc.conf etc/rc.local NoUpgrade = etc/modprobe.conf etc/modules.conf -NoUpgrade = etc/lilo.conf boot/grub/menu.lst +NoUpgrade = etc/lilo.conf boot/grub/menu.lst etc/mkinitrd.conf HoldPkg = pacman glibc #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u |