modify embed_mfs.sh to embed an MFS image into either loader.efi or the kernel

[worldofzak_gmail.com]

Summary

This patch extends embed_mfs.sh so that it can be used to embed an MFS image into the efi loader or the kernel.

Test Plan

• build loader with the option MD_IMAGE_SIZE defined
• use makefs to create an FS image
• use this script to embed the FS image in loader.efi

[emaste]

sys/tools/embed_mfs.sh

50 ↗

(On Diff #34193)

I think we should switch the sense -- e.g.
if file -b $1 | grep -q '^ELF ..-bit .SB executable'; then

1. ELF case

else

1. generic case

fi

81 ↗

(On Diff #34193)

for a continuation FreeBSD typically uses four space 2nd level indent

[worldofzak_gmail.com]

fixed formatting errors. swapped if statement.

[br]

Hi

I am getting this error now:

sh ./sys/tools/embed_mfs.sh /usr/home/br/obj/usr/home/br/dev/freebsd-riscv/riscv.riscv64/sys/GENERIC/kernel riscv.img
Can't locate mfs section within /usr/home/br/obj/usr/home/br/dev/freebsd-riscv/riscv.riscv64/sys/GENERIC/kernel

this script now thinks my kernel is not ELF

[worldofzak_gmail.com]

@br , can you post the output of:

file -b ./sys/tools/embed_mfs.sh /usr/home/br/obj/usr/home/br/dev/freebsd-riscv/riscv.riscv64/sys/GENERIC/kernel

[br]

file -b ./sys/tools/embed_mfs.sh /usr/home/br/obj/usr/home/br/dev/freebsd-riscv/riscv.riscv64/sys/GENERIC/kernel
POSIX shell script, ASCII text executable
ELF 64-bit LSB executable, UCB RISC-V, version 1 (SYSV), dynamically linked, interpreter /red/herring, BuildID[sha1]=cfcb61ddf3a05dc0d59ba084b79d4194b40cf46b, not stripped

[worldofzak_gmail.com]

@br does the previous version of the script work properly?
github link: https://github.com/freebsd/freebsd/blob/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/tools/embed_mfs.sh

[br]

Yes, it works fine if I revert this change.

[worldofzak_gmail.com]

@br are you able to provide the exact files you used to generate this error? If not, can you give me an overview of how you created the kernel you're using? I'll try and replicate it myself. my email is the same a my username.

[emaste]

Hi @worldofzak_gmail.com, sorry I didn't reference the followup commit here. This should have been fixed by rS326992

[emaste]

Err rS327526

[worldofzak_gmail.com]

@emaste understood.