From 5eb03c06f98fa1922bda910f74a1a9e955bf9112 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@mobile.openelec.tv>
Date: Mon, 16 Nov 2009 04:46:13 +0100
Subject: [PATCH] util-linux-ng: - update to util-linux-ng-2.16.1 - build and
 install blkid - dont install sfdisk

---
 packages/sysutils/util-linux-ng/build         | 11 +++++-----
 packages/sysutils/util-linux-ng/install       |  9 +++++++-
 .../patches/util-linux-ng_remove_libuuid.diff | 22 -------------------
 packages/sysutils/util-linux-ng/url           |  2 +-
 4 files changed, 14 insertions(+), 30 deletions(-)
 delete mode 100644 packages/sysutils/util-linux-ng/patches/util-linux-ng_remove_libuuid.diff

diff --git a/packages/sysutils/util-linux-ng/build b/packages/sysutils/util-linux-ng/build
index f79beb0a48..68678e2f6c 100755
--- a/packages/sysutils/util-linux-ng/build
+++ b/packages/sysutils/util-linux-ng/build
@@ -9,14 +9,13 @@ gt_cv_func_gnugettext1_libintl=no \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
-            --disable-shared \
-            --enable-static \
+            --enable-shared \
+            --disable-static \
             --disable-tls \
             --without-ncurses
 
 make -C fdisk sfdisk
-make -C shlibs/blkid
-make -C shlibs/uuid
+make -C shlibs
+make -C misc-utils blkid
 
-$MAKEINSTALL -C shlibs/blkid
-$MAKEINSTALL -C shlibs/uuid
+$MAKEINSTALL -C shlibs
diff --git a/packages/sysutils/util-linux-ng/install b/packages/sysutils/util-linux-ng/install
index 026bf930eb..0dc7ad9e3a 100755
--- a/packages/sysutils/util-linux-ng/install
+++ b/packages/sysutils/util-linux-ng/install
@@ -2,5 +2,12 @@
 
 . config/options
 
+mkdir -p $INSTALL/usr/lib
+  cp -PR $PKG_BUILD/shlibs/blkid/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
+  rm -rf $INSTALL/usr/lib/libuuid.so*T
+
 mkdir -p $INSTALL/usr/bin
-cp $PKG_BUILD/$1*/fdisk/sfdisk $INSTALL/usr/bin
+#  cp $PKG_BUILD/fdisk/sfdisk $INSTALL/usr/bin
+  cp $PKG_BUILD/misc-utils/.libs/blkid $INSTALL/usr/bin
diff --git a/packages/sysutils/util-linux-ng/patches/util-linux-ng_remove_libuuid.diff b/packages/sysutils/util-linux-ng/patches/util-linux-ng_remove_libuuid.diff
deleted file mode 100644
index 3e66734da9..0000000000
--- a/packages/sysutils/util-linux-ng/patches/util-linux-ng_remove_libuuid.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur util-linux-ng-2.16/shlibs/blkid/blkid.pc util-linux-ng-2.16.patch/shlibs/blkid/blkid.pc
---- util-linux-ng-2.16/shlibs/blkid/blkid.pc	2009-07-16 01:18:03.000000000 +0200
-+++ util-linux-ng-2.16.patch/shlibs/blkid/blkid.pc	2009-07-19 06:07:08.592182694 +0200
-@@ -6,6 +6,6 @@
- Name: blkid
- Description: Block device id library
- Version: 2.16.0
--Requires.private: uuid
-+Requires.private:
- Cflags: -I${includedir}/blkid
- Libs: -L${libdir} -lblkid
-diff -Naur util-linux-ng-2.16/shlibs/blkid/blkid.pc.in util-linux-ng-2.16.patch/shlibs/blkid/blkid.pc.in
---- util-linux-ng-2.16/shlibs/blkid/blkid.pc.in	2009-07-04 01:20:03.000000000 +0200
-+++ util-linux-ng-2.16.patch/shlibs/blkid/blkid.pc.in	2009-07-19 06:07:16.846092573 +0200
-@@ -6,6 +6,6 @@
- Name: blkid
- Description: Block device id library
- Version: @LIBBLKID_VERSION@
--Requires.private: uuid
-+Requires.private:
- Cflags: -I${includedir}/blkid
- Libs: -L${libdir} -lblkid
diff --git a/packages/sysutils/util-linux-ng/url b/packages/sysutils/util-linux-ng/url
index f8b52eabb6..216f29879d 100644
--- a/packages/sysutils/util-linux-ng/url
+++ b/packages/sysutils/util-linux-ng/url
@@ -1 +1 @@
-http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.16/util-linux-ng-2.16.tar.bz2
\ No newline at end of file
+http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.16/util-linux-ng-2.16.1.tar.bz2
\ No newline at end of file