wok-6.x rev 20860

xlockmore: tiny patch
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Feb 22 12:22:33 2019 +0100 (2019-02-22)
parents fcd3d43eadad
children 8b4447362fc3
files syslinux/stuff/iso2exe/bootiso.S syslinux/stuff/iso2exe/iso2exe.sh xlockmore/receipt
line diff
     1.1 --- a/syslinux/stuff/iso2exe/bootiso.S	Fri Feb 22 10:45:05 2019 +0100
     1.2 +++ b/syslinux/stuff/iso2exe/bootiso.S	Fri Feb 22 12:22:33 2019 +0100
     1.3 @@ -178,7 +178,7 @@
     1.4  	ret
     1.5  	.org	0x7E00
     1.6  
     1.7 -	.org	0x7F83
     1.8 +	.org	0x7F81
     1.9  ////////////////////////////// DOS EXE code ///////////////////////////////////
    1.10  
    1.11  exestart:
    1.12 @@ -199,7 +199,8 @@
    1.13  	jc	tst386
    1.14  abort:
    1.15  goputs:
    1.16 -	jmp	puts
    1.17 +	mov	$EXEADRS(puts), %si
    1.18 +	jmp	%si
    1.19  
    1.20  tst386:
    1.21  	pushw	%sp
     2.1 --- a/syslinux/stuff/iso2exe/iso2exe.sh	Fri Feb 22 10:45:05 2019 +0100
     2.2 +++ b/syslinux/stuff/iso2exe/iso2exe.sh	Fri Feb 22 12:22:33 2019 +0100
     2.3 @@ -152,6 +152,7 @@
     2.4  	x=$((512*(1+$(get 417 "$ISO" 1))))
     2.5  	[ $x -gt 32768 ] && x=6656
     2.6  	stub=$(($(get 20 "$ISO") - 0xC0))
     2.7 +	[ $stub -gt 30000] && dosstub=$stub || dosstub=
     2.8  	c=$(custom_config_sector "$ISO")
     2.9  	SIZE=0; OFFSET=0
    2.10  	case "$1" in
    2.11 @@ -169,7 +170,7 @@
    2.12  	rootfs.gz)	SIZE=$(get 24 "$ISO"); OFFSET=$(($stub - $SIZE));;
    2.13  	tazboot.com)	OFFSET=$(($(get 64 "$ISO") - 0xC0))
    2.14  			SIZE=$(($stub - $(get 24 "$ISO") - $OFFSET));;
    2.15 -	dosstub)	OFFSET=$stub; SIZE=$((0x7FF0 - $OFFSET));;
    2.16 +	dosstub)	[ "$dosstub" ] && OFFSET=$stub && SIZE=$((0x7FF0 - $OFFSET));;
    2.17  	boot.md5)	[ $(get 0 "$ISO") -eq 23117 ] &&
    2.18  			[ $(get 18 "$ISO") -ne 0 ] &&
    2.19  			OFFSET=$((0x7FF0)) && SIZE=16;;
    2.20 @@ -307,12 +308,13 @@
    2.21  	( cd $TMP; find dev init.exe | cpio -o -H newc ) | compress rootfs.gz
    2.22  	rm -rf $TMP
    2.23  	ls -l $@ rootfs.gz
    2.24 -	cat >> $0 <<EOM
    2.25 +	cp $0 $0.$$
    2.26 +	cat >> $0.$$ <<EOM
    2.27  $(tar cf - ${@/init/rootfs.gz} | compress | uuencode -m -)
    2.28  EOT
    2.29  EOM
    2.30 -	sed -i 's|[ \t]*###.*||;/^case/,/^esac/d' $0
    2.31 -	exit ;;
    2.32 +	sed -i 's|[ \t]*###.*||;/^case/,/^esac/d' $0.$$
    2.33 +	mv -f $0.$$ $0; exit ;;
    2.34  --get)
    2.35  	cat $2
    2.36  	exit ;;
     3.1 --- a/xlockmore/receipt	Fri Feb 22 10:45:05 2019 +0100
     3.2 +++ b/xlockmore/receipt	Fri Feb 22 12:22:33 2019 +0100
     3.3 @@ -17,6 +17,7 @@
     3.4  # Rules to configure and make the package.
     3.5  compile_rules()
     3.6  {
     3.7 +    sed -i 's|__GNUC_MINOR__ >= 4|__GNUC_MINOR__ >= 7|' modes/strange.c
     3.8      ./configure --prefix=/usr \
     3.9          --infodir=/usr/share/info \
    3.10          --mandir=/usr/share/man \