tiny-slitaz diff helper @ 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 (14 months ago)
parents 49e3141e5899
children 410764dcf93a
line diff
     1.1 --- a/helper	Sun Sep 24 17:55:26 2023 +0000
     1.2 +++ b/helper	Tue Sep 26 17:11:06 2023 +0000
     1.3 @@ -494,6 +494,7 @@
     1.4  	find . | grep -v ^./boot | cpio -o -H newc | compressto ../rootfs.gz rootfs
     1.5  fi
     1.6  if [ "x$1" = "x--mkiso" ]; then
     1.7 +	[ -s $tmp/slitaz.iso ] && exit 0
     1.8  	tmp=$2
     1.9  	mkdir -p $tmp/iso/boot/isolinux $tmp/iso/data
    1.10  	compressto $tmp/iso/data/sysmap.gz < $tmp/fs/boot/System.map
    1.11 @@ -534,14 +535,15 @@
    1.12  prompt 1	
    1.13  timeout 50
    1.14  EOT
    1.15 -	genisoimage -o $tmp/slitaz.iso -b boot/isolinux/isolinux.bin \
    1.16 +	genisoimage -o $tmp/slitaz.iso$$ -b boot/isolinux/isolinux.bin \
    1.17                  -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 \
    1.18                  -V "Tiny SliTaz" -p "www.slitaz.org" -input-charset iso8859-1 \
    1.19                  -boot-info-table $tmp/iso > /dev/null 2>&1
    1.20          [ -x /usr/bin/isohybrid ] &&
    1.21 -        /usr/bin/isohybrid $tmp/slitaz.iso 2> /dev/null
    1.22 +        /usr/bin/isohybrid $tmp/slitaz.iso$$ 2> /dev/null
    1.23          [ -x /usr/bin/iso2exe ] &&
    1.24 -        /usr/bin/iso2exe $tmp/slitaz.iso 2> /dev/null
    1.25 +        /usr/bin/iso2exe $tmp/slitaz.iso$$ 2> /dev/null
    1.26 +	mv $tmp/slitaz.iso$$ $tmp/slitaz.iso
    1.27  fi
    1.28  if [ "x$1" = "x--mkexe" ]; then
    1.29  	tmp=$2
    1.30 @@ -556,7 +558,7 @@
    1.31  		cp fs/boot/bzImage slitaz.img
    1.32  		sh fs/boot/bundle slitaz.img rootfs.gz
    1.33  		if [ -s fs/boot/bootmenu ]; then
    1.34 -			echo -n "sh fs/boot/bundle out '   SliTaz boot menu'"
    1.35 +			echo -n "sh fs/boot/bundle out '  Boot menu'"
    1.36  			echo -n " slitaz.img 'Tiny SliTaz'"
    1.37  			while read bin button text; do
    1.38  				echo -n " fs/boot/$bin '${text% (*}'"