cookutils rev 387

Edit cook
author Paul Issott <paul@slitaz.org>
date Sat May 12 22:42:15 2012 +0100 (2012-05-12)
parents c0b22f37b0ed
children 70d2a03915a0
files cook
line diff
     1.1 --- a/cook	Sat May 12 23:43:15 2012 +0200
     1.2 +++ b/cook	Sat May 12 22:42:15 2012 +0100
     1.3 @@ -429,7 +429,7 @@
     1.4  	# Handle cross-tools.
     1.5  	case "$ARCH" in
     1.6  		arm|x86_64)
     1.7 -			# CROSS_COMPILE is used by at leat Busybox and the kernel to set
     1.8 +			# CROSS_COMPILE is used by at least Busybox and the kernel to set
     1.9  			# the cross-tools prefix.
    1.10  			echo "cook: adding /usr/cross/$ARCH/bin to PATH"
    1.11  			export PATH=$PATH:/usr/cross/$ARCH/bin
    1.12 @@ -836,7 +836,7 @@
    1.13  		fi
    1.14  	fi
    1.15  
    1.16 -	# Skip install if target host dont match build system.
    1.17 +	# Skip install if target host doesn't match build system.
    1.18  	build=$(echo $BUILD_SYSTEM | cut -d "-" -f 1)
    1.19  	# Install package if part of the chroot to keep env up-to-date.
    1.20  	if [ -d "$INSTALLED/$pkg" ] && [ "$build" == "$ARCH" ]; then
    1.21 @@ -850,7 +850,7 @@
    1.22  	exit $status
    1.23  }
    1.24  
    1.25 -# Create a XML feed for freshly builded package.
    1.26 +# Create a XML feed for freshly built packages.
    1.27  gen_rss() {
    1.28  	pubdate=$(date "+%a, %d %b %Y %X")
    1.29  	cat > $FEEDS/$pkg.xml << EOT
    1.30 @@ -930,7 +930,7 @@
    1.31  		separator
    1.32  		gettext -e "All done, ready to cook packages :-)\n\n" ;;
    1.33  	arm-setup)
    1.34 -		# Setup fro cross ARM compiling.
    1.35 +		# Setup for cross ARM compiling.
    1.36  		sed -i \
    1.37  			-e s'/ARCH=.*/ARCH="arm"/' \
    1.38  			-e s'/CFLAGS=.*/CFLAGS="-march=armv6"/' \
    1.39 @@ -944,7 +944,7 @@
    1.40  			echo "Cross compiler: ${HOST_SYSTEM}-gcc"
    1.41  		else
    1.42  			echo "ERROR: C compiler is missing: ${HOST_SYSTEM}-gcc"
    1.43 -			echo "Run 'cross compile' for cook a toolchain"
    1.44 +			echo "Run 'cross compile' to cook a toolchain"
    1.45  		fi ;;
    1.46  	test)
    1.47  		# Test a cook environment.
    1.48 @@ -1173,7 +1173,7 @@
    1.49  		# CROSS_NOTE: Actually we are running an ARM cooker but running
    1.50  		# the cooker and build each commit in wok is not possible since
    1.51  		# we dont cook the full wok for this arch. For ARM we need a set
    1.52 -		# of packages to handle a touch sreen desktop, servers but not
    1.53 +		# of packages to handle a touch screen desktop, servers but not
    1.54  		# erland.
    1.55  		#
    1.56  		# The temporary solution is to build only reviewed and tested
    1.57 @@ -1182,19 +1182,19 @@
    1.58  			arm)
    1.59  				if [ ! "$HOST_ARCH" ]; then
    1.60  					echo "cook: HOST_ARCH is not set in $pkg receipt"
    1.61 -					echo "cook: This package is not include in: $ARCH"
    1.62 +					echo "cook: This package is not included in: $ARCH"
    1.63  					[ "$CROSS_BUGS" ] && echo "bugs: $CROSS_BUGS"
    1.64 -					echo "Cook skip: $pkg is not include in: $ARCH" | log
    1.65 +					echo "Cook skip: $pkg is not included in: $ARCH" | log
    1.66  					echo "" && exit 1
    1.67  				fi ;;
    1.68  		esac
    1.69  
    1.70 -		# Some packages are not include in some arch or fails to cross compile.
    1.71 +		# Some packages are not included in some arch or fail to cross compile.
    1.72  		if ! $(echo "$HOST_ARCH" | fgrep -q $ARCH); then
    1.73  			echo "cook: HOST_ARCH=$HOST_ARCH"
    1.74 -			echo "cook: $pkg dont cook or is not include in: $ARCH"
    1.75 +			echo "cook: $pkg doesn't cook or is not included in: $ARCH"
    1.76  			[ "$CROSS_BUGS" ] && echo "bugs: $CROSS_BUGS"
    1.77 -			echo "Cook skip: $pkg dont cook or is not include in: $ARCH" | log
    1.78 +			echo "Cook skip: $pkg doesn't cook or is not included in: $ARCH" | log
    1.79  			echo "" && exit 1
    1.80  		fi
    1.81