wok-next rev 17503

grep: fix busybox paths (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Jan 08 11:02:18 2015 +0100 (2015-01-08)
parents d553e7773a21
children 1f57a2d79cf7
files grep/receipt retawq/receipt
line diff
     1.1 --- a/grep/receipt	Thu Jan 08 10:35:01 2015 +0100
     1.2 +++ b/grep/receipt	Thu Jan 08 11:02:18 2015 +0100
     1.3 @@ -16,7 +16,6 @@
     1.4  # Rules to configure and make the package.
     1.5  compile_rules()
     1.6  {
     1.7 -	cd $src
     1.8  	./configure $CONFIGURE_ARGS && 
     1.9  	make && make install
    1.10  }
    1.11 @@ -31,15 +30,18 @@
    1.12  # Pre and post install commands for Tazpkg.
    1.13  # We must remove all Busybox symlink before installing.
    1.14  #
    1.15 -pre_install()
    1.16 +post_install()
    1.17  {
    1.18  	local root
    1.19  	root=$1
    1.20  	echo "Processing pre-install commands..."
    1.21  	echo -n "Removing all Busybox replaced utils... "
    1.22  	for i in grep egrep fgrep ; do
    1.23 -		rm -f $root$(busybox grep bin/$i$ \
    1.24 -			$root/var/lib/tazpkg/installed/busybox/files.list)
    1.25 +		bb=$root$(busybox grep bin/$i$ \
    1.26 +		   $root/var/lib/tazpkg/installed/busybox*/files.list | sed q)
    1.27 +		readlink $bb 2> /dev/null | grep -q busybox || continue
    1.28 +		rm -f $bb
    1.29 +		ln -s /usr/bin/$i $bb
    1.30  	done
    1.31  	status
    1.32  }
    1.33 @@ -47,7 +49,14 @@
    1.34  post_remove()
    1.35  {
    1.36  	for i in grep egrep fgrep ; do
    1.37 -		ln -s /bin/busybox $root$(busybox grep bin/$i$ \
    1.38 -			$root/var/lib/tazpkg/installed/busybox/files.list)
    1.39 +		bb=$root$(busybox grep bin/$i$ \
    1.40 +		   $root/var/lib/tazpkg/installed/busybox*/files.list | sed q)
    1.41 +		rm -f $bb
    1.42 +		ln -s /bin/busybox $bb
    1.43  	done
    1.44  }
    1.45 +
    1.46 +pre_remove()
    1.47 +{
    1.48 +	post_remove
    1.49 +}
     2.1 --- a/retawq/receipt	Thu Jan 08 10:35:01 2015 +0100
     2.2 +++ b/retawq/receipt	Thu Jan 08 11:02:18 2015 +0100
     2.3 @@ -18,6 +18,7 @@
     2.4  # Rules to configure and make the package.
     2.5  compile_rules()
     2.6  {
     2.7 +	export LDFLAGS="-Wl,--copy-dt-needed-entries"
     2.8  	# We have no locale support on ARM actually
     2.9  	case "$ARCH" in
    2.10  		arm) opts="" ;;