core/pacman to 3.5.2-1

This commit is contained in:
Kevin Mihelich 2011-05-01 22:46:30 -04:00
parent d923cf24ef
commit 0c2c246402
3 changed files with 100 additions and 13 deletions

View file

@ -1,19 +1,19 @@
# $Id: PKGBUILD 116411 2011-03-23 16:23:20Z dan $
# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
# PlugApps: Kevin Mihelich <kevin@plugapps.com>
# - arch/host/flags for arm
# - arch/host/flags for arm and armv7
# - depend on current versions of libarchive, libfetch, xz to fix upgrade issues
# - pacman.conf: architecture=arm, added our aur repo
# - makepkg.conf: add --no-check-certificate to http wget, adjusted C/CXX/LDFLAGS
plugrel=2
plugrel=1
pkgname=pacman
pkgver=3.5.1
pkgrel=1.${plugrel}
pkgver=3.5.2
pkgrel=1
pkgdesc="A library-based package manager with dependency support"
arch=('arm')
arch=('arm' 'armv7')
url="http://www.archlinux.org/pacman/"
license=('GPL')
groups=('base')
@ -25,9 +25,11 @@ install=pacman.install
options=(!libtool)
source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
pacman.conf
pacman.conf.armv7
makepkg.conf)
md5sums=('6e609a6cf0af2a49a0f8b35fc2459131'
md5sums=('b4f1fdbc17100923071ebe8fe9377be5'
'8a202e08a4e9ffe978c6aa6358e1b640'
'ef58d47ca67b78e597b0698ac2b97987'
'da2e78190c8677e3df4ed9744bc22e7e')
# keep an upgrade path for older installations
@ -46,11 +48,20 @@ package() {
# install Arch specific stuff
mkdir -p $pkgdir/etc
install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
mycarch="arm"
mychost="arm-unknown-linux-gnueabi"
myflags="-march=armv5te "
case "$CARCH" in
arm)
install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
mycarch="arm"
mychost="arm-unknown-linux-gnueabi"
myflags="-march=armv5te "
;;
armv7)
install -m644 $srcdir/pacman.conf.armv7 $pkgdir/etc/pacman.conf
mycarch="armv7"
mychost="armv7l-unknown-linux-gnueabi"
myflags="-march=armv7-a "
;;
esac
install -m644 $srcdir/makepkg.conf $pkgdir/etc/
# set things correctly in the default conf file
sed -i $pkgdir/etc/makepkg.conf \

View file

@ -0,0 +1,77 @@
#
# /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 - -f %u > %o
#CleanMethod = KeepInstalled
Architecture = armv7
# 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
#CheckSpace
#
# 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.
[core]
Include = /etc/pacman.d/mirrorlist
[extra]
Include = /etc/pacman.d/mirrorlist
[community]
Include = /etc/pacman.d/mirrorlist
[aur]
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

View file

@ -15,7 +15,6 @@ _warnupgrade() {
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 ">>>"
echo "!!!!!! SERIOUSLY! Run pacman-db-upgrade or PACMAN WILL NOT WORK! !!!!!!"
}
_resetbackups() {