pacman-staging-i686.conf, pacman-testing-i686.conf, pacman-staging-with-build-support-i686.conf: reorder repositories and add repo build-support for i686

10 files changed, 134 insertions, 30 deletions

diff --git a/Makefile b/Makefile
index 562788a..aa3eda0 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ GENERATED_CONFIGFILES = \
 	pacman-extra-i686.conf \
 	pacman-testing-i686.conf \
 	pacman-staging-i686.conf \
+	pacman-staging-with-build-support-i686.conf \
 	pacman-kde-unstable-i686.conf \
 	pacman-gnome-unstable-i686.conf \
 	makepkg-i686.conf
@@ -63,6 +64,7 @@ ARCHBUILD_LINKS = \
 	testing-x86_64-build \
 	staging-i686-build \
 	staging-x86_64-build \
+	staging-with-build-support-i686-build \
 	multilib-build \
 	multilib-testing-build \
 	multilib-staging-build \
diff --git a/pacman-extra.conf b/pacman-extra.conf
index 8ea402a..44cc2ee 100644
--- a/pacman-extra.conf
+++ b/pacman-extra.conf
@@ -73,15 +73,15 @@ LocalFileSigLevel = Optional
 #[testing]
 #Include = /etc/pacman.d/mirrorlist
 
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
 [core]
 Include = /etc/pacman.d/mirrorlist
 
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
 [community]
 Include = /etc/pacman.d/mirrorlist
 
diff --git a/pacman-gnome-unstable.conf b/pacman-gnome-unstable.conf
index 315eb44..c8287db 100644
--- a/pacman-gnome-unstable.conf
+++ b/pacman-gnome-unstable.conf
@@ -76,19 +76,19 @@ Include = /etc/pacman.d/mirrorlist
 [staging]
 Include = /etc/pacman.d/mirrorlist
 
-[testing]
+[community-staging]
 Include = /etc/pacman.d/mirrorlist
 
-[core]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community-testing]
 Include = /etc/pacman.d/mirrorlist
 
-[community-staging]
+[core]
 Include = /etc/pacman.d/mirrorlist
 
-[community-testing]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
 [community]
diff --git a/pacman-kde-unstable.conf b/pacman-kde-unstable.conf
index eb722da..1231c52 100644
--- a/pacman-kde-unstable.conf
+++ b/pacman-kde-unstable.conf
@@ -76,13 +76,13 @@ Include = /etc/pacman.d/mirrorlist
 [testing]
 Include = /etc/pacman.d/mirrorlist
 
-[core]
+[community-testing]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[core]
 Include = /etc/pacman.d/mirrorlist
 
-[community-testing]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
 [community]
diff --git a/pacman-multilib-staging.conf b/pacman-multilib-staging.conf
index 7e32aa3..a63c9bf 100644
--- a/pacman-multilib-staging.conf
+++ b/pacman-multilib-staging.conf
@@ -73,19 +73,19 @@ LocalFileSigLevel = Optional
 [staging]
 Include = /etc/pacman.d/mirrorlist
 
-[testing]
+[community-staging]
 Include = /etc/pacman.d/mirrorlist
 
-[core]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community-testing]
 Include = /etc/pacman.d/mirrorlist
 
-[community-staging]
+[core]
 Include = /etc/pacman.d/mirrorlist
 
-[community-testing]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
 [community]
diff --git a/pacman-multilib-testing.conf b/pacman-multilib-testing.conf
index 462552d..3650d24 100644
--- a/pacman-multilib-testing.conf
+++ b/pacman-multilib-testing.conf
@@ -73,13 +73,13 @@ LocalFileSigLevel = Optional
 [testing]
 Include = /etc/pacman.d/mirrorlist
 
-[core]
+[community-testing]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[core]
 Include = /etc/pacman.d/mirrorlist
 
-[community-testing]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
 [community]
diff --git a/pacman-multilib.conf b/pacman-multilib.conf
index b7ef137..91598b2 100644
--- a/pacman-multilib.conf
+++ b/pacman-multilib.conf
@@ -73,15 +73,15 @@ LocalFileSigLevel = Optional
 #[testing]
 #Include = /etc/pacman.d/mirrorlist
 
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
 [core]
 Include = /etc/pacman.d/mirrorlist
 
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
 [community]
 Include = /etc/pacman.d/mirrorlist
 
diff --git a/pacman-staging-with-build-support.conf b/pacman-staging-with-build-support.conf
new file mode 100644
index 0000000..3d2c125
--- /dev/null
+++ b/pacman-staging-with-build-support.conf
@@ -0,0 +1,102 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# 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    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+# We cannot check disk space from within a chroot environment
+#CheckSpace
+#VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# 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
+#   - 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.
+
+[build-support]
+Include = /etc/pacman.d/mirrorlist
+
+[staging]
+Include = /etc/pacman.d/mirrorlist
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist
+
+[testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
+
diff --git a/pacman-staging.conf b/pacman-staging.conf
index 291333b..73236d6 100644
--- a/pacman-staging.conf
+++ b/pacman-staging.conf
@@ -73,19 +73,19 @@ LocalFileSigLevel = Optional
 [staging]
 Include = /etc/pacman.d/mirrorlist
 
-[testing]
+[community-staging]
 Include = /etc/pacman.d/mirrorlist
 
-[core]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community-testing]
 Include = /etc/pacman.d/mirrorlist
 
-[community-staging]
+[core]
 Include = /etc/pacman.d/mirrorlist
 
-[community-testing]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
 [community]
diff --git a/pacman-testing.conf b/pacman-testing.conf
index 8a12d23..2fc65d2 100644
--- a/pacman-testing.conf
+++ b/pacman-testing.conf
@@ -73,13 +73,13 @@ LocalFileSigLevel = Optional
 [testing]
 Include = /etc/pacman.d/mirrorlist
 
-[core]
+[community-testing]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[core]
 Include = /etc/pacman.d/mirrorlist
 
-[community-testing]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
 [community]