Merge remote-tracking branch 'origin/testing' into testing

2 files changed, 45 insertions, 34 deletions

diff --git a/templates/makepkg.conf b/templates/makepkg.conf
index 7c97813..5526f48 100644
--- a/templates/makepkg.conf
+++ b/templates/makepkg.conf
@@ -96,6 +96,7 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 
 PKGDEST=/data/pkg_repo/packages
 SRCDEST=/data/pkg_repo/sources
+SRCPKGDEST=/data/pkg_repo/src_packages
 PACKAGER="LinHESDev@knoppmyth.net"
 
 #########################################################################
diff --git a/templates/pacman.conf.chroot b/templates/pacman.conf.chroot
index 66ef97d..58857f9 100644
--- a/templates/pacman.conf.chroot
+++ b/templates/pacman.conf.chroot
@@ -15,25 +15,59 @@
 # GENERAL OPTIONS
 #
 [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/modprobe.conf etc/modules.conf
-NoUpgrade   = etc/lilo.conf boot/grub/menu.lst
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+CacheDir    = /data/var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+HoldPkg     = pacman glibc
+# If upgrades are available for these packages they will be asked for first
+SyncFirst   = pacman
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#CleanMethod = KeepInstalled
+Architecture = i686
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
 NoUpgrade   = data/srv/hobbit/etc/bb-hosts
 NoUpgrade   = etc/func/minion.conf
+#NoExtract   =
 
-HoldPkg     = pacman glibc
-CacheDir    = /tmp/dev-pkgcache
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+# Misc options (all disabled by default)
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+#CheckSpace
 
 #
 # REPOSITORIES
 #   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here.
+#   - pacman will search repositories in the order defined here
 #   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
 #
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
 #[core]
 #Server = http://knoppmyth.net/repo/REPLACEME/$repo
 
@@ -48,27 +82,3 @@ Server = http://knoppmyth.net/repo/REPLACEME/$repo
 
 [extra-testing]
 Server = http://knoppmyth.net/repo/REPLACEME/$repo
-
-
-
-
-
-
-########################ARCH DEFAULTS#############
-#[ARCH-core]
-# Add your preferred servers here, they will be used first
-#Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/i686
-
-#[ARCH-extra]
-# Add your preferred servers here, they will be used first
-#Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/i686
-
-#[community]
-# Add your preferred servers here, they will be used first
-#Include = /etc/pacman.d/mirrorlist
-
-# Unstable is disabled by default.  To enable, uncomment the following
-# two lines.  You can add preferred servers immediately after the header,
-# and they will be used before the default mirrors.
-#[unstable]
-#Include = /etc/pacman.d/mirrorlist