cookutils rev 669 3.3.1

Add any arch support
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Apr 05 09:36:21 2014 +0000 (2014-04-05)
parents f50c0089d6d0
children 00747f5812f9
files cook cooker
line diff
     1.1 --- a/cook	Sat Apr 05 05:48:34 2014 +0200
     1.2 +++ b/cook	Sat Apr 05 09:36:21 2014 +0000
     1.3 @@ -1040,7 +1040,7 @@
     1.4  		cd $WOK
     1.5  		if [ "$ARCH" != "i486" ]; then
     1.6  			count=0
     1.7 -			for pkg in $(fgrep 'HOST_ARCH=' */receipt | fgrep $ARCH | cut -d : -f 1)
     1.8 +			for pkg in $(fgrep 'HOST_ARCH=' */receipt | egrep "$ARCH|any" | cut -d : -f 1)
     1.9  			do
    1.10  				unset HOST_ARCH
    1.11  				. $pkg
    1.12 @@ -1288,7 +1288,7 @@
    1.13  					fi ;;
    1.14  				arm)
    1.15  					# Check only packages included in arch
    1.16 -					if echo "$HOST_ARCH" | fgrep -q "$ARCH"; then
    1.17 +					if echo "$HOST_ARCH" | egrep -q "$ARCH|any"; then
    1.18  						# *.tazpkg
    1.19  						if [ ! -f "$PKGS/${PACKAGE}-${VERSION}${EXTRAVERSION}-${ARCH}.tazpkg" ]; then
    1.20  							count=$(($count + 1))
    1.21 @@ -1460,7 +1460,7 @@
    1.22  		# Some packages are not included in some arch or fail to cross compile.
    1.23  		: ${HOST_ARCH=i486}
    1.24  		debug "Host arch $HOST_ARCH"
    1.25 -		if ! $(echo "$HOST_ARCH" | fgrep -q $ARCH); then
    1.26 +		if ! $(echo "$HOST_ARCH" | egrep -q "$ARCH|any"); then
    1.27  			_ "cook: HOST_ARCH=\$HOST_ARCH"
    1.28  			_ "cook: \$pkg doesn't cook or is not included in: \$ARCH"
    1.29  			[ "$CROSS_BUGS" ] && _ "bugs: \$CROSS_BUGS"
     2.1 --- a/cooker	Sat Apr 05 05:48:34 2014 +0200
     2.2 +++ b/cooker	Sat Apr 05 09:36:21 2014 +0000
     2.3 @@ -212,7 +212,7 @@
     2.4  		unset HOST_ARCH
     2.5  		. $wok/$pkg/receipt
     2.6  		#: ${HOST_ARCH=i486}
     2.7 -		if $(echo "$HOST_ARCH" | fgrep -q $ARCH); then
     2.8 +		if $(echo "$HOST_ARCH" | egrep -q "$ARCH|any"); then
     2.9  			count=$(($count + 1))
    2.10  			echo "Adding: $pkg"
    2.11  			touch $pkg/arch.$ARCH