From 87c7d824d3934c293619be5d460b80bbee44cd36 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 23 Oct 2012 16:49:53 +0000 Subject: [PATCH] util-linux: updated to 2.22.1 and aligned with upstream --- util-linux-ng/.md5sum | 1 - {util-linux-ng => util-linux}/.footprint | 18 +++++++++++++++--- util-linux/.md5sum | 1 + {util-linux-ng => util-linux}/Pkgfile | 13 +++++++------ 4 files changed, 23 insertions(+), 10 deletions(-) delete mode 100644 util-linux-ng/.md5sum rename {util-linux-ng => util-linux}/.footprint (93%) create mode 100644 util-linux/.md5sum rename {util-linux-ng => util-linux}/Pkgfile (70%) diff --git a/util-linux-ng/.md5sum b/util-linux-ng/.md5sum deleted file mode 100644 index e062ac0..0000000 --- a/util-linux-ng/.md5sum +++ /dev/null @@ -1 +0,0 @@ -54ba880f1d66782c2287ee2c898520e9 util-linux-2.21.2.tar.xz diff --git a/util-linux-ng/.footprint b/util-linux/.footprint similarity index 93% rename from util-linux-ng/.footprint rename to util-linux/.footprint index f8651a3..829ee62 100644 --- a/util-linux-ng/.footprint +++ b/util-linux/.footprint @@ -5,7 +5,9 @@ drwxr-xr-x root/root bin/ -rwxr-xr-x root/root bin/lsblk -rwxr-xr-x root/root bin/more -rwsr-xr-x root/root bin/mount +-rwxr-xr-x root/root bin/mountpoint -rwsr-xr-x root/root bin/umount +-rwxr-xr-x root/root bin/wdctl drwxr-xr-x root/root etc/ -rw-r--r-- root/root etc/adjtime (EMPTY) drwxr-xr-x root/root lib/ @@ -37,20 +39,20 @@ drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/raw -rwxr-xr-x root/root sbin/sfdisk -rwxr-xr-x root/root sbin/swaplabel -lrwxrwxrwx root/root sbin/swapoff -> swapon +-rwxr-xr-x root/root sbin/swapoff -rwxr-xr-x root/root sbin/swapon -rwxr-xr-x root/root sbin/switch_root -rwxr-xr-x root/root sbin/wipefs drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/cal --rwxr-xr-x root/root usr/bin/chkdupexe -rwxr-xr-x root/root usr/bin/chrt -rwxr-xr-x root/root usr/bin/col -rwxr-xr-x root/root usr/bin/colcrt -rwxr-xr-x root/root usr/bin/colrm -rwxr-xr-x root/root usr/bin/column -rwxr-xr-x root/root usr/bin/cytune +-rwxr-xr-x root/root usr/bin/eject -rwxr-xr-x root/root usr/bin/fallocate -rwxr-xr-x root/root usr/bin/flock -rwxr-xr-x root/root usr/bin/getopt @@ -65,9 +67,11 @@ lrwxrwxrwx root/root usr/bin/linux64 -> setarch -rwxr-xr-x root/root usr/bin/logger -rwxr-xr-x root/root usr/bin/look -rwxr-xr-x root/root usr/bin/lscpu +-rwxr-xr-x root/root usr/bin/lslocks -rwxr-xr-x root/root usr/bin/mcookie -rwxr-xr-x root/root usr/bin/namei -rwxr-xr-x root/root usr/bin/pg +-rwxr-xr-x root/root usr/bin/prlimit -rwxr-xr-x root/root usr/bin/rename -rwxr-xr-x root/root usr/bin/renice -rwxr-xr-x root/root usr/bin/rev @@ -80,6 +84,7 @@ lrwxrwxrwx root/root usr/bin/linux64 -> setarch -rwxr-xr-x root/root usr/bin/taskset -rwxr-xr-x root/root usr/bin/ul -rwxr-xr-x root/root usr/bin/unshare +-rwxr-xr-x root/root usr/bin/utmpdump -rwxr-xr-x root/root usr/bin/uuidgen -rwxr-xr-x root/root usr/bin/whereis -rwxr-sr-x root/tty usr/bin/write @@ -107,13 +112,13 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/cal.1.gz --rw-r--r-- root/root usr/man/man1/chkdupexe.1.gz -rw-r--r-- root/root usr/man/man1/chrt.1.gz -rw-r--r-- root/root usr/man/man1/col.1.gz -rw-r--r-- root/root usr/man/man1/colcrt.1.gz -rw-r--r-- root/root usr/man/man1/colrm.1.gz -rw-r--r-- root/root usr/man/man1/column.1.gz -rw-r--r-- root/root usr/man/man1/dmesg.1.gz +-rw-r--r-- root/root usr/man/man1/eject.1.gz -rw-r--r-- root/root usr/man/man1/fallocate.1.gz -rw-r--r-- root/root usr/man/man1/flock.1.gz -rw-r--r-- root/root usr/man/man1/getopt.1.gz @@ -128,8 +133,10 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/lscpu.1.gz -rw-r--r-- root/root usr/man/man1/mcookie.1.gz -rw-r--r-- root/root usr/man/man1/more.1.gz +-rw-r--r-- root/root usr/man/man1/mountpoint.1.gz -rw-r--r-- root/root usr/man/man1/namei.1.gz -rw-r--r-- root/root usr/man/man1/pg.1.gz +-rw-r--r-- root/root usr/man/man1/prlimit.1.gz -rw-r--r-- root/root usr/man/man1/rename.1.gz -rw-r--r-- root/root usr/man/man1/renice.1.gz -rw-r--r-- root/root usr/man/man1/rev.1.gz @@ -141,6 +148,7 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/taskset.1.gz -rw-r--r-- root/root usr/man/man1/ul.1.gz -rw-r--r-- root/root usr/man/man1/unshare.1.gz +-rw-r--r-- root/root usr/man/man1/utmpdump.1.gz -rw-r--r-- root/root usr/man/man1/uuidgen.1.gz -rw-r--r-- root/root usr/man/man1/whereis.1.gz -rw-r--r-- root/root usr/man/man1/write.1.gz @@ -184,6 +192,7 @@ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/linux64.8.gz -rw-r--r-- root/root usr/man/man8/losetup.8.gz -rw-r--r-- root/root usr/man/man8/lsblk.8.gz +-rw-r--r-- root/root usr/man/man8/lslocks.8.gz -rw-r--r-- root/root usr/man/man8/mkfs.8.gz -rw-r--r-- root/root usr/man/man8/mkswap.8.gz -rw-r--r-- root/root usr/man/man8/mount.8.gz @@ -191,6 +200,7 @@ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/pivot_root.8.gz -rw-r--r-- root/root usr/man/man8/raw.8.gz -rw-r--r-- root/root usr/man/man8/readprofile.8.gz +-rw-r--r-- root/root usr/man/man8/resizepart.8.gz -rw-r--r-- root/root usr/man/man8/rtcwake.8.gz -rw-r--r-- root/root usr/man/man8/setarch.8.gz -rw-r--r-- root/root usr/man/man8/sfdisk.8.gz @@ -201,6 +211,7 @@ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/tunelp.8.gz -rw-r--r-- root/root usr/man/man8/umount.8.gz -rw-r--r-- root/root usr/man/man8/uuidd.8.gz +-rw-r--r-- root/root usr/man/man8/wdctl.8.gz -rw-r--r-- root/root usr/man/man8/wipefs.8.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/addpart @@ -209,6 +220,7 @@ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/ldattach -rwxr-xr-x root/root usr/sbin/partx -rwxr-xr-x root/root usr/sbin/readprofile +-rwxr-xr-x root/root usr/sbin/resizepart -rwxr-xr-x root/root usr/sbin/rtcwake -rwxr-xr-x root/root usr/sbin/tunelp -rwxr-xr-x root/root usr/sbin/uuidd diff --git a/util-linux/.md5sum b/util-linux/.md5sum new file mode 100644 index 0000000..cb8de63 --- /dev/null +++ b/util-linux/.md5sum @@ -0,0 +1 @@ +730cf9932531ed09b53a04ca30fcb4c9 util-linux-2.22.1.tar.xz diff --git a/util-linux-ng/Pkgfile b/util-linux/Pkgfile similarity index 70% rename from util-linux-ng/Pkgfile rename to util-linux/Pkgfile index 73ca727..65e6a37 100644 --- a/util-linux-ng/Pkgfile +++ b/util-linux/Pkgfile @@ -4,17 +4,18 @@ # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu # Depends on: ncurses zlib -name=util-linux-ng -version=2.21.2 +name=util-linux +version=2.22.1 release=1 -source=(http://ftp.kernel.org/pub/linux/utils/util-linux/v2.21/util-linux-$version.tar.xz) +source=(http://ftp.kernel.org/pub/linux/utils/$name/v2.22/$name-$version.tar.xz) build() { - cd util-linux-$version + cd $name-$version ./configure --prefix=/usr \ --mandir=/usr/man \ - --disable-{nls,wall,mountpoint} \ + --disable-{nls,wall} \ + --disable-{login,su,sulogin,runuser} \ --enable-{write,raw,kill} make make DESTDIR=$PKG install @@ -22,7 +23,7 @@ build() { install -d $PKG/{etc,var/{lib/libuuid,run/uuidd}} touch $PKG/etc/adjtime - rm -r $PKG/usr/{share,man/ru} + rm -r $PKG/usr/share rm $PKG/sbin/{mkfs.bfs,mkfs.minix,fsck.minix} rm $PKG/usr/man/man8/{fsck.minix,mkfs.bfs,mkfs.minix}.8 } -- 2.26.2