wok diff ipxe/receipt @ rev 25693
dropbear (2024.84) fixes terrapin-attack, again
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Apr 21 13:35:21 2024 +0000 (9 months ago) |
parents | ecd613707114 |
children |
line diff
1.1 --- a/ipxe/receipt Fri Mar 11 17:20:09 2022 +0000 1.2 +++ b/ipxe/receipt Sun Apr 21 13:35:21 2024 +0000 1.3 @@ -49,20 +49,25 @@ 1.4 make bin/undionly.kkkpxe EMBED=$stuff/ipxelinux.ipxe,$pxelinux && 1.5 mv bin/undionly.kkkpxe bin/ipxelinux.0 1.6 make bin/undionly.pxe bin/undionly.kpxe bin/undionly.kkpxe \ 1.7 - bin/undionly.kkkpxe bin/ipxe.pxe bin/ipxe.kpxe bin/ipxe.kkpxe \ 1.8 + bin/undionly.kkkpxe bin/undionly.lkrn \ 1.9 + bin/ipxe.pxe bin/ipxe.kpxe bin/ipxe.kkpxe \ 1.10 bin/ipxe.kkkpxe bin/ipxe.nbi bin/ipxe.lkrn \ 1.11 - bin/ipxe.exe EMBED=$stuff/ipxe.cmd 1.12 + EMBED=$stuff/ipxe.cmd 1.13 cp $stuff/bootloader.S . 1.14 cc -o bootloader.o -Wa,-a=bootloader.lst -c bootloader.S 1.15 objcopy --only-section=.text -O binary bootloader.o bootloader.bin 1.16 - size=$(stat -c %s bin/ipxe.lkrn) 1.17 - while read ofs val ; do 1.18 - printf '\\\\x%02X\\\\x%02X' $(($val & 255)) $(($val / 256)) | \ 1.19 - xargs echo -en|dd bs=1 conv=notrunc of=bootloader.bin seek=$ofs 1.20 - done 2> /dev/null <<EOT 1.21 + for bin in ipxe undionly ; do 1.22 + size=$(stat -c %s bin/$bin.lkrn) 1.23 + cp -a bin/$bin.lkrn bin/$bin.fd 1.24 + dd if=bootloader.bin of=bin/$bin.fd conv=notrunc 1.25 + while read ofs val ; do 1.26 + printf '\\\\x%02X\\\\x%02X' $(($val & 255)) $(($val / 256)) | \ 1.27 + xargs echo -en|dd bs=1 conv=notrunc of=bin/$bin.fd seek=$ofs 1.28 + done 2> /dev/null <<EOT 1.29 4 $((($size+511)/512)) 1.30 14 $((($size+15)/16)) 1.31 EOT 1.32 + done 1.33 } 1.34 1.35 # Rules to gen a SliTaz package suitable for Tazpkg. 1.36 @@ -70,8 +75,7 @@ 1.37 { 1.38 mkdir -p $fs/boot $install/usr/share 1.39 cp -a $src/src/doc $install/usr/share 1.40 - cp -a $src/src/bin/ipxe.lkrn $fs/boot/ipxe.exe 1.41 - dd if=$src/src/bootloader.bin of=$fs/boot/ipxe.exe conv=notrunc 1.42 + cp -a $src/src/bin/ipxe.fd $fs/boot/ipxe.exe 1.43 } 1.44 1.45 # Pre and post install commands for Tazpkg.