# HG changeset patch
# User Paul Issott <paul@slitaz.org>
# Date 1314616172 -3600
# Node ID ded2ad0d846da973453314b453c008675c3b6862
# Parent  7bae2701cabab74bca4ed5dbb635d876939fec48
procps: update receipt

diff -r 7bae2701caba -r ded2ad0d846d procps/receipt
--- a/procps/receipt	Sun Aug 28 21:01:21 2011 +0200
+++ b/procps/receipt	Mon Aug 29 12:09:32 2011 +0100
@@ -22,28 +22,44 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr $fs/lib
+	mkdir -p $fs/usr $fs/lib $fs/bin $fs/sbin
 	cp -a $_pkg/usr/bin $fs/usr
-	cp -a $_pkg/lib/* $fs/lib
+	cp -a $_pkg/bin $fs
+	cp -a $_pkg/sbin $fs
+	cp -a $_pkg/lib $fs
 
 	# Remove utils already supplied by Busybox
-	for i in free top uptime watch
-	do
-		rm -f $fs/usr/bin/$i
-	done
+	#for i in free top uptime watch
+	#do
+		#rm -f $fs/usr/bin/$i
+	#done
 }
 
 # Overlap busybox
 pre_install()
 {
+	rm -f $1/bin/kill
+	rm -f $1/bin/ps
+	rm -f $1/bin/watch
+	rm -f $1/sbin/sysctl
 	rm -f $1/usr/bin/pkill
 	rm -f $1/usr/bin/pmap
 	rm -f $1/usr/bin/pgrep
+	rm -f $1/usr/bin/top
+	rm -f $1/usr/bin/free
+	rm -f $1/usr/bin/uptime
 }
 
 post_remove()
 {
+	ln -s /bin/busybox /bin/kill
+	ln -s /bin/busybox /bin/ps
+	ln -s /bin/busybox /bin/watch
+	ln -s /bin/busybox /sbin/sysctl	
 	ln -s /bin/busybox /usr/bin/pkill
 	ln -s /bin/busybox /usr/bin/pmap
 	ln -s /bin/busybox /usr/bin/pgrep
+	ln -s /bin/busybox /usr/bin/top
+	ln -s /bin/busybox /usr/bin/free
+	ln -s /bin/busybox /usr/bin/uptime
 }