util-linux: update patch to let choose 'uuidgen', enable uuidgen and libuuid for host build

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

packages/sysutils/util-linux/package.mk

@@ -77,7 +77,11 @@ if [ "$SWAP_SUPPORT" = "yes" ]; then
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-swapon"
 fi
 
-PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared $UTILLINUX_CONFIG_DEFAULT"
+PKG_CONFIGURE_OPTS_HOST="--enable-static \
+                         --disable-shared \
+                         $UTILLINUX_CONFIG_DEFAULT \
+                         --enable-uuidgen \
+                         --enable-libuuid"
 
 PKG_CONFIGURE_OPTS_INIT="--prefix=/ \
                          --bindir=/bin \
@@ -89,7 +93,7 @@ PKG_CONFIGURE_OPTS_INIT="--prefix=/ \
                          --enable-libblkid \
                          --enable-libmount \
                          --enable-fsck"
-                         
+
 if [ "$INITRAMFS_PARTED_SUPPORT" = "yes" ]; then
   PKG_CONFIGURE_OPTS_INIT="$PKG_CONFIGURE_OPTS_INIT --enable-mkfs --enable-libuuid"
 fi

packages/sysutils/util-linux/patches/util-linux-blkid_swapon_mkfs_uuidgen.patch

@@ -1,7 +1,16 @@
 diff -Naur util-linux-2.27/configure.ac util-linux-2.27.patch/configure.ac
 --- util-linux-2.27/configure.ac	2015-09-07 09:59:25.000000000 +0200
-+++ util-linux-2.27.patch/configure.ac	2015-09-10 10:53:17.284448191 +0200
-@@ -1055,7 +1055,11 @@
++++ util-linux-2.27.patch/configure.ac	2015-09-12 10:35:53.576532786 +0200
+@@ -1051,11 +1051,19 @@
+ AM_CONDITIONAL([BUILD_UUIDD], [test "x$build_uuidd" = xyes])
+ 
+ 
+-UL_BUILD_INIT([uuidgen], [check])
++AC_ARG_ENABLE([uuidgen],
++  AS_HELP_STRING([--disable-uuidgen], [do not build uuidgen]),
++  [], [UL_DEFAULT_ENABLE([uuidgen], [check])]
++)
++UL_BUILD_INIT([uuidgen]])
  UL_REQUIRES_BUILD([uuidgen], [libuuid])
  AM_CONDITIONAL([BUILD_UUIDGEN], [test "x$build_uuidgen" = xyes])
  
@@ -14,7 +23,7 @@ diff -Naur util-linux-2.27/configure.ac util-linux-2.27.patch/configure.ac
  UL_REQUIRES_BUILD([blkid], [libblkid])
  AM_CONDITIONAL([BUILD_BLKID], [test "x$build_blkid" = xyes])
  
-@@ -1242,21 +1246,26 @@
+@@ -1242,21 +1250,26 @@
  UL_REQUIRES_HAVE([hwclock], [io, linuxdummy], [ioperm iopl function or Linux])
  AM_CONDITIONAL([BUILD_HWCLOCK], [test "x$build_hwclock" = xyes])