SliTaz Repositories

     1.1 --- a/mirror-tools/rootfs/usr/bin/mkpkgiso	Sun Sep 04 16:44:28 2011 +0200
     1.2 +++ b/mirror-tools/rootfs/usr/bin/mkpkgiso	Tue Sep 06 10:41:59 2011 +0200
     1.3 @@ -292,10 +292,10 @@
     1.4  f=$(ls $REPOS/$1-[0-9]*.tazpkg 2> /dev/null)
     1.5  [ -f "$f" ] || return 1
     1.6  [ -d $TEMP_DIR/boot ] || mkdir $TEMP_DIR/boot
     1.7 -( cd $TEMP_DIR/boot ; cpio -i fs.cpio.gz < $f 2> /dev/null ) 
     1.8 -( cd $TEMP_DIR/boot ; zcat fs.cpio.gz | cpio -id 2> /dev/null )
     1.9 +( cd $TEMP_DIR/boot ; cpio -i fs.cpio.gz fs.cpio.lzma < $f 2> /dev/null ) 
    1.10 +( cd $TEMP_DIR/boot ; { zcat fs.cpio.gz || unlzma -c fs.cpio.lzma ; } | cpio -id 2> /dev/null )
    1.11  mv $TEMP_DIR/boot/fs/boot/* $TEMP_DIR/boot
    1.12 -rm -rf $TEMP_DIR/boot/fs.cpio.gz $TEMP_DIR/boot/fs
    1.13 +rm -rf $TEMP_DIR/boot/fs.cpio.* $TEMP_DIR/boot/fs
    1.14  return 0
    1.15  }
    1.16  
    1.17 @@ -422,7 +422,9 @@
    1.18  
    1.19  cd ${ROOT}
    1.20  echo -n "Creating hybrid DVD/CDROM"
    1.21 -which isohybrid > /dev/null && isohybrid $IMAGE 2> /dev/null
    1.22 +ISOHYBRID=isohybrid.sh
    1.23 +which isohybrid > /dev/null && ISOHYBRID=isohybrid
    1.24 +which $ISOHYBRID > /dev/null && $ISOHYBRID $IMAGE 2> /dev/null
    1.25  status
    1.26  
    1.27  echo -n "Calculating md5sum"

     2.1 --- a/mirror-tools/rootfs/usr/bin/rolling.sh	Sun Sep 04 16:44:28 2011 +0200
     2.2 +++ b/mirror-tools/rootfs/usr/bin/rolling.sh	Tue Sep 06 10:41:59 2011 +0200
     2.3 @@ -3,7 +3,7 @@
     2.4  # Location of slitaz rolling release
     2.5  rolling=/home/bellard/rolling
     2.6  
     2.7 -flavors="core-4in1 core"
     2.8 +flavors="core-4in1 core preinit"
     2.9  packages=/home/slitaz/cooking/chroot/home/slitaz/packages
    2.10  
    2.11  # We use the last build as build environment
    2.12 @@ -11,7 +11,8 @@
    2.13  
    2.14  # Build the rolling release if something is new on mirror
    2.15  for flavor in $flavors ; do
    2.16 -    if [ $packages/$flavor.flavor -nt $rolling/slitaz-$flavor.iso -o \
    2.17 +    if [ ! -s $rolling/slitaz-$flavor.iso \
    2.18 +	 $packages/$flavor.flavor -nt $rolling/slitaz-$flavor.iso -o \
    2.19           $packages/packages.list -nt $rolling/slitaz-$flavor.iso ]; then
    2.20  	[ -d $rolling ] || mkdir -p $rolling
    2.21  	TMP=$rolling/tmp$$