etc: remove Arch-specific mirrorlist from repo
We shouldn't have the stock config be Arch specific for a few reasons: * Although it is our package, others should be able to use it * Keeping the mirrorlist coupled to the pacman package makes it hard to push updates to users without releasing a new copy of the pacman source Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee
parent
9a18e0dbef
commit
a0ac72b422
@ -1,5 +1,3 @@
|
||||
SUBDIRS = pacman.d
|
||||
|
||||
dist_sysconf_DATA = makepkg.conf pacman.conf
|
||||
EXTRA_DIST = makepkg.conf.in pacman.conf.in
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# @sysconfdir@/pacman.conf
|
||||
#
|
||||
# See the pacman manpage for option directives
|
||||
# See the pacman.conf(5) manpage for option and repository directives
|
||||
|
||||
#
|
||||
# GENERAL OPTIONS
|
||||
@ -23,6 +23,7 @@ HoldPkg = pacman glibc
|
||||
# - 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
|
||||
#
|
||||
# Repository entries are of the format:
|
||||
# [repo-name]
|
||||
@ -33,28 +34,13 @@ HoldPkg = pacman glibc
|
||||
# uncommented to enable the repo.
|
||||
#
|
||||
|
||||
# Testing is disabled by default. To enable, uncomment the following
|
||||
# two lines. You can add preferred servers immediately after the header,
|
||||
# and they will be used before the default mirrors.
|
||||
#[testing]
|
||||
#Include = @sysconfdir@/pacman.d/mirrorlist
|
||||
|
||||
[core]
|
||||
# Add your preferred servers here, they will be used first
|
||||
Include = @sysconfdir@/pacman.d/mirrorlist
|
||||
|
||||
[extra]
|
||||
# Add your preferred servers here, they will be used first
|
||||
Include = @sysconfdir@/pacman.d/mirrorlist
|
||||
|
||||
[community]
|
||||
# Add your preferred servers here, they will be used first
|
||||
Include = @sysconfdir@/pacman.d/mirrorlist
|
||||
|
||||
# Unstable is disabled by default. To enable, uncomment the following
|
||||
# two lines. You can add preferred servers immediately after the header,
|
||||
# and they will be used before the default mirrors.
|
||||
#[unstable]
|
||||
# An example of a disabled remote package repository with multiple servers
|
||||
# available. To enable, uncomment the following lines. You can add preferred
|
||||
# servers immediately after the header and they will be used before the
|
||||
# default mirrors.
|
||||
#[core]
|
||||
#Server = ftp://ftp.example.com/foobar/$repo/os/i686/
|
||||
# The file referenced here should contain a list of 'Server = ' lines.
|
||||
#Include = @sysconfdir@/pacman.d/mirrorlist
|
||||
|
||||
# An example of a custom package repository. See the pacman manpage for
|
||||
|
||||
1
etc/pacman.d/.gitignore
vendored
1
etc/pacman.d/.gitignore
vendored
@ -1 +0,0 @@
|
||||
mirrorlist
|
||||
@ -1,17 +0,0 @@
|
||||
pkgsysconfdir = ${sysconfdir}/pacman.d
|
||||
dist_pkgsysconf_DATA = mirrorlist
|
||||
EXTRA_DIST = mirrorlist.in
|
||||
#
|
||||
# Files that should be removed, but which Automake does not know.
|
||||
MOSTLYCLEANFILES = $(dist_pkgsysconf_DATA)
|
||||
|
||||
$(dist_pkgsysconf_DATA): Makefile
|
||||
rm -f $@ $@.tmp
|
||||
sed \
|
||||
-e 's|@CARCH[@]|$(CARCH)|g' \
|
||||
$(srcdir)/mirrorlist.in >$@.tmp
|
||||
mv $@.tmp $@
|
||||
|
||||
mirrorlist: $(srcdir)/mirrorlist.in
|
||||
|
||||
# vim:set ts=2 sw=2 noet:
|
||||
@ -1,86 +0,0 @@
|
||||
#
|
||||
# $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 = http://holmes.umflint.edu/archlinux/$repo/os/@CARCH@
|
||||
|
||||
# South America
|
||||
# - Brazil
|
||||
Server = http://archlinux.c3sl.ufpr.br/$repo/os/@CARCH@
|
||||
Server = ftp://archlinux.c3sl.ufpr.br/archlinux/$repo/os/@CARCH@
|
||||
|
||||
# Europe
|
||||
# - Austria
|
||||
Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/@CARCH@
|
||||
# - Belgium
|
||||
Server = ftp://ftp.belnet.be/mirror/archlinux.org/$repo/os/@CARCH@
|
||||
# - Czech Republic
|
||||
Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/@CARCH@
|
||||
# - Estonia
|
||||
Server = ftp://ftp.estpak.ee/pub/archlinux/$repo/os/@CARCH@
|
||||
# - Finland
|
||||
Server = ftp://ftp.sixnix.net/pub/archlinux/$repo/os/@CARCH@
|
||||
# - France
|
||||
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 = http://mir.archlinux.fr/$repo/os/@CARCH@
|
||||
Server = ftp://ftp.free.fr/mirrors/ftp.archlinux.org/$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@
|
||||
# - Great Britain
|
||||
Server = http://www.mirrorservice.org/sites/ftp.archlinux.org/$repo/os/@CARCH@
|
||||
# - Greece
|
||||
Server = ftp://ftp.ntua.gr/pub/linux/archlinux/$repo/os/@CARCH@
|
||||
# - Hungary
|
||||
Server = ftp://ftp.mfa.kfki.hu/pub/mirrors/ftp.archlinux.org/$repo/os/@CARCH@
|
||||
# - Ireland
|
||||
Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/@CARCH@
|
||||
# - Italy
|
||||
Server = ftp://mi.mirror.garr.it/mirrors/archlinux/$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@
|
||||
# - Poland
|
||||
Server = ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/archlinux/$repo/os/@CARCH@
|
||||
Server = ftp://mirror.icis.pcz.pl/archlinux/$repo/os/@CARCH@
|
||||
Server = http://piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/@CARCH@
|
||||
Server = ftp://ftp.piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/@CARCH@
|
||||
# - Portugal
|
||||
Server = ftp://cesium.di.uminho.pt/pub/archlinux/$repo/os/@CARCH@
|
||||
# - Romania
|
||||
Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/$repo/os/@CARCH@
|
||||
# - Russia
|
||||
Server = ftp://archlinux.org.ru/pub/archlinux/$repo/os/@CARCH@
|
||||
Server = ftp://mirror.yandex.ru/archlinux/$repo/os/@CARCH@
|
||||
Server = http://archlinux.freeside.ru/$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@
|
||||
# - Switzerland
|
||||
Server = ftp://archlinux.puzzle.ch/$repo/os/@CARCH@
|
||||
# - Turkey
|
||||
Server = http://server.elsistech.com/archlinux/$repo/os/@CARCH@
|
||||
# - Ukraine
|
||||
Server = ftp://hell.org.ua/archlinux/$repo/os/@CARCH@
|
||||
Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/@CARCH@
|
||||
|
||||
# Asia
|
||||
# - Israel
|
||||
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.aarnet.edu.au/pub/archlinux/$repo/os/@CARCH@
|
||||
|
||||
Loading…
Reference in New Issue
Block a user