# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1361550889 0
# Node ID 680eb16b06bb3fc73799313bf7d808b3c8ec581f
# Parent  65b9df7997927472d7f03e8f43d41082f99938de# Parent  7fc3e2e4fb0aef56f1c0cdbbf444d48bb21f079c
merge branches

diff -r 65b9df799792 -r 680eb16b06bb coreutils/receipt
--- a/coreutils/receipt	Fri Feb 22 16:33:13 2013 +0000
+++ b/coreutils/receipt	Fri Feb 22 16:34:49 2013 +0000
@@ -8,6 +8,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WEB_SITE="http://www.gnu.org/software/coreutils/"
 WGET_URL="ftp://ftp.gnu.org/gnu/$PACKAGE/$TARBALL"
+
 DEPENDS="glibc-base gmp libcap"
 BUILD_DEPENDS="slitaz-toolchain libcap-dev gmp-dev m4 autoconf automake"
 
@@ -51,21 +52,22 @@
 #
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin
+	mkdir -p $fs/usr/bin $fs/bin
 	# Utils...
-	cp -a $_pkg/usr/bin/base64 $fs/usr/bin
-	cp -a $_pkg/usr/bin/csplit $fs/usr/bin
-	cp -a $_pkg/usr/bin/factor $fs/usr/bin
-	cp -a $_pkg/usr/bin/fmt $fs/usr/bin
-	cp -a $_pkg/usr/bin/join $fs/usr/bin
-	cp -a $_pkg/usr/bin/od $fs/usr/bin
-	cp -a $_pkg/usr/bin/paste $fs/usr/bin
-	cp -a $_pkg/usr/bin/ptx $fs/usr/bin
-	cp -a $_pkg/usr/bin/shred $fs/usr/bin
-	cp -a $_pkg/usr/bin/shuf $fs/usr/bin
-	cp -a $_pkg/usr/bin/split $fs/usr/bin
-	cp -a $_pkg/usr/bin/users $fs/usr/bin
-	cp -a $_pkg/usr/bin/groups $fs/usr/bin
+	cp -a $install/usr/bin/base64 $fs/usr/bin
+	cp -a $install/usr/bin/csplit $fs/usr/bin
+	cp -a $install/usr/bin/factor $fs/usr/bin
+	cp -a $install/usr/bin/fmt $fs/usr/bin
+	cp -a $install/usr/bin/join $fs/usr/bin
+	cp -a $install/usr/bin/od $fs/usr/bin
+	cp -a $install/usr/bin/paste $fs/usr/bin
+	cp -a $install/usr/bin/ptx $fs/usr/bin
+	cp -a $install/usr/bin/shred $fs/usr/bin
+	cp -a $install/usr/bin/shuf $fs/usr/bin
+	cp -a $install/usr/bin/split $fs/usr/bin
+	cp -a $install/usr/bin/users $fs/usr/bin
+	cp -a $install/usr/bin/groups $fs/usr/bin
+	cp -a $install/usr/bin/cp $fs/bin
 }
 
 # Pre and post install commands for Tazpkg.
@@ -77,14 +79,15 @@
 	root=$1
 	echo "Processing pre-install commands..."
 	echo -n "Removing all Busybox replaced utils... "
-	rm -f $root/usr/bin/od $root/usr/bin/split
+	rm -f $root/usr/bin/od $root/usr/bin/split $root/bin/cp
 	status
 }
 
 post_remove()
 {
-	ln -s /bin/busybox $1/usr/bin/od
-	ln -s /bin/busybox $1/usr/bin/split
+	ln -s ../../bin/busybox $1/usr/bin/od
+	ln -s ../../bin/busybox $1/usr/bin/split
+	ln -s busybox $1/bin/cp
 }
 
 clean_wok()