tazwok rev 445 4.3
Merge changes from default
| author | Antoine Bodin <gokhlayeh@slitaz.org> |
|---|---|
| date | Tue Mar 15 01:44:17 2011 +0100 (2011-03-15) |
| parents | 20352491a9df d1f0d5d127a7 |
| children | 068d36bf2a03 |
| files | tazwok |
line diff
1.1 --- a/.hgtags Mon Mar 14 05:02:00 2011 +0100 1.2 +++ b/.hgtags Tue Mar 15 01:44:17 2011 +0100 1.3 @@ -21,3 +21,4 @@ 1.4 13e14fe449a3fd68126f9df0a0ed40a5dd5f98c6 4.2.4 1.5 433aa071e16c7f61966e426207dfa3f142859458 4.2.5 1.6 bf449151a34258e71f7ec0868f3e521d22995817 4.2.6 1.7 +ff412a1044b097a7fb095d22081245fbcb00a187 4.2.7
2.1 --- a/chroot-scripts/cook-toolchain Mon Mar 14 05:02:00 2011 +0100 2.2 +++ b/chroot-scripts/cook-toolchain Tue Mar 15 01:44:17 2011 +0100 2.3 @@ -18,13 +18,21 @@ 2.4 report step "Cooking temporary toolchain" 2.5 report open-bloc 2.6 2.7 -report step "Initializing tools & environment" 2.8 +report step "Configuring repositories" 2.9 +# Incoming packages as the only source for packages. 2.10 +rm -r /var/lib/tazpkg/undigest 2.11 +tazpkg setup-mirror $SLITAZ_DIR/${undigest:-$SLITAZ_VERSION}/packages-incoming 2.12 +tazpkg recharge 2.13 2.14 +report step "Refreshing SliTaz tools" 2.15 +report open-bloc 2.16 # These four packages will be needed later. 2.17 for p in libtaz tazwok slitaz-base-files tazpkg; do 2.18 tazwok cook $p 2.19 done 2.20 +report close-bloc 2.21 2.22 +report step "Setting up environnement" 2.23 set +h 2.24 umask 022 2.25 PS1='\u:\w\$ ' 2.26 @@ -42,11 +50,17 @@ 2.27 export LANG LC_ALL PATH PS1 MAKEFLAGS CONFIG_SITE 2.28 unset CC CXX CPP CFLAGS CXXFLAGS LD_LIBRARY_PATH LD_PRELOAD DESTDIR 2.29 2.30 +LOCAL_REPOSITORY=$SLITAZ_DIR/$SLITAZ_VERSION 2.31 +[ "$undigest" ] && LOCAL_REPOSITORY=$SLITAZ_DIR/$undigest 2.32 +WOK=$LOCAL_REPOSITORY/wok 2.33 + 2.34 # Create the dir for the temporary toolchain and link in root of host 2.35 # system. 2.36 -[ -d /tools ] && rm -r /tools 2.37 +rm -rf /tools 2.38 mkdir /tools 2.39 2.40 +report end-step 2.41 + 2.42 # Use some tweaked code from tazwok. 2.43 prepare_package() 2.44 { 2.45 @@ -58,11 +72,6 @@ 2.46 src=$WOK/$PACKAGE/$PACKAGE-$VERSION 2.47 cd $WOK/$PACKAGE 2.48 } 2.49 -LOCAL_REPOSITORY=$SLITAZ_DIR/$SLITAZ_VERSION 2.50 -[ "$undigest" ] && LOCAL_REPOSITORY=$SLITAZ_DIR/$undigest 2.51 -WOK=$LOCAL_REPOSITORY/wok 2.52 - 2.53 -report end-step 2.54 2.55 # Binutils and gcc need to be compiled twice. 2.56 for PACKAGE in binutils gcc; do 2.57 @@ -162,11 +171,6 @@ 2.58 # more robust & stable; in some cases it solves dependency 2.59 # loops. 2.60 2.61 -# Incoming packages as the only source for packages. 2.62 -rm -r /var/lib/tazpkg/undigest 2.63 -tazpkg setup-mirror $SLITAZ_DIR/${undigest:-$SLITAZ_VERSION}/packages-incoming 2.64 -tazpkg recharge 2.65 - 2.66 # Get toolchain cooklist. 2.67 tazwok gen-cooklist ${undigest:+--undigest=$undigest} > /tmp/toolchain.list 2.68 2.69 @@ -175,6 +179,6 @@ 2.70 # of the presence of new executables even if they're first in 2.71 # $PATH. 2.72 2.73 -cat /tmp/cooklist | while read PACKAGE; do 2.74 +cat /tmp/toolchain.list | while read PACKAGE; do 2.75 tazwok cook $PACKAGE || exit 1 2.76 done
3.1 --- a/tazwok Mon Mar 14 05:02:00 2011 +0100 3.2 +++ b/tazwok Tue Mar 15 01:44:17 2011 +0100 3.3 @@ -944,7 +944,7 @@ 3.4 # Remove .pyc and .pyo files from packages. 3.5 py_compiled_files_remove() 3.6 { 3.7 - report step "Removing all .pyc and .pyo files from package ..." 3.8 + report step "Removing all .pyc and .pyo files from package" 3.9 find $fs -type f -name "*.pyc" -delete 2>/dev/null 3.10 find $fs -type f -name "*.pyo" -delete 2>/dev/null 3.11 report end-step 3.12 @@ -2368,7 +2368,7 @@ 3.13 sed -e "s~^SLITAZ_DIR=.*~SLITAZ_DIR=\$SLITAZ_DIR~" \\ 3.14 -e "s/^SLITAZ_VERSION=.*/SLITAZ_VERSION=\$SLITAZ_VERSION/" \\ 3.15 -i \$chroot_dir/etc/slitaz/slitaz.conf 3.16 - echo "\$SLITAZ_VERSION" > /etc/slitaz-release 3.17 + echo \$SLITAZ_VERSION > \$chroot_dir/etc/slitaz-release 3.18 $( [ "$undigest" ] && echo ' echo "undigest='"$undigest"'" >> $chroot_dir/etc/slitaz/tazwok.conf') 3.19 sed 's/LC_ALL/LC_ALL=POSIX/' -i \$chroot_dir/etc/profile 3.20 3.21 @@ -2396,8 +2396,8 @@ 3.22 fi 3.23 ) 3.24 echo -e "\${LOCAL_REPOSITORY##*/}-incoming\nmain" > \$chroot_dir\$LOCALSTATE/priority 3.25 - mount -o bind proc \$chroot_dir/proc 3.26 - mount -o bind sys \$chroot_dir/sys 3.27 + mount -o bind /proc \$chroot_dir/proc 3.28 + mount -o bind /sys \$chroot_dir/sys 3.29 mount -o bind /dev/pts \$chroot_dir/dev/pts 3.30 mount -o bind /dev/shm \$chroot_dir/dev/shm 3.31 for dir in \$list_dir; do 3.32 @@ -2974,7 +2974,7 @@ 3.33 echo -e "\n$PACKAGE package tree already exists.\n" >&2 3.34 exit 1 3.35 fi 3.36 - echo "Creating : $WOK/$PACKAGE" 3.37 + echo "Creating : $clean_wok/$PACKAGE" 3.38 mkdir $clean_wok/$PACKAGE 3.39 cd $clean_wok/$PACKAGE 3.40 echo -n "Preparing the receipt..."
4.1 --- a/web/index.php Mon Mar 14 05:02:00 2011 +0100 4.2 +++ b/web/index.php Tue Mar 15 01:44:17 2011 +0100 4.3 @@ -19,7 +19,7 @@ 4.4 if (file_exists("$log_dir/$pkg.html")) 4.5 echo "<a href=\"log.php?version=$version&package=". 4.6 urlencode($pkg)."\" target=\"_blank\">$pkg</a>\n"; 4.7 - else echo "$pkg\n"; 4.8 + else if ($pkg != "") echo "$pkg\n"; 4.9 } 4.10 } 4.11 4.12 @@ -230,17 +230,13 @@ 4.13 <a name="Broken"></a> 4.14 <h3>Broken</h3> 4.15 <pre class="package"> 4.16 -<?php 4.17 -include_and_link("$db_dir/broken"); 4.18 -?> 4.19 +<?php include_and_link("$db_dir/broken"); ?> 4.20 </pre> 4.21 4.22 <a name="Blocked"></a> 4.23 <h3>Blocked</h3> 4.24 <pre class="package"> 4.25 -<?php 4.26 -include_and_link("$db_dir/blocked"); 4.27 -?> 4.28 +<?php include_and_link("$db_dir/blocked"); ?> 4.29 </pre> 4.30 4.31 <a name="cooked"></a>