# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1527671435 -7200
# Node ID f582dbc28a1099de4f5d7426101dd547d624ee01
# Parent  1120b81aab323f81b0bd8df887e528c438729bda
syslinux:isohybrid.sh/iso2exe.sh rework GPT partition

diff -r 1120b81aab32 -r f582dbc28a10 syslinux/stuff/iso2exe/iso2exe.sh
--- a/syslinux/stuff/iso2exe/iso2exe.sh	Tue May 29 10:57:28 2018 +0200
+++ b/syslinux/stuff/iso2exe/iso2exe.sh	Wed May 30 11:10:35 2018 +0200
@@ -116,10 +116,10 @@
 		ddq if=/tmp/exe$$ bs=1 count=3 skip=$((0x7C00)) of=$1 seek=$i conv=notrunc
 	fi
 	rm -f /tmp/exe$$ /tmp/coff$$
-	if [ -z "$RECURSIVE_PARTITION" -a $(get 470 $1 4) -eq 0 ]; then
-		store 464 $((1+$i/512)) $1 8
-		store 470 $(($i/512)) $1 8
-		store 474 $(($(get 474 $1 4) - $i/512)) $1 32
+	if [ -z "$RECURSIVE_PARTITION" -a $(get 454 $1 4) -eq 0 ]; then
+		store 448 $((1+$i/512)) $1 8
+		store 454 $(($i/512)) $1 8
+		store 458 $(($(get 458 $1 4) - $i/512)) $1 32
 	fi
 }
 
@@ -204,19 +204,19 @@
 			printf " $i:%08X  %08X  %02X\n" $OFFSET $SIZE \
 				$(get $((446+4+16*i)) "$1" 1)
 		done
-		if [ $(get 466 "$1") -eq 65263 ]; then
+		if [ $(get 450 "$1") -eq 65262 ]; then
 			echo "EFI partitions :"
-			n=$(get 584 "$1" 1)
+			n=$(get 592 "$1")
 			s=$(get 596 "$1")
-			o=$((($(get 552 "$1" 1)*512)-($(get 592 "$1")*$s)))
+			o=$(($(get 584 "$1")*512))
 			i=0
-			while [ $n -gt $i ]; do
+			while [ $i -lt $n ]; do
 				f=$(get $(($o+0x20)) "$1" 4)
 				l=$(($(get $(($o+0x28)) "$1" 4)-$f))
 				[ $l -eq 0 ] && break
 				printf " $i:%08X  %08X  %s\n" $f $(($l+1)) \
-				"$(od -An -N 36 -w -j $(($o+0x38)) -t a "$1" \
-				 | sed 's/\( nul\)*//g;s/   //g;s/ sp//')"
+				"$(od -An -N 72 -w72 -j $(($o+0x38)) -t a "$1" \
+				 | sed 's/ nul//g;s/   //g;s/ sp//g')"
 				o=$(($o+$s))
 				i=$(($i+1))
 			done
@@ -552,7 +552,7 @@
 	0)	[ -x /usr/bin/isohybrid ] && isohybrid -entry 2 $1;;
 	esac
 
-	gpt= ; [ $(get 466 $1) -eq 65263 ] && gpt=1
+	gpt= ; [ $(get 450 $1) -eq 65262 ] && gpt=1
 	mac= ; [ $(get 2048 $1) -eq 19792 ] && mac=1
 	echo "Read hybrid & tazlito data..."
 	if [ -n "$gpt" ]; then
diff -r 1120b81aab32 -r f582dbc28a10 syslinux/stuff/tools/isohybrid.sh
--- a/syslinux/stuff/tools/isohybrid.sh	Tue May 29 10:57:28 2018 +0200
+++ b/syslinux/stuff/tools/isohybrid.sh	Wed May 30 11:10:35 2018 +0200
@@ -196,20 +196,20 @@
 	sectorcount=$(($cylinders * $heads * $sectors))
 	store32 $(($e + 12)) $sectorcount
 	if [ -n "$efi_ofs" ]; then
+		lastlba=$(($sectorcount -1))
 		[ $(read16 0 1024) -eq 35615 -a $(read16 11 0) -ne 35615 ] &&
 		ddq bs=512 conv=notrunc skip=2 seek=44 count=20 if=$iso of=$iso
 		store32 $((446)) $((0x10000))
 		store32 $((446+4)) $((0xFFFFFEEE))
-		store32 $((446+8)) $efi_ofs
-		store32 $((446+12)) $efi_len
+		store32 $((446+8)) 1
+		store32 $((446+12)) $lastlba
 		uudecode <<EOT | unlzma | ddq bs=512 seek=1 of=$iso conv=notrunc
 begin-base64 644 -
-XQAAgAD//////////wAikYVN1N2VY3JXMnUMJn1RCdQOHN33EegtIBhrUQ7P
-3PVRrH5+fynx2ZfhIpUTKFVouVH5CEgkcBOQqiTCVX7AsRmUkli6MUo+x+TC
-9ftViSMiaEWDb8bI73GU3XCMZsZaT5nFwi6NqzhBI9sfRJz5i6cK7kSsPjxN
-bK6ivatF20do2T7S8NSju5FOCCwMuMHuIcU+Ic8JzCvfjdjkHSkUjA6wIcQi
-48FNYYyKv58kxngpmoy32Xc7rZ4cKAXJl3LmsFkYdw7QuZ7Rqv5sP3Z8St8D
-krjcZVJf//Pj90o=
+XQAAgAD//////////wAikYVN1N2VY3JXMnUMJn1TblyFehfeJH+D4/XPYFjO
+OzQluqM2w0L9b1dJMfZHJbnNnBFhYprW0PWPY1UOgQJkhF/W2Z0lXvaSrZ7t
+yEtpmE3Go6qt6FetOfWNMJZhtBdE0TjxFZCvh5z8hy/kRQb1XOkLxeb5VHT3
+H4JI5S76wY0TueXYsBOJwlwW9fZ8IXP72cDO3JArS4ZhUGxbOOF2oDuf/hFM
+zQ==
 ====
 EOT
 		lastlba=$(($sectorcount -1))
@@ -220,15 +220,13 @@
 		store32 $((0x230)) $(($lastlba-$usablelba+1))
 		store32 $((0x420)) $efi_ofs
 		store32 $((0x428)) $(($efi_ofs+$efi_len-1))
-		store32 $((0x4A8)) $(($lastlba-0x800))
-		store32 $((0x4B0)) 5
 		store32sw $((0x1008)) $(($efi_ofs/4))
 		store32sw $((0x1054)) $(($efi_len/4))
 		for i in 238 410 490 ; do
 			ddq if=/dev/urandom count=16 bs=1 conv=notrunc \
 			    of=$iso seek=$((0x$i))
 		done
-		store32 $((0x258)) $(crc32 0x400 0x4000)
+		store32 $((0x258)) $(crc32 0x400 $((128*$(read32 0 $((0x250))))))
 		store32 $((0x210)) $(crc32 0x200 $(read32 0 $((0x20C))))
 	fi
 }
@@ -246,7 +244,7 @@
 	abort "invalid boot catalog."
 efi_ofs=
 if [ $(read8 $cat 65) -eq 239 ]; then
-	[ -n "$entry" ] && echo "$iso: efi boot ignore --entry $entry"
+	[ ${entry:-2} != 2 ] && echo "$iso: efi boot ignore --entry $entry"
 	entry=2
 	partype=0
 	efi_ofs=$((4*$(read32 $cat 104)))