# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1486038073 -3600
# Node ID 40ec0fa2f1d545297079a16bca9eedeb813048f7
# Parent  4d35415649e8cb16c4e4e2bad6045ef7ea041919
syslinux/iso2exe.sh: no recursive partition

diff -r 4d35415649e8 -r 40ec0fa2f1d5 sshfs-fuse/receipt
--- a/sshfs-fuse/receipt	Thu Feb 02 09:22:18 2017 +0200
+++ b/sshfs-fuse/receipt	Thu Feb 02 13:21:13 2017 +0100
@@ -13,7 +13,8 @@
 PROVIDE="rsshfs sshfs"
 TAGS="ssh"
 
-DEPENDS="fuse openssh sftp-server glib"
+DEPENDS="fuse ssh sftp-server glib"
+SUGGESTED="openssh"
 BUILD_DEPENDS="fuse-dev gettext glib-dev pkg-config autoconf automake libtool"
 
 # Rules to configure and make the package.
diff -r 4d35415649e8 -r 40ec0fa2f1d5 syslinux/stuff/iso2exe/iso2exe.sh
--- a/syslinux/stuff/iso2exe/iso2exe.sh	Thu Feb 02 09:22:18 2017 +0200
+++ b/syslinux/stuff/iso2exe/iso2exe.sh	Thu Feb 02 13:21:13 2017 +0100
@@ -105,7 +105,7 @@
 		i=3; [ -n "$mac" ] && i=9
 		ddq if=/tmp/exe$$ bs=512 skip=1 of=$1 seek=$i conv=notrunc
 		for i in 12C 154 17C ; do	# always 3 UPX sections
-			store $((0x$i)) $((1024 + $(get 0x$i $1))) $1 2
+			store $((0x$i)) $((1024 + $(get 0x$i $1))) $1
 		done
 	fi
 	printf "Adding bootiso head at %04X...\n" 0
@@ -124,6 +124,11 @@
 	store 417 $(($i/512)) $1 8
 	printf "Moving syslinux hybrid boot record at %04X (512 bytes) ...\n" $i
 	ddq if=$2 bs=1 count=512 of=$1 seek=$i conv=notrunc
+	if [ -z "$RECURSIVE_PARTITION" ]; then
+		store 464 $((1+$i/512)) $1 8
+		store 470 $(($i/512)) $1 8
+		store 474 $(($(get 474 $1 4) - $i/512)) $1 32
+	fi
 }
 
 add_fdbootstrap()
@@ -568,8 +573,9 @@
 			h=$((512*$(get 417 "$1" 1)))
 			store $((0x1C5+16*i)) $(($mb-1)) $1 8
 			store $(($h+0x1C5+16*i)) $(($mb-1)) $1 8
-			store $((0x1CA+16*i)) $(($mb*2048)) $1 32
 			store $(($h+0x1CA+16*i)) $(($mb*2048)) $1 32
+			[ -z "$RECURSIVE_PARTITION" ] || h=0
+			store $((0x1CA+16*i)) $(($mb*2048-$h)) $1 32
 		done
 		if [ $newsz -gt $isosz ]; then
 			echo "$(($newsz - $isosz)) extra bytes."