summaryrefslogtreecommitdiff
path: root/testing/util-linux
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-07-13 00:01:54 +0000
committerroot <root@rshg054.dnsready.net>2012-07-13 00:01:54 +0000
commit2a74527ad522ac7c1d467688eee81a7a3f895031 (patch)
tree5ce8592b2ac3b6e90fc73039d5ce30aa2a8891dc /testing/util-linux
parent00d32b0938eebfa45f0543cae655abf5233eb99c (diff)
Fri Jul 13 00:01:54 UTC 2012
Diffstat (limited to 'testing/util-linux')
-rw-r--r--testing/util-linux/PKGBUILD10
-rw-r--r--testing/util-linux/util-linux.install8
2 files changed, 11 insertions, 7 deletions
diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD
index 977fba7a2..2dc698974 100644
--- a/testing/util-linux/PKGBUILD
+++ b/testing/util-linux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162814 2012-06-30 21:27:56Z tomegun $
+# $Id: PKGBUILD 163397 2012-07-11 22:26:49Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=util-linux
pkgver=2.21.2
-pkgrel=3
+pkgrel=4
pkgdesc="Miscellaneous system utilities for Linux"
url="http://www.kernel.org/pub/linux/utils/util-linux/"
arch=('i686' 'x86_64')
@@ -18,13 +18,11 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgve
pam-login
pam-common)
backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login)
+install=util-linux.install
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- # hardware clock
- sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
-
./configure --prefix=/usr \
--libdir=/usr/lib \
--enable-fs-paths-extra=/usr/bin:/usr/sbin \
@@ -48,8 +46,6 @@ package() {
cd "${pkgdir}"
- install -dm755 var/lib/hwclock
-
# broken tool, going away in next major release, so just remove it now
rm "${pkgdir}"/usr/{bin/chkdupexe,share/man/man1/chkdupexe.1}
diff --git a/testing/util-linux/util-linux.install b/testing/util-linux/util-linux.install
new file mode 100644
index 000000000..fa27d4555
--- /dev/null
+++ b/testing/util-linux/util-linux.install
@@ -0,0 +1,8 @@
+post_upgrade() {
+ if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then
+ if [ -f /var/lib/hwclock/adjtime ]; then
+ mv /var/lib/hwclock/adjtime /etc/adjtime
+ fi
+ rmdir /var/lib/hwclock
+ fi
+}