# HG changeset patch
# User Antoine Bodin <gokhlayeh@slitaz.org>
# Date 1300149857 -3600
# Node ID dcba89d8553d67b4903902a58c375bb04e7b6065
# Parent  20352491a9df0c5b82e3aec5d8f08f6abb425582# Parent  d1f0d5d127a77983cfc21e590358af9c6cda1bbf
Merge changes from default

diff -r 20352491a9df -r dcba89d8553d .hgtags
--- a/.hgtags	Mon Mar 14 05:02:00 2011 +0100
+++ b/.hgtags	Tue Mar 15 01:44:17 2011 +0100
@@ -21,3 +21,4 @@
 13e14fe449a3fd68126f9df0a0ed40a5dd5f98c6 4.2.4
 433aa071e16c7f61966e426207dfa3f142859458 4.2.5
 bf449151a34258e71f7ec0868f3e521d22995817 4.2.6
+ff412a1044b097a7fb095d22081245fbcb00a187 4.2.7
diff -r 20352491a9df -r dcba89d8553d chroot-scripts/cook-toolchain
--- a/chroot-scripts/cook-toolchain	Mon Mar 14 05:02:00 2011 +0100
+++ b/chroot-scripts/cook-toolchain	Tue Mar 15 01:44:17 2011 +0100
@@ -18,13 +18,21 @@
 report step "Cooking temporary toolchain"
 report open-bloc
 
-report step "Initializing tools & environment"
+report step "Configuring repositories"
+# Incoming packages as the only source for packages.
+rm -r /var/lib/tazpkg/undigest
+tazpkg setup-mirror $SLITAZ_DIR/${undigest:-$SLITAZ_VERSION}/packages-incoming
+tazpkg recharge
 
+report step "Refreshing SliTaz tools"
+report open-bloc
 # These four packages will be needed later.
 for p in libtaz tazwok slitaz-base-files tazpkg; do
 	tazwok cook $p
 done
+report close-bloc
 
+report step "Setting up environnement"
 set +h
 umask 022
 PS1='\u:\w\$ '
@@ -42,11 +50,17 @@
 export LANG LC_ALL PATH PS1 MAKEFLAGS CONFIG_SITE
 unset CC CXX CPP CFLAGS CXXFLAGS LD_LIBRARY_PATH LD_PRELOAD DESTDIR
 
+LOCAL_REPOSITORY=$SLITAZ_DIR/$SLITAZ_VERSION
+[ "$undigest" ] && LOCAL_REPOSITORY=$SLITAZ_DIR/$undigest
+WOK=$LOCAL_REPOSITORY/wok
+
 # Create the dir for the temporary toolchain and link in root of host 
 # system.
-[ -d /tools ] && rm -r /tools
+rm -rf /tools
 mkdir /tools
 
+report end-step
+
 # Use some tweaked code from tazwok.
 prepare_package()
 {
@@ -58,11 +72,6 @@
 	src=$WOK/$PACKAGE/$PACKAGE-$VERSION
 	cd $WOK/$PACKAGE
 }
-LOCAL_REPOSITORY=$SLITAZ_DIR/$SLITAZ_VERSION
-[ "$undigest" ] && LOCAL_REPOSITORY=$SLITAZ_DIR/$undigest
-WOK=$LOCAL_REPOSITORY/wok
-
-report end-step
 
 # Binutils and gcc need to be compiled twice.
 for PACKAGE in binutils gcc; do
@@ -162,11 +171,6 @@
 # more robust & stable; in some cases it solves dependency
 # loops.
 
-# Incoming packages as the only source for packages.
-rm -r /var/lib/tazpkg/undigest
-tazpkg setup-mirror $SLITAZ_DIR/${undigest:-$SLITAZ_VERSION}/packages-incoming
-tazpkg recharge
-
 # Get toolchain cooklist.
 tazwok gen-cooklist ${undigest:+--undigest=$undigest} > /tmp/toolchain.list
 
