wok-current rev 20861
syslinux: fix iso2exe
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Feb 22 15:37:43 2019 +0100 (2019-02-22) |
parents | 2cb24e6379d5 |
children | 28518eba2c9c |
files | syslinux/stuff/iso2exe/Makefile syslinux/stuff/iso2exe/bootiso.S syslinux/stuff/iso2exe/iso2exe.sh |
line diff
1.1 --- a/syslinux/stuff/iso2exe/Makefile Fri Feb 22 12:22:33 2019 +0100 1.2 +++ b/syslinux/stuff/iso2exe/Makefile Fri Feb 22 15:37:43 2019 +0100 1.3 @@ -16,7 +16,7 @@ 1.4 iso2exe: iso2exe.sh boot.com bootiso.bin init.built win32.exe 1.5 cp iso2exe.sh $@ 1.6 chmod +x $@ 1.7 - ./$@ --build boot.com bootiso.bin init win32.exe 1.8 + ./$@ --build boot.com bootiso.bin win32.exe init 1.9 1.10 init.built: bootloader.bin ifmem.bin init 1.11 ./init --build
2.1 --- a/syslinux/stuff/iso2exe/bootiso.S Fri Feb 22 12:22:33 2019 +0100 2.2 +++ b/syslinux/stuff/iso2exe/bootiso.S Fri Feb 22 15:37:43 2019 +0100 2.3 @@ -178,7 +178,7 @@ 2.4 ret 2.5 .org 0x7E00 2.6 2.7 - .org 0x7F81 2.8 + .org 0x7F83 2.9 ////////////////////////////// DOS EXE code /////////////////////////////////// 2.10 2.11 exestart: 2.12 @@ -199,8 +199,7 @@ 2.13 jc tst386 2.14 abort: 2.15 goputs: 2.16 - mov $EXEADRS(puts), %si 2.17 - jmp %si 2.18 + jmp puts 2.19 2.20 tst386: 2.21 pushw %sp
3.1 --- a/syslinux/stuff/iso2exe/iso2exe.sh Fri Feb 22 12:22:33 2019 +0100 3.2 +++ b/syslinux/stuff/iso2exe/iso2exe.sh Fri Feb 22 15:37:43 2019 +0100 3.3 @@ -152,7 +152,8 @@ 3.4 x=$((512*(1+$(get 417 "$ISO" 1)))) 3.5 [ $x -gt 32768 ] && x=6656 3.6 stub=$(($(get 20 "$ISO") - 0xC0)) 3.7 - [ $stub -gt 30000] && dosstub=$stub || dosstub= 3.8 + dosstub=$stub 3.9 + [ $stub -lt 30000 ] && stub=$((0x7FF0)) && dosstub= 3.10 c=$(custom_config_sector "$ISO") 3.11 SIZE=0; OFFSET=0 3.12 case "$1" in