From 05346af459c7eaeddf1542acb6f13f8ffd9f6695 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 16 Sep 2007 21:20:19 +0000 Subject: Make current -> core updates --- etc/abs/Makefile.am | 2 +- etc/abs/abs.conf | 2 +- etc/abs/supfile.arch | 15 --------------- etc/abs/supfile.core | 15 +++++++++++++++ etc/pacman.conf.in | 4 ++-- etc/pacman.d/Makefile.am | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 etc/abs/supfile.arch create mode 100644 etc/abs/supfile.core (limited to 'etc') diff --git a/etc/abs/Makefile.am b/etc/abs/Makefile.am index 69727e91..1c10d0b7 100644 --- a/etc/abs/Makefile.am +++ b/etc/abs/Makefile.am @@ -1,6 +1,6 @@ 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.arch deleted file mode 100644 index e23a785d..00000000 --- a/etc/abs/supfile.arch +++ /dev/null @@ -1,15 +0,0 @@ -# -# /etc/abs/supfile.arch -# - -# this is the host containing the current PKGBUILD files -*default host=cvs.archlinux.org - -*default release=cvs -*default delete -*default use-rel-suffix -*default compress -#*default umask=002 - -*default tag=CURRENT -arch diff --git a/etc/abs/supfile.core b/etc/abs/supfile.core new file mode 100644 index 00000000..1d34b69c --- /dev/null +++ b/etc/abs/supfile.core @@ -0,0 +1,15 @@ +# +# /etc/abs/supfile.arch +# + +# this is the host containing the core PKGBUILD files +*default host=cvs.archlinux.org + +*default release=cvs +*default delete +*default use-rel-suffix +*default compress +#*default umask=002 + +*default tag=CURRENT +core diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 56b1f833..f76c2acf 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -22,9 +22,9 @@ HoldPkg = pacman glibc #[testing] #Include = /etc/pacman.d/testing -[current] +[core] # Add your preferred servers here, they will be used first -Include = /etc/pacman.d/current +Include = /etc/pacman.d/core [extra] # Add your preferred servers here, they will be used first diff --git a/etc/pacman.d/Makefile.am b/etc/pacman.d/Makefile.am index c8dded4b..341b3efa 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 = community core extra release testing unstable $(dist_pkgsysconf_DATA): mirrorlist sed "s|@@REPO@@|$@|g" <$< >$@ -- cgit v1.2.3-70-g09d2