mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 06:31:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-boot/grub: install file with sbat contents, add --sbat to script

Browse Source 
This is just the contents of the section, but the section
itself is written by grub-mkimage. sbat.csv needs to be passed
with --sbat.

Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
This commit is contained in:
Sayan Chowdhury 2024-01-03 21:22:00 +05:30 committed by Kai Lueke
parent 64556256db
commit fc28e72322
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build_library/grub_install.sh
View File

@ -52,6 +52,8 @@ CORE_NAME=
# fixed up the board root's grub will always be used. # fixed up the board root's grub will always be used.
BOARD_GRUB=1 BOARD_GRUB=1
SBAT_ARG=()
case "${FLAGS_target}" in case "${FLAGS_target}" in
i386-pc) i386-pc)
CORE_MODULES+=( biosdisk serial ) CORE_MODULES+=( biosdisk serial )
@ -60,6 +62,7 @@ case "${FLAGS_target}" in
x86_64-efi) x86_64-efi)
CORE_MODULES+=( serial linux efi_gop efinet pgp http tftp ) CORE_MODULES+=( serial linux efi_gop efinet pgp http tftp )
CORE_NAME="core.efi" CORE_NAME="core.efi"
SBAT_ARG=( --sbat "${BOARD_ROOT}/usr/share/grub/sbat.csv" )
;; ;;
x86_64-xen) x86_64-xen)
CORE_NAME="core.elf" CORE_NAME="core.elf"
@ -68,6 +71,7 @@ case "${FLAGS_target}" in
CORE_MODULES+=( serial linux efi_gop efinet pgp http tftp ) CORE_MODULES+=( serial linux efi_gop efinet pgp http tftp )
CORE_NAME="core.efi" CORE_NAME="core.efi"
BOARD_GRUB=1 BOARD_GRUB=1
SBAT_ARG=( --sbat "${BOARD_ROOT}/usr/share/grub/sbat.csv" )
;; ;;
*) *)
die_notrace "Unknown GRUB target ${FLAGS_target}" die_notrace "Unknown GRUB target ${FLAGS_target}"
@ -174,6 +178,7 @@ sudo grub-mkimage \
--directory "${GRUB_SRC}" \ --directory "${GRUB_SRC}" \
--config "${ESP_DIR}/${GRUB_DIR}/load.cfg" \ --config "${ESP_DIR}/${GRUB_DIR}/load.cfg" \
--memdisk "${ESP_DIR}/flatcar/grub/grub.cfg.tar" \ --memdisk "${ESP_DIR}/flatcar/grub/grub.cfg.tar" \
"${SBAT_ARG[@]}" \
--output "${ESP_DIR}/${GRUB_DIR}/${CORE_NAME}" \ --output "${ESP_DIR}/${GRUB_DIR}/${CORE_NAME}" \
"${CORE_MODULES[@]}" "${CORE_MODULES[@]}"

3
sdk_container/src/third_party/coreos-overlay/sys-boot/grub/files/sbat.csv.in vendored Normal file
View File

@ -0,0 +1,3 @@
sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
grub,4,Free Software Foundation,grub,@@UPSTREAM_VERSION@@,https://www.gnu.org/software/grub/
grub.flatcar,1,Flatcar,grub2,@@VERSION@@,https://github.com/flatcar/flatcar

5
sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.06-r9.ebuild → sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.06-r10.ebuild vendored
View File

@ -321,6 +321,11 @@ src_install() {
# https://bugs.gentoo.org/231935 # https://bugs.gentoo.org/231935
dostrip -x /usr/lib/grub dostrip -x /usr/lib/grub
# SBAT format documentation https://github.com/rhboot/shim/blob/main/SBAT.md
dodir /usr/share/grub
sed -e "s/@@UPSTREAM_VERSION@@/${PV}/" -e "s/@@VERSION@@/${PVR}/" "${FILESDIR}"/sbat.csv.in >"${ED}/usr/share/grub/sbat.csv"
} }
pkg_postinst() { pkg_postinst() {