@@ -175,6 +179,6 @@
 # of the presence of new executables even if they're first in
 # $PATH.
 
-cat /tmp/cooklist | while read PACKAGE; do
+cat /tmp/toolchain.list | while read PACKAGE; do
 	tazwok cook $PACKAGE || exit 1
 done
diff -r 20352491a9df -r dcba89d8553d tazwok
--- a/tazwok	Mon Mar 14 05:02:00 2011 +0100
+++ b/tazwok	Tue Mar 15 01:44:17 2011 +0100
@@ -944,7 +944,7 @@
 # Remove .pyc and .pyo files from packages.
 py_compiled_files_remove()
 {
-	report step "Removing all .pyc and .pyo files from package ..."
+	report step "Removing all .pyc and .pyo files from package"
 	find $fs -type f -name "*.pyc" -delete 2>/dev/null
 	find $fs -type f -name "*.pyo" -delete 2>/dev/null
 	report end-step
@@ -2368,7 +2368,7 @@
 	sed -e "s~^SLITAZ_DIR=.*~SLITAZ_DIR=\$SLITAZ_DIR~" \\
 		-e "s/^SLITAZ_VERSION=.*/SLITAZ_VERSION=\$SLITAZ_VERSION/" \\
 		-i \$chroot_dir/etc/slitaz/slitaz.conf
-	echo "\$SLITAZ_VERSION" > /etc/slitaz-release
+	echo \$SLITAZ_VERSION > \$chroot_dir/etc/slitaz-release
 $( [ "$undigest" ] && echo '	echo "undigest='"$undigest"'" >> $chroot_dir/etc/slitaz/tazwok.conf')
 	sed 's/LC_ALL/LC_ALL=POSIX/' -i \$chroot_dir/etc/profile
 
@@ -2396,8 +2396,8 @@
 	fi
 	)
 	echo -e "\${LOCAL_REPOSITORY##*/}-incoming\nmain" > \$chroot_dir\$LOCALSTATE/priority
-	mount -o bind proc \$chroot_dir/proc
-	mount -o bind sys \$chroot_dir/sys
+	mount -o bind /proc \$chroot_dir/proc
+	mount -o bind /sys \$chroot_dir/sys
 	mount -o bind /dev/pts \$chroot_dir/dev/pts
 	mount -o bind /dev/shm \$chroot_dir/dev/shm 
 	for dir in \$list_dir; do
@@ -2974,7 +2974,7 @@
 			echo -e "\n$PACKAGE package tree already exists.\n" >&2
 			exit 1
 		fi
-		echo "Creating : $WOK/$PACKAGE"
+		echo "Creating : $clean_wok/$PACKAGE"
 		mkdir $clean_wok/$PACKAGE
 		cd $clean_wok/$PACKAGE
 		echo -n "Preparing the receipt..."
diff -r 20352491a9df -r dcba89d8553d web/index.php
--- a/web/index.php	Mon Mar 14 05:02:00 2011 +0100
+++ b/web/index.php	Tue Mar 15 01:44:17 2011 +0100
@@ -19,7 +19,7 @@
 		if (file_exists("$log_dir/$pkg.html"))
 			echo "<a href=\"log.php?version=$version&amp;package=".
 				urlencode($pkg)."\" target=\"_blank\">$pkg</a>\n";
-		else	echo "$pkg\n";
+		else if ($pkg != "") echo "$pkg\n";
 	}
 }
 
@@ -230,17 +230,13 @@
 <a name="Broken"></a>
 <h3>Broken</h3>
 <pre class="package">
-<?php
-include_and_link("$db_dir/broken");
-?>
+<?php include_and_link("$db_dir/broken"); ?>
 </pre>
 
 <a name="Blocked"></a>
 <h3>Blocked</h3>
 <pre class="package">
-<?php
-include_and_link("$db_dir/blocked");
-?>
+<?php include_and_link("$db_dir/blocked"); ?>
 </pre>
 
 <a name="cooked"></a>