From 90a5e441cd1d64b001588162edbe8ea2be375f43 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz <pierre@archlinux.de> Date: Sat, 14 Jan 2012 20:22:26 +0100 Subject: [PATCH] Add support for multilib-staging --- Makefile | 5 +- pacman-multilib-staging.conf | 113 +++++++++++++++++++++++++++++++++++ zsh_completion.in | 3 +- 3 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 pacman-multilib-staging.conf diff --git a/Makefile b/Makefile index 2de7c5c..cc33819 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=20111220 +V=20110114 PREFIX = /usr/local @@ -26,6 +26,7 @@ CONFIGFILES = \ pacman-staging.conf \ pacman-multilib.conf \ pacman-multilib-testing.conf \ + pacman-multilib-staging.conf \ pacman-kde-unstable.conf \ pacman-gnome-unstable.conf @@ -39,6 +40,7 @@ COMMITPKG_LINKS = \ community-stagingpkg \ multilibpkg \ multilib-testingpkg \ + multilib-stagingpkg \ kde-unstablepkg \ gnome-unstablepkg @@ -51,6 +53,7 @@ ARCHBUILD_LINKS = \ staging-x86_64-build \ multilib-build \ multilib-testing-build \ + multilib-staging-build \ kde-unstable-i686-build \ kde-unstable-x86_64-build \ gnome-unstable-i686-build \ diff --git a/pacman-multilib-staging.conf b/pacman-multilib-staging.conf new file mode 100644 index 0000000..1e9cfd5 --- /dev/null +++ b/pacman-multilib-staging.conf @@ -0,0 +1,113 @@ +# +# /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/ +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#UseDelta +#TotalDownload +# We cannot check disk space from within a chroot environment +#CheckSpace +#VerbosePkgLists + +# PGP signature checking +# NOTE: None of this will work without running `pacman-key --init` first. +# The compiled in default is equivalent to the following line. This requires +# you to locally sign and trust packager keys using `pacman-key` for them to be +# considered valid. +#SigLevel = Optional TrustedOnly +# If you wish to check signatures but avoid local sign and trust issues, use +# the following line. This will treat any key imported into pacman's keyring as +# trusted. +#SigLevel = Optional TrustAll +# Disable signature checks for now +SigLevel = Never + +# +# 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. + +[staging] +Include = /etc/pacman.d/mirrorlist + +[testing] +Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +[community-staging] +Include = /etc/pacman.d/mirrorlist + +[community-testing] +Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repository here. +[multilib-staging] +Include = /etc/pacman.d/mirrorlist + +[multilib-testing] +#SigLevel = Optional TrustAll +Include = /etc/pacman.d/mirrorlist + +[multilib] +Include = /etc/pacman.d/mirrorlist + +# 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/zsh_completion.in b/zsh_completion.in index cbeed74..90ad398 100644 --- a/zsh_completion.in +++ b/zsh_completion.in @@ -1,4 +1,4 @@ -#compdef archbuild archco archrelease archrm commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-i686-build=archbuild extra-x86_64-build=archbuild testing-i686-build=archbuild testing-x86_64-build=archbuild staging-i686-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild kde-unstable-i686-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-i686-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco +#compdef archbuild archco archrelease archrm commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-i686-build=archbuild extra-x86_64-build=archbuild testing-i686-build=archbuild testing-x86_64-build=archbuild staging-i686-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-i686-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-i686-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco _arch=(i686 x86_64 any) @@ -9,6 +9,7 @@ _tags=( staging-i686 staging-x86_64 staging-any testing-i686 testing-x86_64 testing-any multilib-testing-i686 multilib-testing-x86_64 multilib-testing-any + multilib-staging-i686 multilib-staging-x86_64 multilib-staging-any community-i686 community-x86_64 community-any community-staging-i686 community-staging-x86_64 community-staging-any community-testing-i686 community-testing-x86_64 community-testing-any -- GitLab