summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/.gitignore2
-rw-r--r--etc/abs/Makefile.am2
-rw-r--r--etc/abs/abs.conf2
-rw-r--r--etc/abs/supfile.core (renamed from etc/abs/supfile.arch)6
-rw-r--r--etc/abs/supfile.testing2
-rw-r--r--etc/makepkg.conf.in8
-rw-r--r--etc/pacman.conf.in12
-rw-r--r--etc/pacman.d/.gitignore9
-rw-r--r--etc/pacman.d/Makefile.am10
-rw-r--r--etc/pacman.d/mirrorlist.in91
10 files changed, 65 insertions, 79 deletions
diff --git a/etc/.gitignore b/etc/.gitignore
index 19f2216d..7c5f1e2b 100644
--- a/etc/.gitignore
+++ b/etc/.gitignore
@@ -1,4 +1,2 @@
-Makefile
-Makefile.in
makepkg.conf
pacman.conf
diff --git a/etc/abs/Makefile.am b/etc/abs/Makefile.am
index 530540e0..b6b64f03 100644
--- a/etc/abs/Makefile.am
+++ b/etc/abs/Makefile.am
@@ -1,7 +1,7 @@
EXTRA_DIST = \
abs.conf \
- supfile.arch \
supfile.community \
+ supfile.core \
supfile.extra \
supfile.testing \
supfile.unstable
diff --git a/etc/abs/abs.conf b/etc/abs/abs.conf
index 66ba5277..782b269b 100644
--- a/etc/abs/abs.conf
+++ b/etc/abs/abs.conf
@@ -9,5 +9,5 @@
# Supfiles to be parsed by abs (in this order)
# (prefix a module with a ! to disable it)
#
-SUPFILES=(arch extra !unstable !community !testing)
+SUPFILES=(core extra !unstable !community !testing)
diff --git a/etc/abs/supfile.arch b/etc/abs/supfile.core
index 4ab4e499..2e052bce 100644
--- a/etc/abs/supfile.arch
+++ b/etc/abs/supfile.core
@@ -1,8 +1,8 @@
#
-# supfile.arch
+# supfile.core
#
-# this is the host containing the current PKGBUILD files
+# this is the host containing the core PKGBUILD files
*default host=cvs.archlinux.org
*default release=cvs
@@ -12,4 +12,4 @@
#*default umask=002
*default tag=CURRENT
-arch
+core
diff --git a/etc/abs/supfile.testing b/etc/abs/supfile.testing
index d2fc6106..70fc6551 100644
--- a/etc/abs/supfile.testing
+++ b/etc/abs/supfile.testing
@@ -12,5 +12,5 @@
#*default umask=002
*default tag=TESTING
-arch
+core
extra
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index 615ad440..d13c3d69 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -27,10 +27,10 @@ CARCH="@CARCH@"
CHOST="@CHOST@"
#-- Exclusive: will only run on @CARCHFLAGS@
-# -mtune builds exclusively for an architecture
-# -mcpu optimizes for an architecture, but builds for the whole processor family
-CFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -mtune=generic -O2 -pipe"
-CXXFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -mtune=generic -O2 -pipe"
+# -march (or -mcpu) builds exclusively for an architecture
+# -mtune optimizes for an architecture, but builds for whole processor family
+CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
+CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
#-- Make Flags: change this for DistCC/SMP systems
#MAKEFLAGS="-j2"
diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index 33ef1814..7a775bfe 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -23,23 +23,23 @@ HoldPkg = pacman glibc
# have identical names, regardless of version number
#
#[testing]
-#Include = @sysconfdir@/pacman.d/testing
+#Include = @sysconfdir@/pacman.d/mirrorlist
-[current]
+[core]
# Add your preferred servers here, they will be used first
-Include = @sysconfdir@/pacman.d/current
+Include = @sysconfdir@/pacman.d/mirrorlist
[extra]
# Add your preferred servers here, they will be used first
-Include = @sysconfdir@/pacman.d/extra
+Include = @sysconfdir@/pacman.d/mirrorlist
[community]
# Add your preferred servers here, they will be used first
-Include = @sysconfdir@/pacman.d/community
+Include = @sysconfdir@/pacman.d/mirrorlist
#[unstable]
# Add your preferred servers here, they will be used first
-#Include = @sysconfdir@/pacman.d/unstable
+#Include = @sysconfdir@/pacman.d/mirrorlist
# An example of a custom package repository. See the pacman manpage for
# tips on creating your own repositories.
diff --git a/etc/pacman.d/.gitignore b/etc/pacman.d/.gitignore
index c7001838..b47959b7 100644
--- a/etc/pacman.d/.gitignore
+++ b/etc/pacman.d/.gitignore
@@ -1,8 +1 @@
-Makefile
-Makefile.in
-community
-current
-extra
-release
-unstable
-testing
+mirrorlist
diff --git a/etc/pacman.d/Makefile.am b/etc/pacman.d/Makefile.am
index 940282dc..e1f33c76 100644
--- a/etc/pacman.d/Makefile.am
+++ b/etc/pacman.d/Makefile.am
@@ -1,5 +1,5 @@
pkgsysconfdir = ${sysconfdir}/pacman.d
-dist_pkgsysconf_DATA = community current extra release testing unstable
+dist_pkgsysconf_DATA = mirrorlist
EXTRA_DIST = mirrorlist.in
#
# Files that should be removed, but which Automake does not know.
@@ -8,16 +8,10 @@ MOSTLYCLEANFILES = $(dist_pkgsysconf_DATA)
$(dist_pkgsysconf_DATA): Makefile
rm -f $@ $@.tmp
sed \
- -e "s|@REPO[@]|$@|g" \
-e 's|@CARCH[@]|$(CARCH)|g' \
$(srcdir)/mirrorlist.in >$@.tmp
mv $@.tmp $@
-community: $(srcdir)/mirrorlist.in
-current: $(srcdir)/mirrorlist.in
-extra: $(srcdir)/mirrorlist.in
-release: $(srcdir)/mirrorlist.in
-testing: $(srcdir)/mirrorlist.in
-unstable: $(srcdir)/mirrorlist.in
+mirrorlist: $(srcdir)/mirrorlist.in
# vim:set ts=2 sw=2 noet:
diff --git a/etc/pacman.d/mirrorlist.in b/etc/pacman.d/mirrorlist.in
index 28895376..1b97a752 100644
--- a/etc/pacman.d/mirrorlist.in
+++ b/etc/pacman.d/mirrorlist.in
@@ -1,82 +1,83 @@
#
-# @REPO@: Arch Linux @REPO@ repository
+# $repo: Arch Linux @REPO@ repository
#
# United States
-Server = ftp://ftp.archlinux.org/@REPO@/os/@CARCH@
-Server = ftp://ftp.nethat.com/pub/linux/archlinux/@REPO@/os/@CARCH@
-Server = ftp://locke.suu.edu/linux/dist/archlinux/@REPO@/os/@CARCH@
-Server = ftp://mirrors.unixheads.org/archlinux/@REPO@/os/@CARCH@
-Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/@REPO@/os/@CARCH@
-Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/@REPO@/os/@CARCH@
-Server = http://mirrors.easynews.com/linux/archlinux/@REPO@/os/@CARCH@
-Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/@REPO@/os/@CARCH@
+Server = ftp://ftp.archlinux.org/$repo/os/@CARCH@
+Server = ftp://ftp.nethat.com/pub/linux/archlinux/$repo/os/@CARCH@
+Server = ftp://locke.suu.edu/linux/dist/archlinux/$repo/os/@CARCH@
+Server = ftp://mirrors.unixheads.org/archlinux/$repo/os/@CARCH@
+Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/$repo/os/@CARCH@
+Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/@CARCH@
+Server = http://mirrors.easynews.com/linux/archlinux/$repo/os/@CARCH@
+Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/@CARCH@
# South America
# - Brazil
-Server = http://archlinux.c3sl.ufpr.br/@REPO@/os/@CARCH@
+Server = http://archlinux.c3sl.ufpr.br/$repo/os/@CARCH@
# Europe
# - Austria
-Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/@REPO@/os/@CARCH@
+Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/@CARCH@
# - Belgium
-Server = ftp://ftp.belnet.be/packages/archlinux/@REPO@/os/@CARCH@
+Server = ftp://ftp.belnet.be/packages/archlinux/$repo/os/@CARCH@
# - Czech Republic
-Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/@REPO@/os/@CARCH@
+Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/@CARCH@
# - Estonia
-Server = ftp://ftp.estpak.ee/pub/archlinux/@REPO@/os/@CARCH@
+Server = ftp://ftp.estpak.ee/pub/archlinux/$repo/os/@CARCH@
# - Finland
-Server = ftp://ftp.sixnix.net/pub/archlinux/@REPO@/os/@CARCH@
+Server = ftp://ftp.sixnix.net/pub/archlinux/$repo/os/@CARCH@
# - France
-Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/@REPO@/os/@CARCH@
-Server = ftp://mir1.archlinuxfr.org/archlinux/@REPO@/os/@CARCH@
-Server = ftp://mir2.archlinuxfr.org/archlinux/@REPO@/os/@CARCH@
-Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/@REPO@/os/@CARCH@
+Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/$repo/os/@CARCH@
+Server = ftp://mir1.archlinuxfr.org/archlinux/$repo/os/@CARCH@
+Server = ftp://mir2.archlinuxfr.org/archlinux/$repo/os/@CARCH@
+Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/$repo/os/@CARCH@
# - Germany
-Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/@REPO@/os/@CARCH@
-Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/@REPO@/os/@CARCH@
-Server = ftp://ftp.archlinuxppc.org/i686/@REPO@/os/@CARCH@
-Server = http://mirror.archlinux.de/@REPO@/os/@CARCH@
+Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/$repo/os/@CARCH@
+Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/@CARCH@
+Server = ftp://ftp.archlinuxppc.org/i686/$repo/os/@CARCH@
# - Great Britain
-Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/@REPO@/os/@CARCH@
+Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/$repo/os/@CARCH@
# - Greece
-Server = ftp://ftp.ntua.gr/pub/linux/archlinux/@REPO@/os/@CARCH@
+Server = ftp://ftp.ntua.gr/pub/linux/archlinux/$repo/os/@CARCH@
# - Ireland
-Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/@REPO@/os/@CARCH@
+Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/@CARCH@
# - Italy
-Server = ftp://mi.mirror.garr.it/mirrors/archlinux/@REPO@/os/@CARCH@
+Server = ftp://mi.mirror.garr.it/mirrors/archlinux/$repo/os/@CARCH@
# - Lithuania
-Server = ftp://saule.mintis.lt/pub/linux/@REPO@/os/@CARCH@
+Server = ftp://saule.mintis.lt/pub/linux/$repo/os/@CARCH@
# - Netherlands
-Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/@REPO@/os/@CARCH@
-Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/@REPO@/os/@CARCH@
+Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/$repo/os/@CARCH@
+Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/$repo/os/@CARCH@
# - Norway
-Server = ftp://mirror.djzradio.net/archlinux/@REPO@/os/@CARCH@
+Server = ftp://mirror.djzradio.net/archlinux/$repo/os/@CARCH@
# - Poland
-Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/@REPO@/os/@CARCH@
-Server = ftp://mirror.icis.pcz.pl/archlinux/@REPO@/os/@CARCH@
+Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/$repo/os/@CARCH@
+Server = ftp://mirror.icis.pcz.pl/archlinux/$repo/os/@CARCH@
# - Portugal
-Server = ftp://gul.est.ips.pt/repos/archlinux/@REPO@/os/@CARCH@
-Server = ftp://cesium.di.uminho.pt/pub/archlinux/@REPO@/os/@CARCH@
-Server = ftp://darkstar.ist.utl.pt/pub/archlinux/@REPO@/os/@CARCH@
+Server = ftp://gul.est.ips.pt/repos/archlinux/$repo/os/@CARCH@
+Server = ftp://cesium.di.uminho.pt/pub/archlinux/$repo/os/@CARCH@
+Server = ftp://darkstar.ist.utl.pt/pub/archlinux/$repo/os/@CARCH@
# - Romania
-Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/@REPO@/os/@CARCH@
+Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/$repo/os/@CARCH@
# - Russia
-Server = http://archlinux.freeside.ru/@REPO@/os/@CARCH@
+Server = http://archlinux.freeside.ru/$repo/os/@CARCH@
+Server = ftp://mirror.yandex.ru/archlinux/$repo/os/@CARCH@
# - Sweden
-Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/@REPO@/os/@CARCH@
-Server = ftp://ftp.gigabit.nu/@REPO@/os/@CARCH@
+Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/$repo/os/@CARCH@
+Server = ftp://ftp.gigabit.nu/$repo/os/@CARCH@
# - Switzerland
-Server = ftp://archlinux.puzzle.ch/@REPO@/os/@CARCH@
+Server = ftp://archlinux.puzzle.ch/$repo/os/@CARCH@
# - Turkey
-Server = ftp://ftp.linux.org.tr/pub/archlinux/@REPO@/os/@CARCH@
+Server = ftp://ftp.linux.org.tr/pub/archlinux/$repo/os/@CARCH@
# - Ukraine
-Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/@REPO@/os/@CARCH@
+Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/@CARCH@
+Server = ftp://hell.org.ua/archlinux/$repo/os/@CARCH@
# Asia
# - Israel
-Server = http://mirror.isoc.org.il/pub/archlinux/@REPO@/os/@CARCH@
+Server = http://mirror.isoc.org.il/pub/archlinux/$repo/os/@CARCH@
# Australia
-Server = ftp://mirror.pacific.net.au/linux/archlinux/@REPO@/os/@CARCH@
+Server = ftp://mirror.pacific.net.au/linux/archlinux/$repo/os/@CARCH@