tiny-slitaz rev 37

helper: don't build slitaz.iso twice
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Sep 26 17:11:06 2023 +0000 (7 months ago)
parents 49e3141e5899
children 410764dcf93a
files README.md helper step5.php
line diff
     1.1 --- a/README.md	Sun Sep 24 17:55:26 2023 +0000
     1.2 +++ b/README.md	Tue Sep 26 17:11:06 2023 +0000
     1.3 @@ -8,7 +8,7 @@
     1.4  Useful software, expansible, easy to configure, runs fully in RAM, simple, light
     1.5  and fast for minimum hardware resources, i.e. fits on one floppy disk (IDE disk
     1.6  optional), runs on a 386SX processor and needs as little memory as possible
     1.7 -(currently 4MB with a 2.6.14 Kernel).
     1.8 +(currently 4MB with a 2.6.20 Kernel).
     1.9  [Example](http://doc.slitaz.org/en:guides:pxe#why-use-pxe-the-vnc-example)
    1.10  
    1.11  
    1.12 @@ -20,8 +20,7 @@
    1.13  
    1.14  ## How is it built?
    1.15  
    1.16 -Tiny SliTaz uses a Linux Kernel and a root ram filesystem. An extra initramfs
    1.17 -can also be loaded with the configuration files and extra packages.
    1.18 +Tiny SliTaz uses a Linux Kernel and a initramfs.
    1.19  
    1.20  The initramfs is based on [uClibc](http://uclibc.org/) (instead of glibc) and
    1.21  busybox with its config files and filesystem tree from `base-tiny` package you
     2.1 --- a/helper	Sun Sep 24 17:55:26 2023 +0000
     2.2 +++ b/helper	Tue Sep 26 17:11:06 2023 +0000
     2.3 @@ -494,6 +494,7 @@
     2.4  	find . | grep -v ^./boot | cpio -o -H newc | compressto ../rootfs.gz rootfs
     2.5  fi
     2.6  if [ "x$1" = "x--mkiso" ]; then
     2.7 +	[ -s $tmp/slitaz.iso ] && exit 0
     2.8  	tmp=$2
     2.9  	mkdir -p $tmp/iso/boot/isolinux $tmp/iso/data
    2.10  	compressto $tmp/iso/data/sysmap.gz < $tmp/fs/boot/System.map
    2.11 @@ -534,14 +535,15 @@
    2.12  prompt 1	
    2.13  timeout 50
    2.14  EOT
    2.15 -	genisoimage -o $tmp/slitaz.iso -b boot/isolinux/isolinux.bin \
    2.16 +	genisoimage -o $tmp/slitaz.iso$$ -b boot/isolinux/isolinux.bin \
    2.17                  -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 \
    2.18                  -V "Tiny SliTaz" -p "www.slitaz.org" -input-charset iso8859-1 \
    2.19                  -boot-info-table $tmp/iso > /dev/null 2>&1
    2.20          [ -x /usr/bin/isohybrid ] &&
    2.21 -        /usr/bin/isohybrid $tmp/slitaz.iso 2> /dev/null
    2.22 +        /usr/bin/isohybrid $tmp/slitaz.iso$$ 2> /dev/null
    2.23          [ -x /usr/bin/iso2exe ] &&
    2.24 -        /usr/bin/iso2exe $tmp/slitaz.iso 2> /dev/null
    2.25 +        /usr/bin/iso2exe $tmp/slitaz.iso$$ 2> /dev/null
    2.26 +	mv $tmp/slitaz.iso$$ $tmp/slitaz.iso
    2.27  fi
    2.28  if [ "x$1" = "x--mkexe" ]; then
    2.29  	tmp=$2
    2.30 @@ -556,7 +558,7 @@
    2.31  		cp fs/boot/bzImage slitaz.img
    2.32  		sh fs/boot/bundle slitaz.img rootfs.gz
    2.33  		if [ -s fs/boot/bootmenu ]; then
    2.34 -			echo -n "sh fs/boot/bundle out '   SliTaz boot menu'"
    2.35 +			echo -n "sh fs/boot/bundle out '  Boot menu'"
    2.36  			echo -n " slitaz.img 'Tiny SliTaz'"
    2.37  			while read bin button text; do
    2.38  				echo -n " fs/boot/$bin '${text% (*}'"
     3.1 --- a/step5.php	Sun Sep 24 17:55:26 2023 +0000
     3.2 +++ b/step5.php	Tue Sep 26 17:11:06 2023 +0000
     3.3 @@ -31,10 +31,10 @@
     3.4        $use_optgroup=0;
     3.5        foreach(array("360K 5¼-inch" => "", "368640" => "360K", "409600" => "400K",
     3.6  		    "720K 3½-inch" => "", "737280" => "720K", "819200" => "800K",
     3.7 -      		    "1.2M 5¼-inch" => "", "1228800" => "1.2M",
     3.8 +      		    "1.2M 5¼-inch" => "", "1228800" => "1.2M", "1474560" => "1.44M",
     3.9        		    "1.44M 3½-inch" => "", "1474560" => "1.44M", "1720320" => "1.68M",
    3.10  		    "1966080" => "1.92M", 
    3.11 -		    "2.88M 3½-inch" => "", "2949120" => "2.88M", "5898240" => "3.36M") as $sz => $nm) {
    3.12 +		    "2.88M 3½-inch" => "", "2949120" => "2.88M", "3440640" => "3.36M") as $sz => $nm) {
    3.13  	if ($nm == "") {
    3.14  	  if ($use_optgroup != 0) echo "		</optgroup>\n";
    3.15  	  echo "		<optgroup label=\"$sz\">\n";