wok-6.x rev 14076

merge branches
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Feb 22 16:34:49 2013 +0000 (2013-02-22)
parents 65b9df799792 7fc3e2e4fb0a
children e074c6ae1cb0
files
line diff
     1.1 --- a/coreutils/receipt	Fri Feb 22 16:33:13 2013 +0000
     1.2 +++ b/coreutils/receipt	Fri Feb 22 16:34:49 2013 +0000
     1.3 @@ -8,6 +8,7 @@
     1.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
     1.5  WEB_SITE="http://www.gnu.org/software/coreutils/"
     1.6  WGET_URL="ftp://ftp.gnu.org/gnu/$PACKAGE/$TARBALL"
     1.7 +
     1.8  DEPENDS="glibc-base gmp libcap"
     1.9  BUILD_DEPENDS="slitaz-toolchain libcap-dev gmp-dev m4 autoconf automake"
    1.10  
    1.11 @@ -51,21 +52,22 @@
    1.12  #
    1.13  genpkg_rules()
    1.14  {
    1.15 -	mkdir -p $fs/usr/bin
    1.16 +	mkdir -p $fs/usr/bin $fs/bin
    1.17  	# Utils...
    1.18 -	cp -a $_pkg/usr/bin/base64 $fs/usr/bin
    1.19 -	cp -a $_pkg/usr/bin/csplit $fs/usr/bin
    1.20 -	cp -a $_pkg/usr/bin/factor $fs/usr/bin
    1.21 -	cp -a $_pkg/usr/bin/fmt $fs/usr/bin
    1.22 -	cp -a $_pkg/usr/bin/join $fs/usr/bin
    1.23 -	cp -a $_pkg/usr/bin/od $fs/usr/bin
    1.24 -	cp -a $_pkg/usr/bin/paste $fs/usr/bin
    1.25 -	cp -a $_pkg/usr/bin/ptx $fs/usr/bin
    1.26 -	cp -a $_pkg/usr/bin/shred $fs/usr/bin
    1.27 -	cp -a $_pkg/usr/bin/shuf $fs/usr/bin
    1.28 -	cp -a $_pkg/usr/bin/split $fs/usr/bin
    1.29 -	cp -a $_pkg/usr/bin/users $fs/usr/bin
    1.30 -	cp -a $_pkg/usr/bin/groups $fs/usr/bin
    1.31 +	cp -a $install/usr/bin/base64 $fs/usr/bin
    1.32 +	cp -a $install/usr/bin/csplit $fs/usr/bin
    1.33 +	cp -a $install/usr/bin/factor $fs/usr/bin
    1.34 +	cp -a $install/usr/bin/fmt $fs/usr/bin
    1.35 +	cp -a $install/usr/bin/join $fs/usr/bin
    1.36 +	cp -a $install/usr/bin/od $fs/usr/bin
    1.37 +	cp -a $install/usr/bin/paste $fs/usr/bin
    1.38 +	cp -a $install/usr/bin/ptx $fs/usr/bin
    1.39 +	cp -a $install/usr/bin/shred $fs/usr/bin
    1.40 +	cp -a $install/usr/bin/shuf $fs/usr/bin
    1.41 +	cp -a $install/usr/bin/split $fs/usr/bin
    1.42 +	cp -a $install/usr/bin/users $fs/usr/bin
    1.43 +	cp -a $install/usr/bin/groups $fs/usr/bin
    1.44 +	cp -a $install/usr/bin/cp $fs/bin
    1.45  }
    1.46  
    1.47  # Pre and post install commands for Tazpkg.
    1.48 @@ -77,14 +79,15 @@
    1.49  	root=$1
    1.50  	echo "Processing pre-install commands..."
    1.51  	echo -n "Removing all Busybox replaced utils... "
    1.52 -	rm -f $root/usr/bin/od $root/usr/bin/split
    1.53 +	rm -f $root/usr/bin/od $root/usr/bin/split $root/bin/cp
    1.54  	status
    1.55  }
    1.56  
    1.57  post_remove()
    1.58  {
    1.59 -	ln -s /bin/busybox $1/usr/bin/od
    1.60 -	ln -s /bin/busybox $1/usr/bin/split
    1.61 +	ln -s ../../bin/busybox $1/usr/bin/od
    1.62 +	ln -s ../../bin/busybox $1/usr/bin/split
    1.63 +	ln -s busybox $1/bin/cp
    1.64  }
    1.65  
    1.66  clean_wok()