From 84fa467f2da787088a7deb1f51eaf7815b3bb35f Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Tue, 2 Aug 2011 22:41:41 +0000 Subject: pacman: Updated pacman.conf and make pacman-db-upgrade run on old db. --- abs/core/pacman/PKGBUILD | 10 ++----- abs/core/pacman/__changelog | 1 + abs/core/pacman/pacman-3.5.3-2.src.tar.gz | 1 + abs/core/pacman/pacman.conf | 48 +++++++++++++++++++++++++++---- abs/core/pacman/pacman.conf.x86_64 | 2 +- abs/core/pacman/pacman.install | 13 +++++++-- 6 files changed, 59 insertions(+), 16 deletions(-) create mode 120000 abs/core/pacman/pacman-3.5.3-2.src.tar.gz diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD index 59ff582..bfaeb67 100644 --- a/abs/core/pacman/PKGBUILD +++ b/abs/core/pacman/PKGBUILD @@ -3,7 +3,7 @@ pkgname=pacman pkgver=3.5.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" @@ -19,10 +19,6 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf pacman.conf.x86_64 makepkg.conf) -md5sums=('b4f1fdbc17100923071ebe8fe9377be5' - 'e99eb721b6b704f68c5f47468507c102' - 'f8b939d9b2beb79a0436961a2d707d7c' - 'a8684989d3dfad5a6e1bcf95af3e571b') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' @@ -70,6 +66,6 @@ package() { # vim: set ts=2 sw=2 et: md5sums=('c36c18ed4d8ec69c0ecb4f9684266901' - '8f7e5462469cfc7520b3aade58ff28de' - 'f8b939d9b2beb79a0436961a2d707d7c' + '161584f2b18e7672b0c47bd6ea5b6133' + 'ae905192b4bf71772173e8abbd53291e' 'a8684989d3dfad5a6e1bcf95af3e571b') diff --git a/abs/core/pacman/__changelog b/abs/core/pacman/__changelog index 4d2a9e3..f028169 100644 --- a/abs/core/pacman/__changelog +++ b/abs/core/pacman/__changelog @@ -1 +1,2 @@ make cache dir /data/var/cache/pacman/pkg +add custom message to post_upgrade() of pacman.install diff --git a/abs/core/pacman/pacman-3.5.3-2.src.tar.gz b/abs/core/pacman/pacman-3.5.3-2.src.tar.gz new file mode 120000 index 0000000..3ed024f --- /dev/null +++ b/abs/core/pacman/pacman-3.5.3-2.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/pacman-3.5.3-2.src.tar.gz \ No newline at end of file diff --git a/abs/core/pacman/pacman.conf b/abs/core/pacman/pacman.conf index ae584e2..d1129a8 100644 --- a/abs/core/pacman/pacman.conf +++ b/abs/core/pacman/pacman.conf @@ -26,6 +26,8 @@ Architecture = auto #IgnoreGroup = #NoUpgrade = +NoUpgrade = data/srv/hobbit/etc/bb-hosts +NoUpgrade = etc/func/minion.conf #NoExtract = # Misc options (all disabled by default) @@ -58,22 +60,56 @@ Architecture = auto # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. +[core] +Server = http://knoppmyth.net/repo/$arch/$repo + +[extra] +Server = http://knoppmyth.net/repo/$arch/$repo + +#[chroot-devel] +#Server = http://knoppmyth.net/repo/$arch/$repo + +#[core-testing] +#Server = http://knoppmyth.net/repo/$arch/$repo + +#[extra-testing] +#Server = http://knoppmyth.net/repo/$arch/$repo + #[testing] #Include = /etc/pacman.d/mirrorlist -[core] -Include = /etc/pacman.d/mirrorlist +#[core] +#Include = /etc/pacman.d/mirrorlist -[extra] -Include = /etc/pacman.d/mirrorlist +#[extra] +#Include = /etc/pacman.d/mirrorlist #[community-testing] #Include = /etc/pacman.d/mirrorlist -[community] -Include = /etc/pacman.d/mirrorlist +#[community] +#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 + +########################ARCH DEFAULTS############# +#[ARCH-core] +# Add your preferred servers here, they will be used first +#Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/i686 + +#[ARCH-extra] +# Add your preferred servers here, they will be used first +#Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/i686 + +#[community] +# Add your preferred servers here, they will be used first +#Include = /etc/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] +#Include = /etc/pacman.d/mirrorlist diff --git a/abs/core/pacman/pacman.conf.x86_64 b/abs/core/pacman/pacman.conf.x86_64 index 6f04236..f76dba2 100644 --- a/abs/core/pacman/pacman.conf.x86_64 +++ b/abs/core/pacman/pacman.conf.x86_64 @@ -12,6 +12,7 @@ #RootDir = / #DBPath = /var/lib/pacman/ #CacheDir = /var/cache/pacman/pkg/ +CacheDir = /data/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 @@ -86,4 +87,3 @@ Include = /etc/pacman.d/mirrorlist # tips on creating your own repositories. #[custom] #Server = file:///home/custompkgs - diff --git a/abs/core/pacman/pacman.install b/abs/core/pacman/pacman.install index b735399..4921fd8 100644 --- a/abs/core/pacman/pacman.install +++ b/abs/core/pacman/pacman.install @@ -9,12 +9,21 @@ post_upgrade() { if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then _warnupgrade fi + echo ">>>" + echo ">>> ATTENTION! ATTENTION! ATTENTION!" + echo ">>> /etc/pacman.conf has changed. If you have customized your" + echo ">>> pacman.conf file, please merge your changes into" + echo ">>> /etc/pacman.conf.pacnew. Backup your old pacman.conf and" + echo ">>> then move pacman.conf.pacnew to pacman.conf" + echo ">>>" } _warnupgrade() { + echo ">>>" echo ">>> The pacman database format has changed as of pacman 3.5.0." - echo ">>> You will need to run \`pacman-db-upgrade\` as root." + echo ">>> I will now run \`pacman-db-upgrade\`. Please wait..." echo ">>>" + /usr/bin/pacman-db-upgrade } _resetbackups() { @@ -59,4 +68,4 @@ _resetbackups() { echo ">>> -> $file is unowned." fi done -} +} -- cgit v0.12