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

unify build/grub/* to build/coreboot/grub 

Signed-off-by: Leah Rowe <leah@libreboot.org>
btrfsvols
Leah Rowe 2023-10-06 01:34:14 +01:00
parent 176722a841
commit 1c2de7f962
5 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
handle
View File

@ -1 +0,0 @@
lbmk

4
lbmk
View File

@ -96,8 +96,8 @@ usage()
For each of the above modes, you may also do: For each of the above modes, you may also do:
${progname} <MODE> list ${progname} <MODE> list
Example: ./build grub list, which would yield: Example: ./build coreboot list, which would yield:
$(./build grub list) $(./build coreboot list)
Refer to ${project} documentation for more info. Refer to ${project} documentation for more info.
EOF EOF

2
script/build/boot/roms
View File

@ -166,7 +166,7 @@ build_dependency_grub()
rebuild_grub="y" && break rebuild_grub="y" && break
done done
[ "${rebuild_grub}" = "y" ] || return 0 [ "${rebuild_grub}" = "y" ] || return 0
x_ ./build grub payload x_ ./build coreboot grub
} }
build_dependency_uboot() build_dependency_uboot()

14
script/build/grub/payload → script/build/coreboot/grub
View File

@ -22,11 +22,23 @@ main()
handle_dependencies() handle_dependencies()
{ {
[ -d "grub/" ] || x_ ./update project repo grub [ -d "grub/" ] || x_ ./update project repo grub
[ -f "grub/grub-mkstandalone" ] || x_ ./build grub utils [ -f "grub/grub-mkstandalone" ] || build_grub_utils
[ -d "${elfdir}" ] || x_ mkdir -p "${elfdir}" [ -d "${elfdir}" ] || x_ mkdir -p "${elfdir}"
x_ rm -f "${elfdir}/"* x_ rm -f "${elfdir}/"*
} }
build_grub_utils()
{
(
x_ cd grub/
[ ! -d Makefile ] || x_ make distclean
x_ ./bootstrap --gnulib-srcdir=gnulib/ --no-git
x_ ./autogen.sh
x_ ./configure --with-platform=coreboot
x_ make -j$(nproc) FS_PAYLOAD_MODULES=""
)
}
build_keymap_configs() build_keymap_configs()
{ {
for keylayoutfile in "${grubcfgsdir}/keymap/"*.gkb; do for keylayoutfile in "${grubcfgsdir}/keymap/"*.gkb; do

29
script/build/grub/utils
View File

@ -1,29 +0,0 @@
#!/usr/bin/env sh
# SPDX-License-Identifier: GPL-3.0-or-later
# SPDX-FileCopyrightText: 2014, 2015, 2020, 2023 Leah Rowe <leah@libreboot.org>
# SPDX-FileCopyrightText: 2015, 2016 Klemens Nanni <contact@autoboot.org>
[ "x${DEBUG+set}" = 'xset' ] && set -v
set -u -e
. "include/err.sh"
main()
{
[ -d "grub/" ] || x_ ./update project repo grub
build_grub
}
build_grub()
{
(
x_ cd grub/
[ ! -d Makefile ] || x_ make distclean
x_ ./bootstrap --gnulib-srcdir=gnulib/ --no-git
x_ ./autogen.sh
x_ ./configure --with-platform=coreboot
x_ make -j$(nproc) FS_PAYLOAD_MODULES=""
)
}
main $@