tazwok rev 334
Last commit here: tazwok is no more experimental
| author | Antoine Bodin <gokhlayeh@slitaz.org> |
|---|---|
| date | Tue Feb 22 01:56:15 2011 +0100 (2011-02-22) |
| parents | 8ededfb1d957 |
| children | 30fbac111125 |
| files | chroot-scripts/cook-toolchain chroot-scripts/gen-iso doc/tazwok.html examples/cooklists/base-apps.cooklist examples/cooklists/base-ncurses.cooklist examples/cooklists/base-system.cooklist examples/cooklists/gtk+.cooklist examples/cooklists/x-window.cooklist examples/receipt examples/tazwok.conf update-repository web/index.php |
line diff
1.1 --- a/chroot-scripts/cook-toolchain Sun Feb 20 19:56:03 2011 +0100 1.2 +++ b/chroot-scripts/cook-toolchain Tue Feb 22 01:56:15 2011 +0100 1.3 @@ -14,7 +14,7 @@ 1.4 report step "Initializing tools & environment" 1.5 1.6 # Theses fours packages will be needed later. 1.7 -for p in libtaz tazwok-experimental slitaz-base-files tazpkg; do 1.8 +for p in libtaz tazwok slitaz-base-files tazpkg; do 1.9 tazwok cook $p 1.10 done 1.11 1.12 @@ -108,7 +108,7 @@ 1.13 mkdir -p /tmp/backup/var/lib/tazpkg 1.14 sed 's/^AUTO_INSTALL_DEPS="yes"/AUTO_INSTALL_DEPS="no"/' -i \ 1.15 /etc/slitaz/tazpkg.conf 1.16 -BASE_PKGS="tazpkg tazwok-experimental slitaz-base-files libtaz" 1.17 +BASE_PKGS="tazpkg tazwok slitaz-base-files libtaz" 1.18 for i in $BASE_PKGS; do 1.19 echo N | tazpkg get-install $i --root=/tmp/backup --forced 1.20 done 1.21 @@ -166,6 +166,6 @@ 1.22 # of the presence of new executables even if they're first in 1.23 # $PATH. 1.24 1.25 -cat /tmp/toolchain.list | while read PACKAGE; do 1.26 +cat /tmp/cooklist | while read PACKAGE; do 1.27 tazwok cook $PACKAGE || exit 1 1.28 done
2.1 --- a/chroot-scripts/gen-iso Sun Feb 20 19:56:03 2011 +0100 2.2 +++ b/chroot-scripts/gen-iso Tue Feb 22 01:56:15 2011 +0100 2.3 @@ -1,5 +1,5 @@ 2.4 #!/bin/sh 2.5 -# Little script to cook flavor in tazwok-experimental' chroot waiting 2.6 +# Little script to cook flavor in tazwok chroot waiting 2.7 # for something more consistent into tazlito. 2.8 2.9 [ "$1" ] || { echo "Usage: gen-iso flavorname [gzip]" >&2; exit 1; }
3.1 --- a/doc/tazwok.html Sun Feb 20 19:56:03 2011 +0100 3.2 +++ b/doc/tazwok.html Tue Feb 22 01:56:15 2011 +0100 3.3 @@ -41,7 +41,7 @@ 3.4 3.5 <h2>AVERTISSEMENT</h2> 3.6 <p> 3.7 -Cette version de tazwok (tazwok-experimental) est actuellement sujette 3.8 +Cette version de tazwok (tazwok-3.9.*) est actuellement sujette 3.9 à un développement actif et certaine parties de programme n'ont pas 3.10 encore été complétement revues et corrigées. Dans son état actuel, 3.11 vous ne devriez cependant pas rencontrer de problème majeur durant son
4.1 --- a/examples/cooklists/base-apps.cooklist Sun Feb 20 19:56:03 2011 +0100 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,20 +0,0 @@ 4.4 -bc 4.5 -zlib 4.6 -zlib-dev 4.7 -pcre 4.8 -pcre-dev 4.9 -e2fsprogs 4.10 -dropbear 4.11 -lighttpd 4.12 -iptables 4.13 -sqlite 4.14 -sqlite-dev 4.15 -libcap 4.16 -libcap-dev 4.17 -cdrkit 4.18 -cpio 4.19 -microperl 4.20 -module-init-tools 4.21 -ppp 4.22 -rsync 4.23 -tazpkg
5.1 --- a/examples/cooklists/base-ncurses.cooklist Sun Feb 20 19:56:03 2011 +0100 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,9 +0,0 @@ 5.4 -ncurses 5.5 -clex 5.6 -nano 5.7 -retawq 5.8 -htop 5.9 -dialog 5.10 -ninvaders 5.11 -bastet 5.12 -rhapsody
6.1 --- a/examples/cooklists/base-system.cooklist Sun Feb 20 19:56:03 2011 +0100 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,5 +0,0 @@ 6.4 -slitaz-base-files 6.5 -busybox 6.6 -glibc-base 6.7 -linux 6.8 -syslinux
7.1 --- a/examples/cooklists/gtk+.cooklist Sun Feb 20 19:56:03 2011 +0100 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,5 +0,0 @@ 7.4 -cairo 7.5 -glib 7.6 -pango 7.7 -atk 7.8 -gtk+
8.1 --- a/examples/cooklists/x-window.cooklist Sun Feb 20 19:56:03 2011 +0100 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,35 +0,0 @@ 8.4 -expat 8.5 -freetype 8.6 -fontconfig 8.7 -xorg-randrproto 8.8 -xorg-renderproto 8.9 -xorg-inputproto 8.10 -xorg-kbproto 8.11 -xorg-xcmiscproto 8.12 -xorg-xextproto 8.13 -xorg-xproto 8.14 -xorg-xtrans 8.15 -xorg-libXdmcp 8.16 -xorg-libX11 8.17 -xorg-libXrender 8.18 -xorg-libICE 8.19 -xorg-libSM 8.20 -xorg-libXau 8.21 -xorg-libXaw 8.22 -xorg-libXext 8.23 -xorg-libXft 8.24 -xorg-libXmu 8.25 -xorg-libXinerama 8.26 -xorg-libXp 8.27 -xorg-libXpm 8.28 -xorg-libXt 8.29 -xorg-libXcursor 8.30 -xorg-libXi 8.31 -xorg-libfontenc 8.32 -xorg-rgb 8.33 -xorg-xload 8.34 -xterm 8.35 -libpng 8.36 -jwm 8.37 -jpeg 8.38 -tiff
9.1 --- a/examples/receipt Sun Feb 20 19:56:03 2011 +0100 9.2 +++ b/examples/receipt Tue Feb 22 01:56:15 2011 +0100 9.3 @@ -13,12 +13,7 @@ 9.4 compile_rules() 9.5 { 9.6 cd $src 9.7 - ./configure \ 9.8 - --prefix=/usr \ 9.9 - --infodir=/usr/share/info \ 9.10 - --mandir=/usr/share/man \ 9.11 - $CONFIGURE_ARGS && 9.12 - make -j 4 && make DESTDIR=$PWD/_pkg install 9.13 + ./configure && make && make install 9.14 } 9.15 9.16 # Rules to gen a SliTaz package suitable for Tazpkg.
10.1 --- a/examples/tazwok.conf Sun Feb 20 19:56:03 2011 +0100 10.2 +++ b/examples/tazwok.conf Tue Feb 22 01:56:15 2011 +0100 10.3 @@ -120,7 +120,7 @@ 10.4 # but which are not in the core temporary toolchain. 10.5 # Note : order is not important here. 10.6 SLITAZ_TOOLCHAIN_EXTRA="tazpkg 10.7 -tazwok-experimental 10.8 +tazwok 10.9 pkg-config 10.10 libtool 10.11 libpthread-stubs"
11.1 --- a/update-repository Sun Feb 20 19:56:03 2011 +0100 11.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 11.3 @@ -1,80 +0,0 @@ 11.4 -#!/bin/sh 11.5 - 11.6 -if ! [ "$1" ]; then 11.7 - echo "Usage: update-repository LOCAL_REPOSITORY (i.e.: /home/slitaz/experimental)" 11.8 - exit 11.9 -fi 11.10 - 11.11 -WOK=$1/wok 11.12 -SOURCES_REPOSITORY=$1/src 11.13 -LOG_DIR=$1/log 11.14 -PACKAGES_REPOSITORY=$1/packages 11.15 -INCOMING_REPOSITORY=$1/packages-incoming 11.16 - 11.17 -if [ -d "$WOK" ] && [ -d "$SOURCES_REPOSITORY" ] && [ -d "$LOG_DIR" ] && \ 11.18 - [ -d "$PACKAGES_REPOSITORY" ] && [ -d "$INCOMING_REPOSITORY" ]; then 11.19 - rm -f $SOURCES_REPOSITORY/sources.list 11.20 -else 11.21 - echo "$1 doesn't looks like a LOCAL_REPOSITORY: it doesn't contains one or several of theses directories: 11.22 - * $WOK 11.23 - * $SOURCES_REPOSITORY 11.24 - * $PACKAGES_REPOSITORY 11.25 - * $INCOMING_REPOSITORY 11.26 - * $LOG_DIR" 11.27 - exit 11.28 -fi 11.29 - 11.30 -echo "Updating logs files..." 11.31 -cd $LOG_DIR 11.32 -for i in *.html; do 11.33 - sed 's~file:///usr/share/slitaz/web~web~' -i $i 11.34 -done 11.35 -[ -L web ] || ln -s /usr/share/slitaz/web web 11.36 -echo "Update done: you can now use 'tazwok webserver on' to add you're repository to webinterface. 11.37 -If you use the path by default, it will be available at: http://localhost/vhosts/bb 11.38 -This command need lighttpd & php installed to be used." 11.39 - 11.40 -echo " 11.41 -Changing sources pathes according new changes into tazwok-experimental and generating $SOURCES_REPOSITORY/sources.list." 11.42 -cd $WOK 11.43 -for i in *; do 11.44 - unset PACKAGE SOURCE VERSION WGET_URL TARBALL 11.45 - source $i/receipt 11.46 - [ "$WGET_URL" ] || continue 11.47 - # Check that source is at the good location; if not move it or remove it if it's a duplicate. 11.48 - if [ "$SOURCE" ]; then 11.49 - if [ -f "$SOURCES_REPOSITORY/$PACKAGE-$VERSION.tar.lzma" ]; then 11.50 - if [ -f "$SOURCES_REPOSITORY/$SOURCE-$VERSION.tar.lzma" ]; then 11.51 - rm $SOURCES_REPOSITORY/$PACKAGE-$VERSION.tar.lzma 11.52 - else 11.53 - mv $SOURCES_REPOSITORY/$PACKAGE-$VERSION.tar.lzma $SOURCES_REPOSITORY/$SOURCE-$VERSION.tar.lzma 11.54 - fi 11.55 - fi 11.56 - fi 11.57 - if grep -q "^$PACKAGE | $VERSION" $PACKAGES_REPOSITORY/packages.desc; then 11.58 - main_version="$VERSION" 11.59 - if [ -f $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma ]; then 11.60 - echo -e "$PACKAGE:main\t${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" >> $SOURCES_REPOSITORY/sources.list 11.61 - elif [ -f "SOURCES_REPOSITORY/$TARBALL" ]; then 11.62 - echo -e "$PACKAGE:main\t$TARBALL" >> $SOURCES_REPOSITORY/sources.list 11.63 - fi 11.64 - else 11.65 - # May not works if package use extraversion. 11.66 - main_version=$(grep -m1 -A1 -sh ^$PACKAGE$ $PACKAGES_REPOSITORY/packages.txt | tail -1 | sed 's/ *//') 11.67 - if [ -f $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$main_version.tar.lzma ]; then 11.68 - echo -e "$PACKAGE:main\t${SOURCE:-$PACKAGE}-$main_version.tar.lzma" >> $SOURCES_REPOSITORY/sources.list 11.69 - else 11.70 - unset main_version 11.71 - fi 11.72 - fi 11.73 - if [ ! "$main_version" ] || grep -q "^$PACKAGE | $VERSION" $INCOMING_REPOSITORY/packages.desc; then 11.74 - if [ -f $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma ]; then 11.75 - echo -e "$PACKAGE:incoming\t${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" >> $SOURCES_REPOSITORY/sources.list 11.76 - elif [ -f "SOURCES_REPOSITORY/$TARBALL" ]; then 11.77 - echo -e "$PACKAGE:incoming\t$TARBALL" >> $SOURCES_REPOSITORY/sources.list 11.78 - fi 11.79 - fi 11.80 -done 11.81 -echo "Done." 11.82 -echo " 11.83 -You can check/purge old sources tarball and sources tarball unrelated to wok receipts using 'tazwok clean-src'"
12.1 --- a/web/index.php Sun Feb 20 19:56:03 2011 +0100 12.2 +++ b/web/index.php Tue Feb 22 01:56:15 2011 +0100 12.3 @@ -92,7 +92,7 @@ 12.4 <div id="block_top"> 12.5 <h1>Build Bot</h1> 12.6 <p> 12.7 - Tazwok-experimental is a <a href="http://www.slitaz.org/">SliTaz GNU/Linux</a> 12.8 + Tazwok is a <a href="http://www.slitaz.org/">SliTaz GNU/Linux</a> 12.9 Build Bot, it automatically cooks and tests packages commited in 12.10 the wok. SliTaz <a href="http://pkgs.slitaz.org/">packages</a> are 12.11 cooked on the project main server: code name