tazwok rev 427
Start to edit
author | Paul Issott <paul@slitaz.org> |
---|---|
date | Mon Mar 07 07:14:45 2011 +0000 (2011-03-07) |
parents | 6dc59879adde |
children | fe83eba401db |
files | chroot-scripts/cook-toolchain chroot-scripts/gen-iso |
line diff
1.1 --- a/chroot-scripts/cook-toolchain Sun Mar 06 20:53:19 2011 +0000 1.2 +++ b/chroot-scripts/cook-toolchain Mon Mar 07 07:14:45 2011 +0000 1.3 @@ -20,7 +20,7 @@ 1.4 1.5 report step "Initializing tools & environment" 1.6 1.7 -# Theses fours packages will be needed later. 1.8 +# These four packages will be needed later. 1.9 for p in libtaz tazwok slitaz-base-files tazpkg; do 1.10 tazwok cook $p 1.11 done 1.12 @@ -32,7 +32,7 @@ 1.13 LC_ALL=POSIX 1.14 1.15 # Set BUILD_HOST to something like $ARCH-tmp-linux-gnu to enable 1.16 -# of the temporary toolchain. 1.17 +# the temporary toolchain. 1.18 BUILD_HOST=$(echo $BUILD_HOST | sed 's/\(.*\)-\(.*\)-linux-gnu/\1-tmp-linux-gnu/') 1.19 1.20 PATH=/tools/bin:/tools/usr/bin:/tools/sbin:/tools/usr/sbin:/bin:/usr/bin:/sbin:/usr/sbin 1.21 @@ -89,10 +89,10 @@ 1.22 prepare_package 1.23 report step "Running compilation rules" 1.24 1.25 - # Use compile_rules if there's not function cook_tmp_toolchain in 1.26 + # Use compile_rules if there's no function cook_tmp_toolchain in 1.27 # the receipt. Works well if both functions are the same, as 1.28 - # cook-toolchain use it's own config.site to set different defaults 1.29 - # pathes. 1.30 + # cook-toolchain uses its own config.site to set different default 1.31 + # paths. 1.32 if grep -q ^cook_tmp_toolchain\(\)$ $WOK/$PACKAGE/receipt; then 1.33 cook_tmp_toolchain 1.34 else 1.35 @@ -104,7 +104,7 @@ 1.36 report end-sublog 1.37 done 1.38 1.39 -# Now we erase previous chroot tools and we switch to temporary 1.40 +# Now we erase previous chroot tools and switch to temporary 1.41 # toolchain. 1.42 1.43 report step "Setting up temporary toolchain environnment" 1.44 @@ -140,7 +140,7 @@ 1.45 esac 1.46 1.47 mkdir -p /bin /usr/bin /usr/lib 1.48 -# doing a loop so we don't get {bash,cat,echo,pwd,stty} softlink 1.49 +# Doing a loop so we don't get {bash,cat,echo,pwd,stty} softlink 1.50 BASIC_APPS="bash cat echo pwd stty" 1.51 for i in $BASIC_APPS; do 1.52 ln -s /tools/bin/$i /bin/$i 1.53 @@ -159,7 +159,7 @@ 1.54 # Finally, cook final* version of the toolchain packages. 1.55 # * : recook toolchain against itself minus linux-api-headers 1.56 # glibc binutils & gcc can be a good idea to make things 1.57 -# more robust & stable; in some cases it solves dependencies 1.58 +# more robust & stable; in some cases it solves dependency 1.59 # loops. 1.60 1.61 # Incoming packages as the only source for packages. 1.62 @@ -171,7 +171,7 @@ 1.63 tazwok gen-cooklist ${undigest:+--undigest=$undigest} > /tmp/toolchain.list 1.64 1.65 # Next cook packages one by one. 1.66 -# Cooking the list doesn't works because sh wouldn't take care 1.67 +# Cooking the list doesn't work because sh won't take care 1.68 # of the presence of new executables even if they're first in 1.69 # $PATH. 1.70
2.1 --- a/chroot-scripts/gen-iso Sun Mar 06 20:53:19 2011 +0000 2.2 +++ b/chroot-scripts/gen-iso Mon Mar 07 07:14:45 2011 +0000 2.3 @@ -1,6 +1,6 @@ 2.4 #!/bin/sh 2.5 # Little script to cook flavor in tazwok chroot waiting 2.6 -# for something more consistent into tazlito. 2.7 +# for something more consistent in tazlito. 2.8 2.9 [ "$1" ] || { echo "Usage: gen-iso flavorname [gzip]" >&2; exit 1; } 2.10 source /usr/lib/slitaz/libtaz 2.11 @@ -33,6 +33,6 @@ 2.12 clean-chroot 2.13 report stop 2.14 else 2.15 - echo "$SLITAZ_DIR/flavors/$1 doesn't exists." >&2 2.16 + echo "$SLITAZ_DIR/flavors/$1 doesn't exist." >&2 2.17 exit 1 2.18 fi