util-linux: update to util-linux-2.22

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/sysutils/util-linux/build

@@ -23,8 +23,6 @@
 . config/options $1
 
 cd $PKG_BUILD
-#scanf_cv_type_modifier=ms \
-#gt_cv_func_gnugettext1_libintl=no \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -40,8 +38,8 @@ cd $PKG_BUILD
             --enable-libuuid \
             --enable-libblkid \
             --enable-libmount \
+            --disable-deprecated-mount \
             --disable-mount \
-            --disable-libmount-mount \
             --enable-fsck \
             --disable-partx \
             --enable-uuidd \
@@ -50,6 +48,7 @@ cd $PKG_BUILD
             --disable-unshare \
             --disable-arch \
             --disable-ddate \
+	    --disable-eject \
             --disable-agetty \
             --disable-cramfs \
             --disable-switch-root \
@@ -57,18 +56,26 @@ cd $PKG_BUILD
             --disable-elvtune \
             --disable-kill \
             --disable-last \
+	    --disable-utmpdump \
             --disable-line \
             --disable-mesg \
             --disable-raw \
             --disable-rename \
             --disable-reset \
-            --disable-login-utils \
+            --disable-vipw \
+            --disable-newgrp \
+            --disable-chfn-chsh \
+            --enable-chsh-only-listed \
+            --disable-login \
+            --disable-login-chown-vcs \
+            --disable-login-stat-mail \
+            --disable-sulogin \
+            --disable-su \
             --disable-schedutils \
             --disable-wall \
             --disable-write \
-            --enable-chsh-only-listed \
-            --disable-login-chown-vcs \
-            --disable-login-stat-mail \
+            --disable-chkdupexe \
+            --disable-socket-activation \
             --disable-pg-bell \
             --disable-require-password \
             --disable-use-tty-group \
@@ -80,19 +87,10 @@ cd $PKG_BUILD
             --without-udev \
             --without-ncurses \
             --without-slang \
-            --without-utempter
+            --without-utempter \
+            --without-systemdsystemunitdir
 
 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

packages/sysutils/util-linux/install

@@ -23,20 +23,22 @@
 . config/options $1
 
 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/fsck/.libs/fsck $INSTALL/usr/bin
+  cp $PKG_BUILD/fstrim $INSTALL/usr/bin
+  cp $PKG_BUILD/.libs/blkid $INSTALL/usr/bin
+  cp $PKG_BUILD/.libs/fsck $INSTALL/usr/bin
 
 mkdir -p $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/libblkid/src/.libs/libblkid.so* $INSTALL/usr/lib
+  cp -PR $PKG_BUILD/.libs/libblkid.so* $INSTALL/usr/lib
   rm -rf $INSTALL/usr/lib/libblkid.so*T
-  cp -PR $PKG_BUILD/libuuid/src/.libs/libuuid.so* $INSTALL/usr/lib
+  cp -PR $PKG_BUILD/.libs/libmount.so* $INSTALL/usr/lib
+  rm -rf $INSTALL/usr/lib/libmount.so*T
+  cp -PR $PKG_BUILD/.libs/libuuid.so* $INSTALL/usr/lib
   rm -rf $INSTALL/usr/lib/libuuid.so*T
 
 if [ "$SWAP_SUPPORT" = "yes" ]; then
   mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/sys-utils/.libs/swapon $INSTALL/usr/bin
-  ln -sf swapon $INSTALL/usr/bin/swapoff
+  cp $PKG_BUILD/.libs/swapon $INSTALL/usr/bin
+  cp $PKG_BUILD/.libs/swapoff $INSTALL/usr/bin
 
   mkdir -p $INSTALL/etc/init.d
   cp $PKG_DIR/scripts/32_swapfile $INSTALL/etc/init.d

packages/sysutils/util-linux/meta

@@ -19,11 +19,11 @@
 ################################################################################
 
 PKG_NAME="util-linux"
-PKG_VERSION="2.21.2"
+PKG_VERSION="2.22"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.21/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.22/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"