libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

build/roms: simplify grub dependency check 

Signed-off-by: Leah Rowe <leah@libreboot.org>
9020vga
Leah Rowe 2024-01-01 17:47:43 +00:00
parent 535c9007fd
commit fcf2b2bb05
1 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
script/build/roms
View File

@ -132,7 +132,7 @@ configure_dependencies()
[ "${payload_memtest}" != "y" ] || [ -f "src/${memtest_bin}" ] || \ [ "${payload_memtest}" != "y" ] || [ -f "src/${memtest_bin}" ] || \
x_ ./update trees -b memtest86plus x_ ./update trees -b memtest86plus
for bt in dependency_seabios dependency_grub dependency_uboot target; do for bt in dependency_seabios grub_payload dependency_uboot target; do
eval "build_${bt}" eval "build_${bt}"
done done
} }
@ -148,43 +148,23 @@ build_dependency_seabios()
x_ ./update trees -b seabios x_ ./update trees -b seabios
} }
build_dependency_grub() build_grub_payload()
{ {
[ "$payload_grub" != "y" ] && [ "$payload_seabios_withgrub" != "y" ] \ [ "$payload_grub" != "y" ] && [ "$payload_seabios_withgrub" != "y" ] \
&& [ "${payload_seabios_grubonly}" != "y" ] && return 0 && [ "${payload_seabios_grubonly}" != "y" ] && return 0
rebuild_grub="n"
[ -f "${grubelf}" ] || rebuild_grub="y"
for keymapfile in "${kmapdir}"/*.gkb; do for keymapfile in "${kmapdir}"/*.gkb; do
[ -f "${keymapfile}" ] || continue [ -f "${keymapfile}" ] || continue
keymaps="${keymaps} ${keymapfile}" keymaps="${keymaps} ${keymapfile}"
keymap="${keymapfile##*/}" keymap="${keymapfile##*/}"
keymap="${keymap%.gkb}" keymap="${keymap%.gkb}"
[ ! -f "elf/grub/keymap_${keymap}.cfg" ] && \ [ -f "elf/grub/keymap_$keymap.cfg" ] || printf "keymap %s\n" \
rebuild_grub="y" "$keymap" > "elf/grub/keymap_$keymap.cfg" || err "!key"; :
done done
[ -n "${_keyboard}" ] && keymaps="${kmapdir}/${_keyboard}.gkb" [ -n "${_keyboard}" ] && keymaps="${kmapdir}/${_keyboard}.gkb"
[ "$rebuild_grub" = "y" ] || return 0 [ -f "src/grub/grub-mkstandalone" ] || x_ ./update trees -b grub
x_ ./update trees -b grub
remkdir elf/grub
build_keymap_configs
build_grub_payload
}
build_keymap_configs()
{
for keylayoutfile in "${grubcfgsdir}/keymap/"*.gkb; do
[ -f "${keylayoutfile}" ] || continue
keymap="${keylayoutfile##"${grubcfgsdir}/keymap/"}"
keymap="${keymap%.gkb}"
printf "keymap %s\n" "${keymap}" > \
"elf/grub/keymap_${keymap}.cfg" || err "!insert keymap"
done
}
build_grub_payload()
{
./src/grub/grub-mkstandalone \ ./src/grub/grub-mkstandalone \
--grub-mkimage="src/grub/grub-mkimage" \ --grub-mkimage="src/grub/grub-mkimage" \
-O i386-coreboot \ -O i386-coreboot \