summaryrefslogtreecommitdiff
path: root/core/util-linux/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'core/util-linux/PKGBUILD')
-rw-r--r--core/util-linux/PKGBUILD47
1 files changed, 24 insertions, 23 deletions
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 26faab001..d0d499374 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,23 +1,21 @@
-# $Id: PKGBUILD 146393 2012-01-10 11:39:59Z tomegun $
+# $Id: PKGBUILD 153482 2012-03-14 23:26:17Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=util-linux
-pkgver=2.20.1
-pkgrel=2
+pkgver=2.21
+pkgrel=5
pkgdesc="Miscellaneous system utilities for Linux"
-url="http://userweb.kernel.org/~kzak/util-linux-ng/"
+url="http://www.kernel.org/pub/linux/utils/util-linux/"
arch=('i686' 'x86_64')
groups=('base')
-depends=('filesystem')
-replaces=('linux32' 'util-linux-ng')
-conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2')
-provides=('linux32' "util-linux-ng=${pkgver}")
+depends=('udev')
+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.bz2)
-source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2
- 0001-findmnt-support-alternative-location-of-fstab.patch)
+source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.xz
+ stable-fixes-2.21.patch)
optdepends=('perl: for chkdupexe support')
build() {
@@ -26,15 +24,13 @@ build() {
# hardware clock
sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
- # backport patch needed for usr support in initramfs
- patch -p1 -i ../0001-findmnt-support-alternative-location-of-fstab.patch
+ patch -p1 -i ../stable-fixes-2.21.patch
- ./configure --enable-arch\
- --enable-write\
- --enable-raw\
- --disable-wall\
- --enable-partx\
- --enable-libmount-mount
+ ./configure --prefix=/usr \
+ --libdir=/usr/lib \
+ --enable-write \
+ --enable-raw \
+ --disable-wall
make
}
@@ -42,9 +38,14 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- install -dm755 "${pkgdir}/var/lib/hwclock"
-
make DESTDIR="${pkgdir}" install
+
+ cd "${pkgdir}"
+
+ install -dm755 var/lib/hwclock
+
+ # delete stray empty dir, fixed upstream
+ rm -r usr/share/man/ru
}
-md5sums=('079b37517fd4e002a2e6e992e8b4e361'
- '823e2d87885b81f245b8c368e28f8cab')
+md5sums=('208aa058f4117759d2939d1be7d662fc'
+ '415b850a4efa9174cd9c34022949f177')