From e181108ce3d9bc297cc8df5ea6d954c0b3a0669c Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 8 Jul 2010 19:34:48 +0200
Subject: [PATCH] util-linux-ng: dont build and install 'flock', use the
 'flock' applet provided by busybox

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/busybox/config/busybox.conf | 2 +-
 packages/sysutils/util-linux-ng/build         | 3 ---
 packages/sysutils/util-linux-ng/install       | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf
index 38eed25ce3..9516d989f9 100644
--- a/packages/sysutils/busybox/config/busybox.conf
+++ b/packages/sysutils/busybox/config/busybox.conf
@@ -516,7 +516,7 @@ CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
 # CONFIG_FEATURE_OSF_LABEL is not set
 # CONFIG_FEATURE_FDISK_ADVANCED is not set
 CONFIG_FINDFS=y
-# CONFIG_FLOCK is not set
+CONFIG_FLOCK=y
 # CONFIG_FREERAMDISK is not set
 # CONFIG_FSCK_MINIX is not set
 # CONFIG_MKFS_EXT2 is not set
diff --git a/packages/sysutils/util-linux-ng/build b/packages/sysutils/util-linux-ng/build
index d020c7bbcd..9c5df611f4 100755
--- a/packages/sysutils/util-linux-ng/build
+++ b/packages/sysutils/util-linux-ng/build
@@ -26,7 +26,4 @@ make -C mount
 make -C shlibs
 make -C misc-utils blkid
 
-# needed by pm-utils
-  make -C sys-utils flock
-
 $MAKEINSTALL -C shlibs
diff --git a/packages/sysutils/util-linux-ng/install b/packages/sysutils/util-linux-ng/install
index f30142db07..9af0d0b95e 100755
--- a/packages/sysutils/util-linux-ng/install
+++ b/packages/sysutils/util-linux-ng/install
@@ -14,6 +14,3 @@ mkdir -p $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/sys-utils/flock $INSTALL/usr/bin