# HG changeset patch # User Christopher Rogers # Date 1340234247 0 # Node ID 4b1f207c405892f4b69b5f2a342d503ecf1bf2a2 # Parent 4721d19207ed8704bc1b18bf69702965e3f0b84a# Parent e09f02df6e1eb32e8fcc835b6c96367bb4a5b3cc Merge default. diff -r 4721d19207ed -r 4b1f207c4058 README --- a/README Mon Jun 11 16:27:12 2012 +0000 +++ b/README Wed Jun 20 23:17:27 2012 +0000 @@ -126,7 +126,7 @@ for the ARM platform, but the first thing to do is compile a cross toolchain and modify the main cook.conf variables to use a correct ARCH, CFLAGS and BUILD_SYSTEM -Cook handles HOST_ARCH and CROSS_* receipt variables. Some packages don't build or +Cook handles HOST_ARCH and CROSS_* receipt variables. Some packages won't build or are not packaged for an architecture and so cross compiling will fail if the package receipt has not been reviewed and includes HOST_ARCH. Here is an example and a list of cross variables: diff -r 4721d19207ed -r 4b1f207c4058 cook --- a/cook Mon Jun 11 16:27:12 2012 +0000 +++ b/cook Wed Jun 20 23:17:27 2012 +0000 @@ -465,6 +465,8 @@ for error in \ ERROR "No package" "cp: can't" "can't open" "can't cd" \ "error:" "fatal error:" "rm: can't remove" "cp: can't stat" + "undefined reference to" "Unable to connect to" \ + "link: cannot find the library" do fgrep "$error" $LOGS/$pkg.log done diff -r 4721d19207ed -r 4b1f207c4058 cooker --- a/cooker Mon Jun 11 16:27:12 2012 +0000 +++ b/cooker Wed Jun 20 23:17:27 2012 +0000 @@ -3,7 +3,7 @@ # SliTaz Build Bot. The Cooker is a tool to automate and test SliTaz package # building. Please read the Cookbook documentation for more information # and discuss with the AUTHORS before adding anything here. PS: no translations -# here since it's not an end user tool and it's not useful, all devs should +# here since it's not an end user tool and it's not useful. All devs should # at least understand basic English. # . /usr/lib/slitaz/libcook.sh diff -r 4721d19207ed -r 4b1f207c4058 cookiso --- a/cookiso Mon Jun 11 16:27:12 2012 +0000 +++ b/cookiso Wed Jun 20 23:17:27 2012 +0000 @@ -8,7 +8,7 @@ # --> cook.conf # SSH/RSA configuration to upload on a server. # Assign this before cook.conf so it can be -# reassign in cook.conf. +# reassigned in cook.conf. SSH_CMD="dbclient -i /root/.ssh/id_rsa.dropbear" SSH_ISO="/var/www/slitaz/mirror/iso" SSH_HOST="slitaz@mirror.slitaz.org" diff -r 4721d19207ed -r 4b1f207c4058 cross --- a/cross Mon Jun 11 16:27:12 2012 +0000 +++ b/cross Wed Jun 20 23:17:27 2012 +0000 @@ -24,7 +24,7 @@ Usage: $(basename $0) command --option Commands: - howto Man alike and howto + howto Man[like] page and howto info Display cross-tools info testsuite Execute a small testsuite check Check build host environment diff -r 4721d19207ed -r 4b1f207c4058 lib/libcook.sh --- a/lib/libcook.sh Mon Jun 11 16:27:12 2012 +0000 +++ b/lib/libcook.sh Wed Jun 20 23:17:27 2012 +0000 @@ -36,6 +36,7 @@ blocked="$cache/blocked" broken="$cache/broken" unbuild="$cache/unbuild" +wokrev="$cache/wokrev" cooknotes="$cache/cooknotes" crontabs="/var/spool/cron/crontabs/root" diff -r 4721d19207ed -r 4b1f207c4058 web/cooker.cgi --- a/web/cooker.cgi Mon Jun 11 16:27:12 2012 +0000 +++ b/web/cooker.cgi Wed Jun 20 23:17:27 2012 +0000 @@ -288,6 +288,17 @@ cat $WOK/$pkg/taz/*/library.list | sed "s|$pkg ||g" | sed 's| |\n|g' | sed '/^$/d' echo '' fi ;; + description=*) + pkg=${QUERY_STRING#description=} + echo "

Description of $pkg

" + dir=$(ls -d $WOK/$pkg/taz/$pkg-*) + if [ -s "$dir/description.txt" ]; then + echo '
'
+			cat $dir/description.txt
+			echo '
' + else + echo "
No description for: $pkg
" + fi ;; *) # We may have a toolchain.cgi script for cross cooker's if [ -f "toolchain.cgi" ]; then