diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-06 23:38:28 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-06 23:38:28 -0300 |
| commit | 750a8fc982e640e6ef62f80afd99469959f407ad (patch) | |
| tree | cfc482b7afcc4e3502e67578825c439ee296b2d5 /core/util-linux | |
| parent | 2781491d77559e5a9f0e0d26698d91da745f14f3 (diff) | |
| parent | 3d65494a8eda056377febda4642ce992e69a9371 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/kmod/PKGBUILD
multilib/lib32-libpng/PKGBUILD
testing/baobab/PKGBUILD
testing/empathy/PKGBUILD
testing/libgdata/PKGBUILD
testing/telepathy-farstream/PKGBUILD
testing/telepathy-haze/PKGBUILD
Diffstat (limited to 'core/util-linux')
| -rw-r--r-- | core/util-linux/PKGBUILD | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index b0ff4e2e6..a44b32432 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153637 2012-03-16 22:34:40Z tomegun $ +# $Id: PKGBUILD 155728 2012-04-06 00:04:01Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux -pkgver=2.21 -pkgrel=6 +pkgver=2.21.1 +pkgrel=2 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,7 @@ conflicts=('util-linux-ng') provides=("util-linux-ng=${pkgver}") license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.xz - stable-fixes-2.21.patch) +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz) optdepends=('perl: for chkdupexe support') build() { @@ -24,10 +23,9 @@ build() { # hardware clock sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h - patch -p1 -i ../stable-fixes-2.21.patch - ./configure --prefix=/usr \ --libdir=/usr/lib \ + --enable-fs-paths-extra=/usr/bin:/usr/sbin \ --enable-write \ --enable-raw \ --disable-wall \ @@ -36,6 +34,10 @@ build() { make } +check() { + make -C "$pkgname-$pkgver" check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -48,5 +50,4 @@ package() { # delete stray empty dir, fixed upstream rm -r usr/share/man/ru } -md5sums=('208aa058f4117759d2939d1be7d662fc' - '415b850a4efa9174cd9c34022949f177') +md5sums=('ad602dcd528f340b1329cfa6200d8f80') |