cookutils rev 502 slitaz-tank

Merge default.
author Christopher Rogers <slaxemulator@gmail.com>
date Wed Jun 20 23:17:27 2012 +0000 (2012-06-20)
parents 4721d19207ed e09f02df6e1e
children 2319903b26b6
files cook cooker lib/libcook.sh web/cooker.cgi
line diff
     1.1 --- a/README	Mon Jun 11 16:27:12 2012 +0000
     1.2 +++ b/README	Wed Jun 20 23:17:27 2012 +0000
     1.3 @@ -126,7 +126,7 @@
     1.4  for the ARM platform, but the first thing to do is compile a cross toolchain and
     1.5  modify the main cook.conf variables to use a correct ARCH, CFLAGS and BUILD_SYSTEM
     1.6  
     1.7 -Cook handles HOST_ARCH and CROSS_* receipt variables. Some packages don't build or
     1.8 +Cook handles HOST_ARCH and CROSS_* receipt variables. Some packages won't build or
     1.9  are not packaged for an architecture and so cross compiling will fail if the
    1.10  package receipt has not been reviewed and includes HOST_ARCH. Here is an example
    1.11  and a list of cross variables:
     2.1 --- a/cook	Mon Jun 11 16:27:12 2012 +0000
     2.2 +++ b/cook	Wed Jun 20 23:17:27 2012 +0000
     2.3 @@ -465,6 +465,8 @@
     2.4  	for error in \
     2.5  		ERROR "No package" "cp: can't" "can't open" "can't cd" \
     2.6  		"error:" "fatal error:" "rm: can't remove" "cp: can't stat"
     2.7 +		"undefined reference to" "Unable to connect to" \
     2.8 +		"link: cannot find the library"
     2.9  	do
    2.10  		fgrep "$error" $LOGS/$pkg.log
    2.11  	done
     3.1 --- a/cooker	Mon Jun 11 16:27:12 2012 +0000
     3.2 +++ b/cooker	Wed Jun 20 23:17:27 2012 +0000
     3.3 @@ -3,7 +3,7 @@
     3.4  # SliTaz Build Bot. The Cooker is a tool to automate and test SliTaz package
     3.5  # building. Please read the Cookbook documentation for more information
     3.6  # and discuss with the AUTHORS before adding anything here. PS: no translations
     3.7 -# here since it's not an end user tool and it's not useful, all devs should
     3.8 +# here since it's not an end user tool and it's not useful. All devs should
     3.9  # at least understand basic English.
    3.10  #
    3.11  . /usr/lib/slitaz/libcook.sh
     4.1 --- a/cookiso	Mon Jun 11 16:27:12 2012 +0000
     4.2 +++ b/cookiso	Wed Jun 20 23:17:27 2012 +0000
     4.3 @@ -8,7 +8,7 @@
     4.4  # --> cook.conf
     4.5  # SSH/RSA configuration to upload on a server.
     4.6  # Assign this before cook.conf so it can be
     4.7 -# reassign in cook.conf.
     4.8 +# reassigned in cook.conf.
     4.9  SSH_CMD="dbclient -i /root/.ssh/id_rsa.dropbear"
    4.10  SSH_ISO="/var/www/slitaz/mirror/iso"
    4.11  SSH_HOST="slitaz@mirror.slitaz.org"
     5.1 --- a/cross	Mon Jun 11 16:27:12 2012 +0000
     5.2 +++ b/cross	Wed Jun 20 23:17:27 2012 +0000
     5.3 @@ -24,7 +24,7 @@
     5.4  Usage: $(basename $0) command --option
     5.5  
     5.6  Commands:
     5.7 -  howto           Man alike and howto
     5.8 +  howto           Man[like] page and howto
     5.9    info            Display cross-tools info
    5.10    testsuite       Execute a small testsuite
    5.11    check           Check build host environment
     6.1 --- a/lib/libcook.sh	Mon Jun 11 16:27:12 2012 +0000
     6.2 +++ b/lib/libcook.sh	Wed Jun 20 23:17:27 2012 +0000
     6.3 @@ -36,6 +36,7 @@
     6.4  blocked="$cache/blocked"
     6.5  broken="$cache/broken"
     6.6  unbuild="$cache/unbuild"
     6.7 +wokrev="$cache/wokrev"
     6.8  cooknotes="$cache/cooknotes"
     6.9  crontabs="/var/spool/cron/crontabs/root"
    6.10  
     7.1 --- a/web/cooker.cgi	Mon Jun 11 16:27:12 2012 +0000
     7.2 +++ b/web/cooker.cgi	Wed Jun 20 23:17:27 2012 +0000
     7.3 @@ -288,6 +288,17 @@
     7.4  			cat $WOK/$pkg/taz/*/library.list | sed "s|$pkg	||g" | sed 's| |\n|g' | sed '/^$/d'
     7.5  			echo '</pre>'
     7.6  		fi ;;
     7.7 +	description=*)
     7.8 +		pkg=${QUERY_STRING#description=}
     7.9 +		echo "<h2>Description of $pkg</h2>"
    7.10 +		dir=$(ls -d $WOK/$pkg/taz/$pkg-*)
    7.11 +		if [ -s "$dir/description.txt" ]; then
    7.12 +			echo '<pre>'
    7.13 +			cat $dir/description.txt
    7.14 +			echo '</pre>'
    7.15 +		else
    7.16 +			echo "<pre>No description for: $pkg</pre>"
    7.17 +		fi ;;
    7.18  	*)
    7.19  		# We may have a toolchain.cgi script for cross cooker's
    7.20  		if [ -f "toolchain.cgi" ]; then