wok-6.x rev 19670

syslinux/iso2exe.sh: no recursive partition
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Feb 02 13:21:13 2017 +0100 (2017-02-02)
parents 4d35415649e8
children cc38abe27c7a
files sshfs-fuse/receipt syslinux/stuff/iso2exe/iso2exe.sh
line diff
     1.1 --- a/sshfs-fuse/receipt	Thu Feb 02 09:22:18 2017 +0200
     1.2 +++ b/sshfs-fuse/receipt	Thu Feb 02 13:21:13 2017 +0100
     1.3 @@ -13,7 +13,8 @@
     1.4  PROVIDE="rsshfs sshfs"
     1.5  TAGS="ssh"
     1.6  
     1.7 -DEPENDS="fuse openssh sftp-server glib"
     1.8 +DEPENDS="fuse ssh sftp-server glib"
     1.9 +SUGGESTED="openssh"
    1.10  BUILD_DEPENDS="fuse-dev gettext glib-dev pkg-config autoconf automake libtool"
    1.11  
    1.12  # Rules to configure and make the package.
     2.1 --- a/syslinux/stuff/iso2exe/iso2exe.sh	Thu Feb 02 09:22:18 2017 +0200
     2.2 +++ b/syslinux/stuff/iso2exe/iso2exe.sh	Thu Feb 02 13:21:13 2017 +0100
     2.3 @@ -105,7 +105,7 @@
     2.4  		i=3; [ -n "$mac" ] && i=9
     2.5  		ddq if=/tmp/exe$$ bs=512 skip=1 of=$1 seek=$i conv=notrunc
     2.6  		for i in 12C 154 17C ; do	# always 3 UPX sections
     2.7 -			store $((0x$i)) $((1024 + $(get 0x$i $1))) $1 2
     2.8 +			store $((0x$i)) $((1024 + $(get 0x$i $1))) $1
     2.9  		done
    2.10  	fi
    2.11  	printf "Adding bootiso head at %04X...\n" 0
    2.12 @@ -124,6 +124,11 @@
    2.13  	store 417 $(($i/512)) $1 8
    2.14  	printf "Moving syslinux hybrid boot record at %04X (512 bytes) ...\n" $i
    2.15  	ddq if=$2 bs=1 count=512 of=$1 seek=$i conv=notrunc
    2.16 +	if [ -z "$RECURSIVE_PARTITION" ]; then
    2.17 +		store 464 $((1+$i/512)) $1 8
    2.18 +		store 470 $(($i/512)) $1 8
    2.19 +		store 474 $(($(get 474 $1 4) - $i/512)) $1 32
    2.20 +	fi
    2.21  }
    2.22  
    2.23  add_fdbootstrap()
    2.24 @@ -568,8 +573,9 @@
    2.25  			h=$((512*$(get 417 "$1" 1)))
    2.26  			store $((0x1C5+16*i)) $(($mb-1)) $1 8
    2.27  			store $(($h+0x1C5+16*i)) $(($mb-1)) $1 8
    2.28 -			store $((0x1CA+16*i)) $(($mb*2048)) $1 32
    2.29  			store $(($h+0x1CA+16*i)) $(($mb*2048)) $1 32
    2.30 +			[ -z "$RECURSIVE_PARTITION" ] || h=0
    2.31 +			store $((0x1CA+16*i)) $(($mb*2048-$h)) $1 32
    2.32  		done
    2.33  		if [ $newsz -gt $isosz ]; then
    2.34  			echo "$(($newsz - $isosz)) extra bytes."