From 94c3732acc76dc81575410371ee98f4f302b0cf1 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 30 Aug 2011 00:21:36 +0200
Subject: [PATCH] util-linux: update to util-linux-2.20

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../sysutils/util-linux-initramfs/install          |  4 ++--
 packages/sysutils/util-linux/build                 | 14 ++++++++------
 packages/sysutils/util-linux/install               |  4 ++--
 packages/sysutils/util-linux/meta                  |  4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/initramfs/sysutils/util-linux-initramfs/install b/packages/initramfs/sysutils/util-linux-initramfs/install
index f6f52dc062..cc268950de 100755
--- a/packages/initramfs/sysutils/util-linux-initramfs/install
+++ b/packages/initramfs/sysutils/util-linux-initramfs/install
@@ -29,5 +29,5 @@ mkdir -p $INSTALL/sbin
   cp -P $UTIL_LINUX_DIR/fsck/.libs/fsck $INSTALL/sbin
 
 mkdir -p $INSTALL/lib
-  cp -P $UTIL_LINUX_DIR/shlibs/blkid/src/.libs/libblkid.so* $INSTALL/lib
-  cp -P $UTIL_LINUX_DIR/shlibs/uuid/src/.libs/libuuid.so* $INSTALL/lib
+  cp -P $UTIL_LINUX_DIR/libblkid/src/.libs/libblkid.so* $INSTALL/lib
+  cp -P $UTIL_LINUX_DIR/libuuid/src/.libs/libuuid.so* $INSTALL/lib
diff --git a/packages/sysutils/util-linux/build b/packages/sysutils/util-linux/build
index 8cc8c31d9f..9844a006e5 100755
--- a/packages/sysutils/util-linux/build
+++ b/packages/sysutils/util-linux/build
@@ -34,13 +34,16 @@ gt_cv_func_gnugettext1_libintl=no \
             --enable-tls \
             --disable-mount \
             --disable-fsck \
+            --disable-partx \
             --enable-libuuid \
             --enable-uuidd \
             --enable-libblkid \
             --disable-libmount \
+            --disable-mountpoint \
             --enable-nls \
             --disable-rpath \
             --disable-arch \
+            --disable-ddate \
             --disable-agetty \
             --disable-cramfs \
             --disable-switch-root \
@@ -48,11 +51,10 @@ gt_cv_func_gnugettext1_libintl=no \
             --disable-fallocate \
             --disable-unshare \
             --disable-elvtune \
-            --disable-init \
             --disable-kill \
             --disable-last \
+            --disable-line \
             --disable-mesg \
-            --disable-partx \
             --disable-raw \
             --disable-rename \
             --disable-reset \
@@ -80,9 +82,9 @@ make -C fsck fsck
 make -C mount swapon
 make -C misc-utils blkid
 make -C sys-utils fstrim
-make -C shlibs/uuid
-make -C shlibs/blkid
+make -C libuuid
+make -C libblkid
 
 # libuuid must be installed before libblkid!!!
-  $MAKEINSTALL -C shlibs/uuid
-  $MAKEINSTALL -C shlibs/blkid
+  $MAKEINSTALL -C libuuid
+  $MAKEINSTALL -C libblkid
diff --git a/packages/sysutils/util-linux/install b/packages/sysutils/util-linux/install
index 89efe4b92d..659b5e8784 100755
--- a/packages/sysutils/util-linux/install
+++ b/packages/sysutils/util-linux/install
@@ -30,7 +30,7 @@ mkdir -p $INSTALL/sbin
   cp $PKG_BUILD/fsck/.libs/fsck $INSTALL/sbin
 
 mkdir -p $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/shlibs/blkid/src/.libs/libblkid.so* $INSTALL/usr/lib
+  cp -PR $PKG_BUILD/libblkid/src/.libs/libblkid.so* $INSTALL/usr/lib
   rm -rf $INSTALL/usr/lib/libblkid.so*T
-  cp -PR $PKG_BUILD/shlibs/uuid/src/.libs/libuuid.so* $INSTALL/usr/lib
+  cp -PR $PKG_BUILD/libuuid/src/.libs/libuuid.so* $INSTALL/usr/lib
   rm -rf $INSTALL/usr/lib/libuuid.so*T
diff --git a/packages/sysutils/util-linux/meta b/packages/sysutils/util-linux/meta
index 39fcd34117..07b16d33f8 100644
--- a/packages/sysutils/util-linux/meta
+++ b/packages/sysutils/util-linux/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="util-linux"
-PKG_VERSION="2.19.1"
+PKG_VERSION="2.20"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://userweb.kernel.org/~kzak/util-linux-ng/"
-PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.19/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.20/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"