wok rev 17812
syslinux/iso2exe: update partition table
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Mar 21 14:39:57 2015 +0100 (2015-03-21) |
parents | 57b29da0fd99 |
children | 19cc1578fb5c |
files | syslinux/stuff/iso2exe/Makefile syslinux/stuff/iso2exe/iso2exe.sh |
line diff
1.1 --- a/syslinux/stuff/iso2exe/Makefile Sat Mar 21 11:36:21 2015 +0100 1.2 +++ b/syslinux/stuff/iso2exe/Makefile Sat Mar 21 14:39:57 2015 +0100 1.3 @@ -9,11 +9,10 @@ 1.4 objcopy -O binary meminfo.o meminfo.exe 1.5 chmod +x $@ 1.6 1.7 -iso2exe: iso2exe.sh boot.com bootiso.bin init win32.exe ../mbr/isohdpfx.bin 1.8 - cp ../mbr/isohdpfx.bin . 1.9 +iso2exe: iso2exe.sh boot.com bootiso.bin init win32.exe 1.10 cp iso2exe.sh $@ 1.11 chmod +x $@ 1.12 - ./$@ --build boot.com bootiso.bin init win32.exe isohdpfx.bin 1.13 + ./$@ --build boot.com bootiso.bin init win32.exe 1.14 1.15 isohybrid.res: isohybrid.rc isohybrid.ico 1.16 i586-pc-mingw32-windres $< -O coff -o $@
2.1 --- a/syslinux/stuff/iso2exe/iso2exe.sh Sat Mar 21 11:36:21 2015 +0100 2.2 +++ b/syslinux/stuff/iso2exe/iso2exe.sh Sat Mar 21 14:39:57 2015 +0100 2.3 @@ -266,7 +266,7 @@ 2.4 esac 2.5 case "$(get 0 $1)" in 2.6 23117) echo "The file $1 is already an EXE file." 1>&2 && exit 1;; 2.7 - 0) $0 --get isohdpfx.bin | ddq bs=512 count=1 of=$1 conv=notrunc 2.8 + 0) [ -x /usr/bin/isohybrid ] && isohybrid $1;; 2.9 esac 2.10 2.11 echo "Read hybrid & tazlito data..."