diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
| commit | 70877cfb7e290449b9f9c660e25345f462576c4c (patch) | |
| tree | 0f63651432b8448262549265a5420fff1ab665e8 /core/util-linux | |
| parent | 509bf50c73444930b6f57c42678ec22e7de82c88 (diff) | |
| parent | 412d061bfbf23d1e908eed3f8405b1af46fb1ba8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community-testing/gnash/PKGBUILD
community-testing/performous/PKGBUILD
community/drbd/PKGBUILD
community/oss/PKGBUILD
community/pinot/PKGBUILD
core/glibc/PKGBUILD
core/kmod/PKGBUILD
core/pkg-config/PKGBUILD
core/systemd/PKGBUILD
extra/bitlbee/PKGBUILD
extra/mesa/PKGBUILD
extra/nettle/PKGBUILD
extra/xfce4-netload-plugin/PKGBUILD
kde-unstable/kdepim/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-nettle/PKGBUILD
multilib/lib32-nouveau-dri/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/lib32-readline/PKGBUILD
multilib/zsnes/PKGBUILD
multilib/zsnes/zsnes.patch
testing/cryptsetup/PKGBUILD
testing/ekiga/PKGBUILD
testing/iputils/PKGBUILD
testing/poppler/PKGBUILD
testing/util-linux/PKGBUILD
testing/util-linux/util-linux.install
Diffstat (limited to 'core/util-linux')
| -rw-r--r-- | core/util-linux/PKGBUILD | 10 | ||||
| -rw-r--r-- | core/util-linux/util-linux.install | 10 |
2 files changed, 13 insertions, 7 deletions
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 963879f71..c546f4d57 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162992 2012-07-04 21:44:53Z dreisner $ +# $Id: PKGBUILD 163535 2012-07-15 00:25:36Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.21.2 -pkgrel=3 +pkgrel=5 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64' 'mips64el') @@ -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/core/util-linux/util-linux.install b/core/util-linux/util-linux.install new file mode 100644 index 000000000..90ce5bd73 --- /dev/null +++ b/core/util-linux/util-linux.install @@ -0,0 +1,10 @@ +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 + if [ -d /var/lib/hwclock ]; then + rmdir /var/lib/hwclock + fi + fi +} |