wok rev 20331

fasm: fix build
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue May 29 10:57:28 2018 +0200 (2018-05-29)
parents 259bf47dcced
children f582dbc28a10
files fasm/receipt syslinux/stuff/tools/isohybrid.sh
line diff
     1.1 --- a/fasm/receipt	Mon May 28 21:15:27 2018 +0200
     1.2 +++ b/fasm/receipt	Tue May 29 10:57:28 2018 +0200
     1.3 @@ -22,8 +22,7 @@
     1.4  		http://arm.flatassembler.net/FASMARM_small.ZIP
     1.5  	unzip $SOURCES_REPOSITORY/FASMARM_small.ZIP
     1.6  	mv ReadMe.txt fasmarm.txt
     1.7 -	sed 's/^character.*/&\npreprocessing_done db ?/' \
     1.8 -		< $src/SOURCE/LINUX/FASMARM.ASM > $src/source/Linux/fasmarm.asm
     1.9 +	cp $src/SOURCE/LINUX/FASMARM.ASM $src/source/Linux/fasmarm.asm
    1.10  	for i in $src/SOURCE/*.INC ; do
    1.11  		cp $i $src/source/$(basename $i | tr [A-Z] [a-z])
    1.12  	done
     2.1 --- a/syslinux/stuff/tools/isohybrid.sh	Mon May 28 21:15:27 2018 +0200
     2.2 +++ b/syslinux/stuff/tools/isohybrid.sh	Tue May 29 10:57:28 2018 +0200
     2.3 @@ -198,16 +198,18 @@
     2.4  	if [ -n "$efi_ofs" ]; then
     2.5  		[ $(read16 0 1024) -eq 35615 -a $(read16 11 0) -ne 35615 ] &&
     2.6  		ddq bs=512 conv=notrunc skip=2 seek=44 count=20 if=$iso of=$iso
     2.7 -		store32 $((446+16)) $((0xFFFFFE00))
     2.8 -		store32 $((446+16+4)) $((0xFFFFFEEF))
     2.9 -		store32 $((446+16+8)) $efi_ofs
    2.10 -		store32 $((446+16+12)) $efi_len
    2.11 +		store32 $((446)) $((0x10000))
    2.12 +		store32 $((446+4)) $((0xFFFFFEEE))
    2.13 +		store32 $((446+8)) $efi_ofs
    2.14 +		store32 $((446+12)) $efi_len
    2.15  		uudecode <<EOT | unlzma | ddq bs=512 seek=1 of=$iso conv=notrunc
    2.16  begin-base64 644 -
    2.17 -XQAAgAD//////////wAikYVN1N2VY3JXMnUMJn1RCdQOHN33EegtIBhrUQ7Q
    2.18 -JNaW37NYVuUAmqtISPiCdgAxPRlBS0xDlmAPPOCSZXmEFz9jEkXSzmsGn6+o
    2.19 -7SMAKMfvpMa3U1bJv/napT+/NFttJSJSx0xJA3em3KJcZsO66vaYeJC5tE+3
    2.20 -T0p9AJtSH6X8SMic3vU3hYWwHsYnsmeoGmsy4EJba9Wf/0liMQA=
    2.21 +XQAAgAD//////////wAikYVN1N2VY3JXMnUMJn1RCdQOHN33EegtIBhrUQ7P
    2.22 +3PVRrH5+fynx2ZfhIpUTKFVouVH5CEgkcBOQqiTCVX7AsRmUkli6MUo+x+TC
    2.23 +9ftViSMiaEWDb8bI73GU3XCMZsZaT5nFwi6NqzhBI9sfRJz5i6cK7kSsPjxN
    2.24 +bK6ivatF20do2T7S8NSju5FOCCwMuMHuIcU+Ic8JzCvfjdjkHSkUjA6wIcQi
    2.25 +48FNYYyKv58kxngpmoy32Xc7rZ4cKAXJl3LmsFkYdw7QuZ7Rqv5sP3Z8St8D
    2.26 +krjcZVJf//Pj90o=
    2.27  ====
    2.28  EOT
    2.29  		lastlba=$(($sectorcount -1))
    2.30 @@ -216,17 +218,18 @@
    2.31  		store32 $((0x220)) $lastlba
    2.32  		store32 $((0x228)) $usablelba
    2.33  		store32 $((0x230)) $(($lastlba-$usablelba+1))
    2.34 -		store32 $((0x428)) $(($lastlba-0x800))
    2.35 -		store32 $((0x4A0)) $efi_ofs
    2.36 -		store32 $((0x4A8)) $(($efi_ofs+$efi_len-1))
    2.37 -		store32 $((0x258)) $(crc32 0x400 0x4000)
    2.38 -		store32 $((0x210)) $(crc32 0x200 $(read32 0 $((0x20C))))
    2.39 +		store32 $((0x420)) $efi_ofs
    2.40 +		store32 $((0x428)) $(($efi_ofs+$efi_len-1))
    2.41 +		store32 $((0x4A8)) $(($lastlba-0x800))
    2.42 +		store32 $((0x4B0)) 5
    2.43  		store32sw $((0x1008)) $(($efi_ofs/4))
    2.44  		store32sw $((0x1054)) $(($efi_len/4))
    2.45  		for i in 238 410 490 ; do
    2.46  			ddq if=/dev/urandom count=16 bs=1 conv=notrunc \
    2.47  			    of=$iso seek=$((0x$i))
    2.48  		done
    2.49 +		store32 $((0x258)) $(crc32 0x400 0x4000)
    2.50 +		store32 $((0x210)) $(crc32 0x200 $(read32 0 $((0x20C))))
    2.51  	fi
    2.52  }
    2.53  
    2.54 @@ -243,7 +246,8 @@
    2.55  	abort "invalid boot catalog."
    2.56  efi_ofs=
    2.57  if [ $(read8 $cat 65) -eq 239 ]; then
    2.58 -	[ -n "$entry" ] && echo "$iso: efi boot ignore --entry $entry" && entry=
    2.59 +	[ -n "$entry" ] && echo "$iso: efi boot ignore --entry $entry"
    2.60 +	entry=2
    2.61  	partype=0
    2.62  	efi_ofs=$((4*$(read32 $cat 104)))
    2.63  	efi_len=$(($(read16 $(($efi_ofs/4)) 19)))