From ea0b40830670b7e8d29b0ca3280a552bf782ebed Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 10 Jan 2011 01:08:00 +0100
Subject: [PATCH] util-linux-ng: rename to util-linux, update to
 util-linux-2.19-rc1, add 'fstrim' applet

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/nfs-utils/meta                             | 2 +-
 packages/sysutils/parted/meta                               | 4 ++--
 packages/sysutils/{util-linux-ng => util-linux}/build       | 1 +
 .../{util-linux-ng => util-linux}/init.d/32_swapfile        | 0
 packages/sysutils/{util-linux-ng => util-linux}/install     | 1 +
 packages/sysutils/{util-linux-ng => util-linux}/meta        | 6 +++---
 packages/tools/e2fsprogs/meta                               | 4 ++--
 packages/x11/lib/libSM/meta                                 | 4 ++--
 8 files changed, 12 insertions(+), 10 deletions(-)
 rename packages/sysutils/{util-linux-ng => util-linux}/build (98%)
 rename packages/sysutils/{util-linux-ng => util-linux}/init.d/32_swapfile (100%)
 rename packages/sysutils/{util-linux-ng => util-linux}/install (97%)
 rename packages/sysutils/{util-linux-ng => util-linux}/meta (91%)

diff --git a/packages/network/nfs-utils/meta b/packages/network/nfs-utils/meta
index 22b10b77ff..c003ba5726 100644
--- a/packages/network/nfs-utils/meta
+++ b/packages/network/nfs-utils/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://nfs.sourceforge.net/"
 PKG_URL="$SOURCEFORGE_SRC/nfs/nfs-utils/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libevent libnfsidmap portmap util-linux-ng"
+PKG_DEPENDS="libevent libnfsidmap portmap util-linux"
 PKG_BUILD_DEPENDS="toolchain libevent libnfsidmap"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
diff --git a/packages/sysutils/parted/meta b/packages/sysutils/parted/meta
index 3858c1e658..951768d0cc 100644
--- a/packages/sysutils/parted/meta
+++ b/packages/sysutils/parted/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/parted/"
 PKG_URL="http://ftp.gnu.org/gnu/parted/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="util-linux-ng"
-PKG_BUILD_DEPENDS="toolchain util-linux-ng"
+PKG_DEPENDS="util-linux"
+PKG_BUILD_DEPENDS="toolchain util-linux"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"
 PKG_SHORTDESC="parted: GNU partition editor"
diff --git a/packages/sysutils/util-linux-ng/build b/packages/sysutils/util-linux/build
similarity index 98%
rename from packages/sysutils/util-linux-ng/build
rename to packages/sysutils/util-linux/build
index cda5133f9a..52ccfa5ffe 100755
--- a/packages/sysutils/util-linux-ng/build
+++ b/packages/sysutils/util-linux/build
@@ -43,5 +43,6 @@ gt_cv_func_gnugettext1_libintl=no \
 make -C mount
 make -C shlibs
 make -C misc-utils blkid
+make -C sys-utils fstrim
 
 $MAKEINSTALL -C shlibs
diff --git a/packages/sysutils/util-linux-ng/init.d/32_swapfile b/packages/sysutils/util-linux/init.d/32_swapfile
similarity index 100%
rename from packages/sysutils/util-linux-ng/init.d/32_swapfile
rename to packages/sysutils/util-linux/init.d/32_swapfile
diff --git a/packages/sysutils/util-linux-ng/install b/packages/sysutils/util-linux/install
similarity index 97%
rename from packages/sysutils/util-linux-ng/install
rename to packages/sysutils/util-linux/install
index c2d7820192..94eee4e547 100755
--- a/packages/sysutils/util-linux-ng/install
+++ b/packages/sysutils/util-linux/install
@@ -28,6 +28,7 @@ mkdir -p $INSTALL/bin
 
 mkdir -p $INSTALL/sbin
   cp $PKG_BUILD/misc-utils/.libs/blkid $INSTALL/sbin
+  cp $PKG_BUILD/sys-utils/fstrim $INSTALL/sbin
   cp $PKG_BUILD/mount/.libs/swapon $INSTALL/sbin
   ln -sf swapon $INSTALL/sbin/swapoff
 
diff --git a/packages/sysutils/util-linux-ng/meta b/packages/sysutils/util-linux/meta
similarity index 91%
rename from packages/sysutils/util-linux-ng/meta
rename to packages/sysutils/util-linux/meta
index 00da08a240..38a66d5b82 100644
--- a/packages/sysutils/util-linux-ng/meta
+++ b/packages/sysutils/util-linux/meta
@@ -18,13 +18,13 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="util-linux-ng"
-PKG_VERSION="2.18"
+PKG_NAME="util-linux"
+PKG_VERSION="2.19-rc1"
 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/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.19/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
diff --git a/packages/tools/e2fsprogs/meta b/packages/tools/e2fsprogs/meta
index 62d2b53f00..0984c05100 100644
--- a/packages/tools/e2fsprogs/meta
+++ b/packages/tools/e2fsprogs/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://e2fsprogs.sourceforge.net/"
 PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="util-linux-ng"
-PKG_BUILD_DEPENDS="toolchain util-linux-ng"
+PKG_DEPENDS="util-linux"
+PKG_BUILD_DEPENDS="toolchain util-linux"
 PKG_PRIORITY="optional"
 PKG_SECTION="tools"
 PKG_SHORTDESC="e2fsprogs: Utilities for use with the ext2 filesystem"
diff --git a/packages/x11/lib/libSM/meta b/packages/x11/lib/libSM/meta
index 31f1e5387e..9f5fff7fcc 100644
--- a/packages/x11/lib/libSM/meta
+++ b/packages/x11/lib/libSM/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="util-linux-ng libICE"
-PKG_BUILD_DEPENDS="toolchain util-macros util-linux-ng libICE"
+PKG_DEPENDS="util-linux libICE"
+PKG_BUILD_DEPENDS="toolchain util-macros util-linux libICE"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libSM: X11 Inter-Client Exchange library"