Date: Thursday, January 19, 2012 @ 11:00:21 Author: tomegun Revision: 146952
2.21-rc1 Modified: util-linux/trunk/PKGBUILD Deleted: util-linux/trunk/0001-findmnt-support-alternative-location-of-fstab.patch ----------------------------------------------------------+ 0001-findmnt-support-alternative-location-of-fstab.patch | 77 ------------- PKGBUILD | 31 +---- 2 files changed, 11 insertions(+), 97 deletions(-) Deleted: 0001-findmnt-support-alternative-location-of-fstab.patch =================================================================== --- 0001-findmnt-support-alternative-location-of-fstab.patch 2012-01-19 15:49:41 UTC (rev 146951) +++ 0001-findmnt-support-alternative-location-of-fstab.patch 2012-01-19 16:00:21 UTC (rev 146952) @@ -1,77 +0,0 @@ -From d466c6a1fe66603227b3ff73a21a45abd77ee826 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <[email protected]> -Date: Sun, 11 Dec 2011 13:58:05 -0500 -Subject: [PATCH] findmnt: support alternative location of fstab - -Signed-off-by: Dave Reisner <[email protected]> -Signed-off-by: Karel Zak <[email protected]> ---- - misc-utils/findmnt.8 | 6 ++++-- - misc-utils/findmnt.c | 9 +++++---- - 2 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8 -index 24e3a52..7f3dc6c 100644 ---- a/misc-utils/findmnt.8 -+++ b/misc-utils/findmnt.8 -@@ -36,12 +36,14 @@ The command prints all mounted filesystems in the tree-like format by default. - .SH OPTIONS - .IP "\fB\-h, \-\-help\fP" - Print help and exit. --.IP "\fB\-s, \-\-fstab\fP" -+.IP "\fB\-s, \-\-fstab\fR[\fI=fstab\fR]\fP" - Search in - .IR /etc/fstab - and - .IR /etc/fstab.d . --The output is in the list format (see --list). -+The output is in the list format (see --list). Optionally, search the file -+specified by -+.IR fstab . - .IP "\fB\-m, \-\-mtab\fP" - Search in - .IR /etc/mtab . -diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c -index 4577dc6..5502a87 100644 ---- a/misc-utils/findmnt.c -+++ b/misc-utils/findmnt.c -@@ -770,7 +770,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out) - - fprintf(out, _( - "\nOptions:\n" -- " -s, --fstab search in static table of filesystems\n" -+ " -s, --fstab[=<fstab>] search in static table of filesystems\n" - " -m, --mtab search in table of mounted filesystems\n" - " -k, --kernel search in kernel table of mounted\n" - " filesystems (default)\n\n")); -@@ -839,7 +839,7 @@ int main(int argc, char *argv[]) - { "direction", 1, 0, 'd' }, - { "evaluate", 0, 0, 'e' }, - { "first-only", 0, 0, 'f' }, -- { "fstab", 0, 0, 's' }, -+ { "fstab", 2, 0, 's' }, - { "help", 0, 0, 'h' }, - { "invert", 0, 0, 'i' }, - { "kernel", 0, 0, 'k' }, -@@ -872,7 +872,8 @@ int main(int argc, char *argv[]) - tt_flags |= TT_FL_TREE; - - while ((c = getopt_long(argc, argv, -- "acd:ehifo:O:p::Pklmnrst:uvRS:T:w:", longopts, NULL)) != -1) { -+ "acd:ehifo:O:p::Pklmnrs::t:uvRS:T:w:", -+ longopts, NULL)) != -1) { - switch(c) { - case 'a': - tt_flags |= TT_FL_ASCII; -@@ -938,7 +939,7 @@ int main(int argc, char *argv[]) - case 's': /* fstab */ - if (tabfile) - errx_mutually_exclusive("--{fstab,mtab,kernel}"); -- tabfile = _PATH_MNTTAB; -+ tabfile = optarg ? optarg : _PATH_MNTTAB; - tt_flags &= ~TT_FL_TREE; - break; - case 'k': /* kernel (mountinfo) */ --- -1.7.8.1 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-01-19 15:49:41 UTC (rev 146951) +++ PKGBUILD 2012-01-19 16:00:21 UTC (rev 146952) @@ -3,48 +3,39 @@ # Contributor: judd <[email protected]> pkgname=util-linux -pkgver=2.20.1 -pkgrel=2 +pkgver=2.21 +pkgrel=0.1 pkgdesc="Miscellaneous system utilities for Linux" url="http://userweb.kernel.org/~kzak/util-linux-ng/"; 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}-rc1.tar.xz) optdepends=('perl: for chkdupexe support') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}-rc1" # 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 - - ./configure --enable-arch\ - --enable-write\ + ./configure --enable-write\ --enable-raw\ --disable-wall\ - --enable-partx\ - --enable-libmount-mount + --enable-new-mount make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}-rc1" install -dm755 "${pkgdir}/var/lib/hwclock" make DESTDIR="${pkgdir}" install } -md5sums=('079b37517fd4e002a2e6e992e8b4e361' - '823e2d87885b81f245b8c368e28f8cab') +md5sums=('bbfefcb74a47d517a37d0668c38de2d4')
