tazwok rev 406 4.3
Finish cook-toolchain) function :p
author | Antoine Bodin <gokhlayeh@slitaz.org> |
---|---|
date | Fri Mar 04 06:01:31 2011 +0100 (2011-03-04) |
parents | 20b8ac3d3a68 |
children | f738ded35665 |
files | TODO tazwok |
line diff
1.1 --- a/TODO Fri Mar 04 05:35:52 2011 +0100 1.2 +++ b/TODO Fri Mar 04 06:01:31 2011 +0100 1.3 @@ -7,7 +7,7 @@ 1.4 [ ] get reverse depends when a recook is needed (don't catch packages from reference repository!) 1.5 [ ] cooklist generation 1.6 [ ] Fix md5um on-the-fly generation when using check-incoming) 1.7 -[ ] Generate cooklist properly after cook-toolchain 1.8 +[*] Generate cooklist properly after cook-toolchain 1.9 1.10 ==== Code optimizations ==== 1.11 1.12 @@ -19,7 +19,8 @@ 1.13 [*] cook-order.txt; wok-wanted.txt/wok-depends.txt of reference repository 1.14 [*] cooklist, commit, broken, blocked 1.15 [ ] Rename wok-wanted.txt/wok-depends.txt to simply depends.txt/wanted.txt 1.16 -[ ] L407: Use fgrep here are variable subsitution are not optimize for big strings. 1.17 +[x] L407: Use fgrep here are variable subsitution are not optimize for big strings. 1.18 + > False, variable substitution is definitively better. 1.19 1.20 ==== New features ==== 1.21
2.1 --- a/tazwok Fri Mar 04 05:35:52 2011 +0100 2.2 +++ b/tazwok Fri Mar 04 06:01:31 2011 +0100 2.3 @@ -3283,15 +3283,24 @@ 2.4 echo -n "" > $PACKAGES_REPOSITORY/broken 2.5 if [ -f /usr/bin/tazchroot ]; then 2.6 cd $LOCAL_REPOSITORY 2.7 - [ ! -f tazchroot.conf ] && configure_tazchroot 2.8 - tazchroot cook-toolchain 2.9 - # Buggy : chroot can be elsewhere. 2.10 + [ -f tazchroot.conf ] || configure_tazchroot 2.11 + 2.12 + # Plan to recook all packages. 2.13 + if tazchroot cook-toolchain; then 2.14 + source_lib report 2.15 + report start 2.16 + pkg="$(grep ^[a-zA-Z0-9] $PACKAGES_REPOSITORY/packages.txt \ 2.17 + $INCOMING_REPOSITORY/packages.txt | sort -u)" 2.18 + forced=yes 2.19 + gen_cook_list 2.20 + fi 2.21 + 2.22 + # Remove chroot where toolchain has been cooked. 2.23 + source $LOCAL_REPOSITORY/tazchroot.conf 2.24 rm -r $LOCAL_REPOSITORY/chroot 2.25 - # /!\ to be writed : 2.26 - # next rm chroot and plan cook-all by pushing all packages 2.27 - # in cooklist. 2.28 + 2.29 else 2.30 - echo "The packages tazchroot need to be installed" >&2 2.31 + echo -e "\nThe package tazchroot need to be installed.\n" >&2 2.32 exit 1 2.33 fi 2.34 ;;