wok-6.x rev 24157
rsync: lz4 & zstd support
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Dec 11 16:16:51 2021 +0000 (2021-12-11) |
parents | 352993bf2f20 |
children | 072e91636362 |
files | linld/stuff/src/_BEG.ASM memtest/stuff/unlzma.S rsync/receipt syslinux/stuff/iso2exe/iso2exe.sh |
line diff
1.1 --- a/linld/stuff/src/_BEG.ASM Wed Dec 08 09:15:20 2021 +0100 1.2 +++ b/linld/stuff/src/_BEG.ASM Sat Dec 11 16:16:51 2021 +0000 1.3 @@ -271,7 +271,7 @@ 1.4 inc ax 1.5 cpuid ; again cause of Nasty EMM386s 1.6 push eax 1.7 - shr edx,1+26 ; test bit 26 (sse2), clear bit 29 (lm) 1.8 + shr edx,1+26 ; test bit 26 (sse2), clear bit 29 (tm/lm confusion) 1.9 jnc baseInfo 1.10 else 1.11 jne @@no_cpuid ; CPUID feature bit changed ?
2.1 --- a/memtest/stuff/unlzma.S Wed Dec 08 09:15:20 2021 +0100 2.2 +++ b/memtest/stuff/unlzma.S Sat Dec 11 16:16:51 2021 +0000 2.3 @@ -107,6 +107,7 @@ 2.4 2.5 mov $ws1, CX 2.6 #ifdef ONLY8086 2.7 + .arch i8086 2.8 movw $2048/2, %ax 2.9 lzd1: 2.10 pushw %ax 2.11 @@ -213,9 +214,13 @@ 2.12 add BX, DX 2.13 #endif 2.14 2.15 +#if PROP_LC == 0 && PROP_LP == 0 2.16 + mov $1846, AX 2.17 +#else 2.18 movb $3, %ah 2.19 mul BX // dx = 3*bh 2.20 add $1846, AX 2.21 +#endif 2.22 2.23 // int symbol = 1; 2.24
3.1 --- a/rsync/receipt Wed Dec 08 09:15:20 2021 +0100 3.2 +++ b/rsync/receipt Sat Dec 11 16:16:51 2021 +0000 3.3 @@ -14,8 +14,9 @@ 3.4 TAGS="sync copy secure" 3.5 HOST_ARCH="i486 arm" 3.6 3.7 -DEPENDS="popt attr acl xxhash-lib" 3.8 -BUILD_DEPENDS="popt-dev attr-dev acl-dev xxhash-dev" 3.9 +DEPENDS="popt attr acl xxhash-lib lz4-lib zstd" 3.10 +BUILD_DEPENDS="popt-dev attr-dev acl-dev xxhash-dev lz4-dev zstd-dev" 3.11 +SUGGESTED="bash openssl" 3.12 3.13 # TazPanel 3.14 TAZPANEL_DAEMON="man::rsync|help::rsync|edit|options|web::$WEB_SITE" 3.15 @@ -35,8 +36,6 @@ 3.16 --disable-iconv \ 3.17 --disable-iconv-open \ 3.18 --disable-openssl \ 3.19 - --disable-zstd \ 3.20 - --disable-lz4 \ 3.21 $CONFIGURE_ARGS 3.22 sed -i -e 's/HAVE_ICONV_H ./HAVE_ICONV_H 0/' \ 3.23 -e 's/HAVE_ICONV_OPEN ./HAVE_ICONV_OPEN 0/' config.h
4.1 --- a/syslinux/stuff/iso2exe/iso2exe.sh Wed Dec 08 09:15:20 2021 +0100 4.2 +++ b/syslinux/stuff/iso2exe/iso2exe.sh Sat Dec 11 16:16:51 2021 +0000 4.3 @@ -43,7 +43,7 @@ 4.4 TMP=/tmp/iso2exe$$ 4.5 mkdir -p $TMP/mnt 4.6 mount -o loop,ro $1 $TMP/mnt 4.7 - if [ $2 = --array ] || grep -qs rootfs $TMP/mnt/boot/isolinux/isolinux.cfg ; then 4.8 + if [ "$2" = "--array" ] || grep -qs rootfs $TMP/mnt/boot/isolinux/isolinux.cfg ; then 4.9 $0 --get rootfs.gz > $TMP/rootfs.gz 4.10 SIZE=$(wc -c < $TMP/rootfs.gz) 4.11 store 24 $SIZE $1 4.12 @@ -109,7 +109,7 @@ 4.13 mount -o loop,ro $1 /tmp/mnt$$ 4.14 if [ -s /tmp/mnt$$/boot/linld.com ]; then 4.15 i=$(($(get 20 $1)-0xC0)) 4.16 - store $(($i-6)) $(($(stat -m /tmp/mnt$$/boot/linld.com | sed q)*2048)) $1 32 4.17 + store $(($i-6)) $(($(busybox stat -m /tmp/mnt$$/boot/linld.com | sed q)*2048)) $1 32 4.18 store $(($i-2)) $(stat -c %s /tmp/mnt$$/boot/linld.com) $1 4.19 r="$(sed '/rootfs[0-9]/!d;s|.* initrd=||;s|/boot/||g;s| .*||' \ 4.20 /tmp/mnt$$/boot/isolinux/isolinux.cfg | tail -n1)" 4.21 @@ -235,7 +235,7 @@ 4.22 f=$((0x$(od -An -N 4 -j $(($o+8)) -t x1 "$1" | sed 's/ //g'))) 4.23 l=$((0x$(od -An -N 4 -j $(($o+0x54)) -t x1 "$1" | sed 's/ //g'))) 4.24 printf " $i:%08X %08X %s\n" $f $l \ 4.25 - "$(ddq bs=1 skip=$(($o+16)) count=32 if="$1")" 4.26 + "$(ddq bs=1 skip=$(($o+16)) count=32 if="$1" | strings -n 1)" 4.27 o=$(($o+2048)) 4.28 i=$(($i+1)) 4.29 done