diff options
| -rw-r--r-- | etc/makepkg.conf | 64 | ||||
| -rw-r--r-- | etc/pacman.conf | 59 | ||||
| -rw-r--r-- | lib/libalpm/conflict.c | 4 | ||||
| -rw-r--r-- | lib/libalpm/po/stamp-po | 1 | ||||
| -rw-r--r-- | src/pacman/po/stamp-po | 1 |
5 files changed, 1 insertions, 128 deletions
diff --git a/etc/makepkg.conf b/etc/makepkg.conf deleted file mode 100644 index e97c1f50..00000000 --- a/etc/makepkg.conf +++ /dev/null @@ -1,64 +0,0 @@ -# -# /etc/makepkg.conf -# - -# The FTP/HTTP download utility that makepkg should use to acquire sources -export FTPAGENT="/usr/bin/wget -U makepkg --continue --passive-ftp --tries=3 --waitretry=3 --no-check-certificate" -#export FTPAGENT="/usr/bin/snarf" -#export FTPAGENT="/usr/bin/lftpget -c" - -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) -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="-mcpu=i686 -O2 -pipe" -#export CXXFLAGS="-mcpu=i686 -O2 -pipe" - -# SMP Systems -#export MAKEFLAGS="-j2" - -# Enable fakeroot for building packages as a non-root user -export USE_FAKEROOT="y" - -# Specify a directory for the chroot environment. -export CHROOTDIR="/var/chroot" -# Core package list to be installed in the chroot. -export COREPKGS="core chroot-core devel-core" - -# Enable distributed C/C++/ObjC compiler -# Don't forget to modify MAKEFLAGS to include -jN, where N is twice the -# number of CPUs +1 available -export DISTCC="n" -# Space-separated list of volunteer host specifications. -export DISTCC_HOSTS="" - -# Enable colorized output messages -export USE_COLOR="y" - -# 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, change this. -export PACKAGER="Archlinux (http://archlinux.org)" - -# Don't strip symbols from binaries/libraries -#export NOSTRIP="1" -# Don't prepare documentation -#export NODOCS="1" - -# LOGDIR is the location where you would like to store a -# permanant copy of the build log. -# filename = [LOGDIR_APPEND]-[pkgname]-[pkgver]-[pkgrel] -LOGDIR_APPEND=`date +%Y-%m-%d-%s` -LOGDIR=/var/log/builds - -# The Standard Build Unit of this machine -# If 1, then the build time will be displayed in seconds -# Build the "binutils" package, and then write here the result you got, -# so that makepkg will could the right SBU value for you. -SBU="1" diff --git a/etc/pacman.conf b/etc/pacman.conf deleted file mode 100644 index 72b1eec0..00000000 --- a/etc/pacman.conf +++ /dev/null @@ -1,59 +0,0 @@ -# -# /etc/pacman.conf -# -# NOTE: If you find a mirror that is geographically close to you, please -# move it to the top of the server list, so pacman will choose it -# first. -# -# To re-sort your mirror lists by ping/traceroute results, use the -# /usr/bin/sortmirrors.pl script. It requires the "netselect" package. -# -# # sortmirrors.pl </etc/pacman.conf >pacman.conf.new -# - -# See the pacman manpage for option directives - -# -# GENERAL OPTIONS -# -[options] -LogFile = /var/log/pacman.log -NoUpgrade = etc/passwd etc/group etc/shadow etc/sudoers -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 etc/mkinitrd.conf -HoldPkg = pacman glibc -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here. -# - local/custom mirrors can be added here or in separate files -# - -#[testing] -#Server = ftp://ftp.archlinux.org/testing/os/i686 - -[current] -# Add your preferred servers here, they will be used first -Include = /etc/pacman.d/current - -[extra] -# Add your preferred servers here, they will be used first -Include = /etc/pacman.d/extra - -#[unstable] -# Add your preferred servers here, they will be used first -#Include = /etc/pacman.d/unstable - -[community] -# Add your preferred servers here, they will be used first -Include = /etc/pacman.d/community - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#Server = file:///home/custompkgs - diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 8a11ca31..8cfe0f6e 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -244,10 +244,8 @@ PMList *_alpm_db_find_conflicts(pmdb_t *db, PMList *targets, char *root, PMList } } } - } - /* CHECK 2: check every target against the filesystem */ - for(i = targets; i; i = i->next) { + /* CHECK 2: check every target against the filesystem */ pmpkg_t *p = (pmpkg_t*)i->data; pmpkg_t *dbpkg = NULL; for(j = p->files; j; j = j->next) { diff --git a/lib/libalpm/po/stamp-po b/lib/libalpm/po/stamp-po deleted file mode 100644 index 9788f702..00000000 --- a/lib/libalpm/po/stamp-po +++ /dev/null @@ -1 +0,0 @@ -timestamp diff --git a/src/pacman/po/stamp-po b/src/pacman/po/stamp-po deleted file mode 100644 index 9788f702..00000000 --- a/src/pacman/po/stamp-po +++ /dev/null @@ -1 +0,0 @@ -timestamp |