cookutils rev 676
Better support vor armv* arches
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sat Apr 26 11:00:36 2014 +0200 (2014-04-26) |
parents | d2fcb67eec69 |
children | 6b9ff2df085e |
files | cook |
line diff
1.1 --- a/cook Sat Apr 26 04:50:37 2014 +0200 1.2 +++ b/cook Sat Apr 26 11:00:36 2014 +0200 1.3 @@ -435,7 +435,7 @@ 1.4 # must be stripped with cross-tools aka $ARCH-slitaz-*-strip 1.5 strip_package() { 1.6 case "$ARCH" in 1.7 - arm|x86_64) export STRIP=${HOST_SYSTEM}-strip ;; 1.8 + arm*|x86_64) export STRIP=${HOST_SYSTEM}-strip ;; 1.9 *) export STRIP=strip ;; 1.10 esac 1.11 _n "Executing strip on all files..." 1.12 @@ -733,7 +733,7 @@ 1.13 1.14 # Handle cross compilation 1.15 case "$ARCH" in 1.16 - arm|x86_64) arch="-$ARCH" ;; 1.17 + arm*|x86_64) arch="-$ARCH" ;; 1.18 esac 1.19 1.20 _ "Pack: \$PACKAGE \${VERSION}\${arch}"; separator 1.21 @@ -869,7 +869,7 @@ 1.22 # Install package on --install or update the chroot. 1.23 install_package() { 1.24 case "$ARCH" in 1.25 - arm|x86_64) 1.26 + arm*|x86_64) 1.27 arch="-${ARCH}" 1.28 root=$CROSS_TREE/sysroot ;; 1.29 esac 1.30 @@ -1087,7 +1087,7 @@ 1.31 # Use setup pkgs from cross.conf or cook.conf. When cross compiling 1.32 # ARCH-setup or 'cross check' should be used before: cook setup 1.33 case "$ARCH" in 1.34 - arm|x86_64) 1.35 + arm*|x86_64) 1.36 if [ ! -x "/usr/bin/cross" ]; then 1.37 _ "ERROR: cross is not installed" 1.38 exit 1 1.39 @@ -1300,7 +1300,7 @@ 1.40 count=$(($count + 1)) 1.41 colorize 34 "$pkg" 1.42 fi ;; 1.43 - arm) 1.44 + arm*) 1.45 # Check only packages included in arch 1.46 if echo "$HOST_ARCH" | egrep -q "$ARCH|any"; then 1.47 # *.tazpkg 1.48 @@ -1461,7 +1461,7 @@ 1.49 1.50 # Handle cross compilation. 1.51 case "$ARCH" in 1.52 - arm) 1.53 + arm*) 1.54 if [ ! "$HOST_ARCH" ]; then 1.55 _ "cook: HOST_ARCH is not set in \$pkg receipt" 1.56 _ "cook: This package is not included in: \$ARCH"