diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | archbuild | 8 | ||||
| -rwxr-xr-x | commitpkg | 3 | ||||
| -rw-r--r-- | pacman-extra.conf | 5 | ||||
| -rw-r--r-- | pacman-multilib-testing.conf | 87 | ||||
| -rw-r--r-- | pacman-multilib.conf | 8 | ||||
| -rw-r--r-- | pacman-staging.conf | 7 | ||||
| -rw-r--r-- | pacman-testing.conf | 5 |
8 files changed, 101 insertions, 28 deletions
@@ -15,6 +15,7 @@ install: ln -sf commitpkg $(DESTDIR)/usr/bin/community-testingpkg ln -sf commitpkg $(DESTDIR)/usr/bin/community-stagingpkg ln -sf commitpkg $(DESTDIR)/usr/bin/multilibpkg + ln -sf commitpkg $(DESTDIR)/usr/bin/multilib-testingpkg # arch{co,release,rm} install -m 755 archco $(DESTDIR)/usr/bin install -m 755 communityco $(DESTDIR)/usr/bin @@ -32,6 +33,7 @@ install: ln -sf archbuild $(DESTDIR)/usr/bin/staging-i686-build ln -sf archbuild $(DESTDIR)/usr/bin/staging-x86_64-build ln -sf archbuild $(DESTDIR)/usr/bin/multilib-build + ln -sf archbuild $(DESTDIR)/usr/bin/multilib-testing-build # Additional packaging helper scripts install -m 755 lddd $(DESTDIR)/usr/bin install -m 755 finddeps $(DESTDIR)/usr/bin @@ -44,6 +46,7 @@ install: install -m 644 pacman-testing.conf $(DESTDIR)/usr/share/devtools install -m 644 pacman-staging.conf $(DESTDIR)/usr/share/devtools install -m 644 pacman-multilib.conf $(DESTDIR)/usr/share/devtools + install -m 644 pacman-multilib-testing.conf $(DESTDIR)/usr/share/devtools uninstall: # remove all files we installed @@ -57,6 +60,7 @@ uninstall: rm $(DESTDIR)/usr/bin/community-testingpkg rm $(DESTDIR)/usr/bin/community-stagingpkg rm $(DESTDIR)/usr/bin/multilibpkg + rm $(DESTDIR)/usr/bin/multilib-testingpkg rm $(DESTDIR)/usr/sbin/mkarchroot rm $(DESTDIR)/usr/sbin/makechrootpkg rm $(DESTDIR)/usr/bin/extra-i686-build @@ -66,6 +70,7 @@ uninstall: rm $(DESTDIR)/usr/bin/staging-i686-build rm $(DESTDIR)/usr/bin/staging-x86_64-build rm $(DESTDIR)/usr/bin/multilib-build + rm $(DESTDIR)/usr/bin/multilib-testing-build rm $(DESTDIR)/usr/bin/lddd rm $(DESTDIR)/usr/bin/finddeps rm $(DESTDIR)/usr/bin/archco @@ -79,6 +84,7 @@ uninstall: rm $(DESTDIR)/usr/share/devtools/pacman-testing.conf rm $(DESTDIR)/usr/share/devtools/pacman-staging.conf rm $(DESTDIR)/usr/share/devtools/pacman-multilib.conf + rm $(DESTDIR)/usr/share/devtools/pacman-multilib-testing.conf dist: git archive --format=tar --prefix=devtools-$(V)/ $(V) | gzip -9 > devtools-$(V).tar.gz @@ -4,6 +4,9 @@ cmd="$(basename "${0%-build}")" if [ "${cmd}" == 'multilib' ]; then repo='multilib' arch='x86_64' +elif [ "${cmd}" == 'multilib-testing' ]; then + repo='multilib-testing' + arch='x86_64' else repo=${cmd%-*} arch=${cmd#*-} @@ -31,11 +34,6 @@ if [ "$(uname -m)" == 'i686' -a "${arch}" != 'i686' ]; then exit 1 fi -if [ "$(uname -m)" != 'x86_64' -a "${repo}" == 'multilib' ]; then - echo 'You can only build multilib packages on a x86_64 system' - exit 1 -fi - if ${clean_first} || [ ! -d "${chroots}/${repo}-${arch}" ]; then echo "Creating chroot for [${repo}] (${arch})..." sudo rm -rf ${chroots}/${repo}-${arch} @@ -60,6 +60,9 @@ elif [ "$cmd" == 'community-stagingpkg' ]; then elif [ "$cmd" == 'multilibpkg' ]; then repo='multilib' server='aur.archlinux.org' +elif [ "$cmd" == 'multilib-testingpkg' ]; then + repo='multilib-testing' + server='aur.archlinux.org' else if [ $# -eq 0 ]; then abort 'usage: commitpkg <reponame> [-l limit] [commit message]' diff --git a/pacman-extra.conf b/pacman-extra.conf index 911c23d..3a5d875 100644 --- a/pacman-extra.conf +++ b/pacman-extra.conf @@ -58,23 +58,18 @@ Architecture = auto # after the header, and they will be used before the default mirrors. #[testing] -## Add your preferred servers here, they will be used first #Include = /etc/pacman.d/mirrorlist [core] -# Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist [extra] -# Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist #[community-testing] -## Add your preferred servers here, they will be used first #Include = /etc/pacman.d/mirrorlist [community] -# Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for diff --git a/pacman-multilib-testing.conf b/pacman-multilib-testing.conf new file mode 100644 index 0000000..24ff10c --- /dev/null +++ b/pacman-multilib-testing.conf @@ -0,0 +1,87 @@ +# +# /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 +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 - %u > %o +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options (all disabled by default) +#UseSyslog +#ShowSize +#UseDelta +#TotalDownload + +# +# 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. + +[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 + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repository here. +[multilib-testing] +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/pacman-multilib.conf b/pacman-multilib.conf index 7e0f1d7..eb8376a 100644 --- a/pacman-multilib.conf +++ b/pacman-multilib.conf @@ -58,27 +58,23 @@ Architecture = auto # after the header, and they will be used before the default mirrors. #[testing] -## Add your preferred servers here, they will be used first #Include = /etc/pacman.d/mirrorlist [core] -# Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist [extra] -# Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist #[community-testing] -## Add your preferred servers here, they will be used first #Include = /etc/pacman.d/mirrorlist [community] -# Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repository here. [multilib] -# Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for diff --git a/pacman-staging.conf b/pacman-staging.conf index 14323d5..f015e63 100644 --- a/pacman-staging.conf +++ b/pacman-staging.conf @@ -58,31 +58,24 @@ Architecture = auto # after the header, and they will be used before the default mirrors. [staging] -## Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist [testing] -## Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist [core] -# Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist [extra] -# Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist [community-staging] -## Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist [community-testing] -## Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist [community] -# Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for diff --git a/pacman-testing.conf b/pacman-testing.conf index 048e4f7..910e0bc 100644 --- a/pacman-testing.conf +++ b/pacman-testing.conf @@ -58,23 +58,18 @@ Architecture = auto # after the header, and they will be used before the default mirrors. [testing] -## Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist [core] -# Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist [extra] -# Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist [community-testing] -## Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist [community] -# Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for |