diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | config/pacman/extra.conf | 6 | ||||
| -rw-r--r-- | config/pacman/gnome-unstable.conf | 6 | ||||
| -rw-r--r-- | config/pacman/kde-unstable.conf | 6 | ||||
| -rw-r--r-- | config/pacman/multilib-staging.conf | 10 | ||||
| -rw-r--r-- | config/pacman/multilib-testing.conf | 6 | ||||
| -rw-r--r-- | config/pacman/multilib.conf | 6 | ||||
| -rw-r--r-- | config/pacman/staging-with-build-support.conf | 102 | ||||
| -rw-r--r-- | config/pacman/staging.conf | 10 | ||||
| -rw-r--r-- | config/pacman/testing.conf | 6 |
10 files changed, 132 insertions, 28 deletions
@@ -16,6 +16,7 @@ GENERATED_CONFIGS = \ 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 @@ -44,6 +45,7 @@ ARCHBUILD_LINKS = \ staging-i686-build \ staging-x86_64-build \ staging-x86_64_v3-build \ + staging-with-build-support-i686-build \ multilib-build \ multilib-testing-build \ multilib-staging-build \ diff --git a/config/pacman/extra.conf b/config/pacman/extra.conf index 768c96d..e855f3c 100644 --- a/config/pacman/extra.conf +++ b/config/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/config/pacman/gnome-unstable.conf b/config/pacman/gnome-unstable.conf index 93ce01b..d7ae13b 100644 --- a/config/pacman/gnome-unstable.conf +++ b/config/pacman/gnome-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/config/pacman/kde-unstable.conf b/config/pacman/kde-unstable.conf index 7308b61..6e6bfd8 100644 --- a/config/pacman/kde-unstable.conf +++ b/config/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/config/pacman/multilib-staging.conf b/config/pacman/multilib-staging.conf index be04ea2..5b300c0 100644 --- a/config/pacman/multilib-staging.conf +++ b/config/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/config/pacman/multilib-testing.conf b/config/pacman/multilib-testing.conf index b7fcf71..db5b9cc 100644 --- a/config/pacman/multilib-testing.conf +++ b/config/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/config/pacman/multilib.conf b/config/pacman/multilib.conf index 9f1906c..1707f94 100644 --- a/config/pacman/multilib.conf +++ b/config/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/config/pacman/staging-with-build-support.conf b/config/pacman/staging-with-build-support.conf new file mode 100644 index 0000000..3d2c125 --- /dev/null +++ b/config/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/config/pacman/staging.conf b/config/pacman/staging.conf index 666d94d..321a4e8 100644 --- a/config/pacman/staging.conf +++ b/config/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/config/pacman/testing.conf b/config/pacman/testing.conf index 79fcaa1..bf9003c 100644 --- a/config/pacman/testing.conf +++ b/config/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] |