tazlito rev 431
variable lzma history for russian dolls: 24-26 bits (again)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Sep 09 21:26:49 2016 +0200 (2016-09-09) |
parents | 000740da7eac |
children | 045897b5020e |
files | tazlito |
line diff
1.1 --- a/tazlito Sun Sep 04 10:27:19 2016 +0200 1.2 +++ b/tazlito Fri Sep 09 21:26:49 2016 +0200 1.3 @@ -270,7 +270,7 @@ 1.4 deduplicate 1.5 1.6 action 'Computing md5...' 1.7 - find * -type f ! -name md5sum ! -name 'vmlinuz*' -exec md5sum {} \; > md5sum 1.8 + find * -type f ! -name md5sum ! -name 'vmlinuz-*' -exec md5sum {} \; > md5sum 1.9 sed -i -e '/ boot\/isolinux\/isolinux.bin$/d' \ 1.10 -e '/ boot\/isolinux\/boot.cat$/d' md5sum 1.11 status 1.12 @@ -282,7 +282,8 @@ 1.13 make_bzImage_hardlink $2/boot 1.14 genisoimage -R -o $1 -hide-rr-moved -b boot/isolinux/isolinux.bin \ 1.15 -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 \ 1.16 - -V "$VOLUM_NAME" -p "$PREPARED" -input-charset utf-8 \ 1.17 + -V "{$VOLUM_NAME:-SliTaz}" -p "${PREPARED:-$(id -un)}" \ 1.18 + -input-charset utf-8 \ 1.19 -A "tazlito $VERSION/$(genisoimage --version)" \ 1.20 -copyright README -P "www.slitaz.org" -boot-info-table $2 1.21 if [ -x '/usr/bin/isohybrid' ]; then 1.22 @@ -348,14 +349,13 @@ 1.23 # sz=$(( $sz / 2 )) 1.24 # done 1.25 # echo $n 1.26 - [ ${LZMA_HISTORY_BITS:=23} -lt 26 ] && 1.27 - echo $((++LZMA_HISTORY_BITS)) || echo $LZMA_HISTORY_BITS 1.28 + echo ${LZMA_HISTORY_BITS:=24} 1.29 } 1.30 1.31 1.32 lzma_switches() { 1.33 local proc_num=$(grep -sc '^processor' /proc/cpuinfo) 1.34 - echo "-d$(lzma_history_bits $1) -mt${proc_num:-1}" 1.35 + echo "-d$(lzma_history_bits $1) -mt${proc_num:-1} -mc1000" 1.36 } 1.37 1.38 1.39 @@ -2402,6 +2402,7 @@ 1.40 gen_initramfs ${ROOTFS}$i 1.41 n=$(($n-1)) 1.42 i=$(($i-1)) 1.43 + export LZMA_HISTORY_BITS=26 1.44 done 1.45 mv $ROOTFS ${ROOTFS}$i 1.46 gen_initramfs ${ROOTFS}$i 1.47 @@ -2607,22 +2608,7 @@ 1.48 touch /tmp/.write-iso 1.49 newline 1.50 cd $DISTRO 1.51 - _ 'Generating ISO image...' 1.52 - genisoimage -R -o $ISO_NAME.iso -b boot/isolinux/isolinux.bin \ 1.53 - -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 \ 1.54 - -V "SliTaz" -p "$(id -un)" -input-charset utf-8 -hide-rr-moved \ 1.55 - -A "tazlito $VERSION/$(genisoimage --version)" -P "$(hostname)" \ 1.56 - -boot-info-table $ROOTCD 1.57 - if [ -x /usr/bin/isohybrid ]; then 1.58 - action 'Creating hybrid ISO/disk...' 1.59 - /usr/bin/isohybrid $ISO_NAME.iso -entry 2 2>/dev/null 1.60 - status 1.61 - fi 1.62 - if [ -x /usr/bin/iso2exe ]; then 1.63 - action 'Creating hybrid ISO/EXE...' 1.64 - /usr/bin/iso2exe $ISO_NAME.iso 2>/dev/null 1.65 - status 1.66 - fi 1.67 + create_iso $ISO_NAME.iso $ROOTCD 1.68 action 'Creating the ISO md5sum...' 1.69 md5sum $ISO_NAME.iso > $ISO_NAME.md5 1.70 status