cookutils rev 192
cook.conf: add BUILD_HOST to be compatible with the old way and tazwok
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Fri May 20 21:41:33 2011 +0200 (2011-05-20) |
parents | fe90a7071218 |
children | bfed443e62bd |
files | cook cook.conf |
line diff
1.1 --- a/cook Fri May 20 20:23:05 2011 +0200 1.2 +++ b/cook Fri May 20 21:41:33 2011 +0200 1.3 @@ -759,24 +759,34 @@ 1.4 gettext -e "\nCreating lists for:"; echo " $PKGS" 1.5 separator 1.6 cd $PKGS 1.7 - rm -f packages.* files.* 1.8 + rm -f packages.* 1.9 gettext -e "Creating: packages.list\n" 1.10 ls -1 *.tazpkg | sed s'/.tazpkg//' > $PKGS/packages.list 1.11 gettext -e "Creating: packages.md5\n" 1.12 md5sum *.tazpkg > $PKGS/packages.md5 1.13 gettext -e "Creating: packages.desc\n" 1.14 + gettext -e "Creating: packages.txt\n" 1.15 gettext -e "Creating: packages.equiv\n" 1.16 cd $WOK 1.17 for pkg in * 1.18 do 1.19 unset_receipt 1.20 . $pkg/receipt 1.21 - # packages.desc lets us search easily in DB 1.22 if [ -f "$PKGS/$PACKAGE-${VERSION}${EXTRAVERSION}.tazpkg" ]; then 1.23 + # packages.desc lets us search easily in DB 1.24 cat >> $PKGS/packages.desc << EOT 1.25 $PACKAGE | $VERSION$EXTRAVERSION | $SHORT_DESC | $CATEGORY | $WEB_SITE 1.26 EOT 1.27 - # Packages.equiv is used by tazpkg install to check depends. 1.28 + # packages.txt used by tazpkg and tazpkg-web also to provide 1.29 + # a human readable package list with version and description. 1.30 + cat >> $PKGS/packages.txt << EOT 1.31 +$PACKAGE 1.32 + ${VERSION}$EXTRAVERSION 1.33 + $SHORT_DESC 1.34 + $PACKED_SIZE ($UNPACKED_SIZE installed) 1.35 + 1.36 +EOT 1.37 + # packages.equiv is used by tazpkg install to check depends. 1.38 for i in $PROVIDE; do 1.39 DEST="" 1.40 echo $i | fgrep -q : && DEST="${i#*:}:" 1.41 @@ -787,17 +797,15 @@ 1.42 echo "${i%:*}=$DEST$PACKAGE" >> $PKGS/packages.equiv 1.43 fi 1.44 done 1.45 + # packages.files provide a list of all packages files. 1.46 + cat $pkg/taz/*/files.list >> $PKGS/packages.files 1.47 fi 1.48 done 1.49 cd $PKGS 1.50 1.51 - # packages.txt (redundancy list, all info is in pkgs desc). 1.52 - touch packages.txt 1.53 - 1.54 - # files.list.lzma 1.55 - gettext -e "Creating: files.list.lzma\n" 1.56 - touch files.list 1.57 - lzma e files.list files.list.lzma 1.58 + # files.list.lzma --> packages.files.lzma 1.59 + gettext -e "Creating: packages.files.lzma\n" 1.60 + lzma e packages.files packages.files.lzma 1.61 1.62 separator 1.63 nb=$(ls $PKGS/*.tazpkg | wc -l)
2.1 --- a/cook.conf Fri May 20 20:23:05 2011 +0200 2.2 +++ b/cook.conf Fri May 20 21:41:33 2011 +0200 2.3 @@ -36,6 +36,9 @@ 2.4 BUILD_SYSTEM="$ARCH-slitaz-linux" 2.5 HOST_SYSTEM="$ARCH-slitaz-linux" 2.6 2.7 +# Old way/tazwok compatibility. 2.8 +BUILD_HOST="$HOST_SYSTEM" 2.9 + 2.10 # SliTaz optimisation flags - Wide compatibility & optimized for ARCH. 2.11 # With -O2: binutils: Produce 14.0M Packed 5.5M Compressed 1.2M 2.12 # With -Os: binutils: Produce 13.4M Packed 4.9M Compressed 1.1M