SliTaz Repositories

     1.1 --- a/mirror-tools/rootfs/usr/bin/rolling.sh	Mon Jun 20 19:40:46 2011 +0000
     1.2 +++ b/mirror-tools/rootfs/usr/bin/rolling.sh	Tue Aug 09 10:27:37 2011 +0200
     1.3 @@ -1,35 +1,41 @@
     1.4  #!/bin/sh
     1.5  
     1.6 -# Current root of web server
     1.7 -rootwww=/var/www/slitaz/mirror
     1.8 -packages=$rootwww/packages/cooking
     1.9 -
    1.10  # Location of slitaz rolling release
    1.11 -rolling=$rootwww/iso/rolling
    1.12 +rolling=/home/bellard/rolling
    1.13  
    1.14  flavor=core
    1.15 +packages=/home/slitaz/cooking/chroot/home/slitaz/packages
    1.16  
    1.17  # We use the last build as build environment
    1.18  system=$rolling/slitaz-*.iso
    1.19 -[ -s $system ] || system=$rootwww/iso/cooking/slitaz-cooking.iso
    1.20  
    1.21  # Build the rolling release if something is new on mirror
    1.22  if [ $packages/$flavor.flavor -nt $system -o \
    1.23       $packages/packages.list -nt $system ]; then
    1.24  	[ -d $rolling ] || mkdir -p $rolling
    1.25 -	TMP=/tmp/rolling$$
    1.26 -	mkdir -p $TMP/iso $TMP/fs/home/slitaz/cooking/packages
    1.27 -	ln $packages/* $TMP/fs/home/slitaz/cooking/packages
    1.28 +	TMP=$rolling/tmp$$
    1.29 +	mkdir -p $TMP/iso $TMP/fs/var/lib/tazpkg $TMP/fs/home/slitaz/cooking \
    1.30 +		 $TMP/fs/var/cache/tazpkg/cooking/packages
    1.31 +	mount --bind $packages $TMP/fs/var/cache/tazpkg/cooking/packages
    1.32 +	ln -s /var/cache/tazpkg/cooking/packages $TMP/fs/home/slitaz/cooking
    1.33 +	# 3.0 compatibility...
    1.34 +	ln -s cooking/packages $TMP/fs/home/slitaz/packages
    1.35 +	cp -a $packages/packages.* $TMP/fs/var/lib/tazpkg
    1.36 +	cp $packages/$flavor.flavor $TMP/fs
    1.37  	mount -o loop,ro $system $TMP/iso
    1.38  	for i in $TMP/iso/boot/rootfs*.gz ; do
    1.39  		unlzma -c $i | ( cd $TMP/fs ; cpio -id )
    1.40  	done
    1.41 +	[ -d $rolling/fixes ] && cp -a $rolling/fixes/. $TMP/fs/.
    1.42 +	echo "cooking" > $TMP/fs/etc/slitaz-release
    1.43  	umount -d $TMP/iso
    1.44  	cat > $TMP/fs/root/build.sh <<EOT
    1.45  #!/bin/sh
    1.46  
    1.47 +date
    1.48  tazlito get-flavor $flavor
    1.49 -echo -e "\n" | tazlito gen-distro
    1.50 +yes '' | tazlito gen-distro
    1.51 +date
    1.52  EOT
    1.53  	cat > $TMP/fs/BUILD <<EOT
    1.54  #!/bin/sh
    1.55 @@ -50,7 +56,14 @@
    1.56  done
    1.57  EOT
    1.58  	sh $TMP/fs/BUILD
    1.59 +	# 3.0 compatibility...
    1.60 +	[ -d $TMP/fs/home/slitaz/cooking/distro ] || 
    1.61 +	ln -s ../distro $TMP/fs/home/slitaz/cooking/distro
    1.62 +	umount $TMP/fs/var/cache/tazpkg/cooking/packages
    1.63  	mv -f $TMP/fs/home/slitaz/cooking/distro/slitaz-$flavor.* $rolling/
    1.64  	mv -f $TMP/slitaz-$flavor.log $rolling/
    1.65  	rm -rf $TMP
    1.66 +	rsync --bwlimit=40 -vP -e 'ssh -i /home/bellard/.ssh/id_rsa' \
    1.67 +		$rolling/slitaz-$flavor.* \
    1.68 +		bellard@mirror.slitaz.org:/var/www/slitaz/mirror/iso/rolling
    1.69  fi