From b03285e4524a81ee57a2371ccaed76b5a01293a9 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 12 Mar 2012 22:10:00 +0100
Subject: [PATCH] util-linux: update to util-linux-2.21

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/util-linux/build            | 24 ++++++++-------
 packages/sysutils/util-linux/install          |  2 +-
 packages/sysutils/util-linux/meta             |  7 ++---
 ...ile_path_for_scanf_cv_alloc_modifier.patch | 30 +++++++++++++++++++
 4 files changed, 47 insertions(+), 16 deletions(-)
 create mode 100644 packages/sysutils/util-linux/patches/util-linux-2.21-add_a_crosscompile_path_for_scanf_cv_alloc_modifier.patch

diff --git a/packages/sysutils/util-linux/build b/packages/sysutils/util-linux/build
index 48061fdf0c..5e591b3de5 100755
--- a/packages/sysutils/util-linux/build
+++ b/packages/sysutils/util-linux/build
@@ -23,6 +23,7 @@
 . config/options $1
 
 cd $PKG_BUILD
+#scanf_cv_type_modifier=ms \
 gt_cv_func_gnugettext1_libintl=no \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
@@ -35,7 +36,7 @@ gt_cv_func_gnugettext1_libintl=no \
             --disable-gtk-doc \
             --enable-tls \
             --disable-mount \
-            --disable-fsck \
+            --enable-fsck \
             --disable-partx \
             --enable-libuuid \
             --enable-uuidd \
@@ -76,17 +77,20 @@ gt_cv_func_gnugettext1_libintl=no \
             --without-ncurses \
             --without-slang \
             --without-utempter \
-            --without-pam \
             --without-selinux \
             --without-audit
 
-make -C fsck fsck
-make -C mount swapon
-make -C misc-utils blkid
-make -C sys-utils fstrim
-make -C libuuid
-make -C libblkid
+make
+
+$MAKEINSTALL
+
+#make -C fsck fsck
+#make -C mount swapon
+#make -C misc-utils blkid
+#make -C sys-utils fstrim
+#make -C libuuid
+#make -C libblkid
 
 # libuuid must be installed before libblkid!!!
-  $MAKEINSTALL -C libuuid
-  $MAKEINSTALL -C libblkid
+#  $MAKEINSTALL -C libuuid
+#  $MAKEINSTALL -C libblkid
diff --git a/packages/sysutils/util-linux/install b/packages/sysutils/util-linux/install
index 8c75b57a43..c995eb7152 100755
--- a/packages/sysutils/util-linux/install
+++ b/packages/sysutils/util-linux/install
@@ -25,7 +25,7 @@
 mkdir -p $INSTALL/usr/bin
   cp $PKG_BUILD/misc-utils/.libs/blkid $INSTALL/usr/bin
   cp $PKG_BUILD/sys-utils/fstrim $INSTALL/usr/bin
-  cp $PKG_BUILD/mount/.libs/swapon $INSTALL/usr/bin
+  cp $PKG_BUILD/sys-utils/.libs/swapon $INSTALL/usr/bin
     ln -sf swapon $INSTALL/usr/bin/swapoff
   cp $PKG_BUILD/fsck/.libs/fsck $INSTALL/usr/bin
 
diff --git a/packages/sysutils/util-linux/meta b/packages/sysutils/util-linux/meta
index 9c6bb508c5..0e00aa2525 100644
--- a/packages/sysutils/util-linux/meta
+++ b/packages/sysutils/util-linux/meta
@@ -19,14 +19,11 @@
 ################################################################################
 
 PKG_NAME="util-linux"
-PKG_VERSION="2.20"
+PKG_VERSION="2.21"
 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/v2.20/$PKG_NAME-$PKG_VERSION.tar.bz2"
-#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/util-linux/v2.20/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/utils/util-linux/v2.20/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.21/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
diff --git a/packages/sysutils/util-linux/patches/util-linux-2.21-add_a_crosscompile_path_for_scanf_cv_alloc_modifier.patch b/packages/sysutils/util-linux/patches/util-linux-2.21-add_a_crosscompile_path_for_scanf_cv_alloc_modifier.patch
new file mode 100644
index 0000000000..ae34b288be
--- /dev/null
+++ b/packages/sysutils/util-linux/patches/util-linux-2.21-add_a_crosscompile_path_for_scanf_cv_alloc_modifier.patch
@@ -0,0 +1,30 @@
+From b420e279691f8ac865ccdbccb377024a55debd41 Mon Sep 17 00:00:00 2001
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 24 Feb 2012 18:16:07 +0100
+Subject: [PATCH] build-sys: add a crosscompile path for
+ scanf_cv_alloc_modifier
+
+This allows to building the package cross again. Since the return value
+is not used I guess there is little loss.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ configure.ac |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index eab9f85..966e9da 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -383,6 +383,8 @@ AC_CACHE_VAL([scanf_cv_alloc_modifier],
+       [scanf_cv_alloc_modifier=as],
+       [scanf_cv_alloc_modifier=no]
+     )
++    ,
++    [scanf_cv_alloc_modifier=no]
+   )
+ )
+ 
+-- 
+1.7.5.4
+