From 4e39d5a5a808b0d59c6fb3426e1d9bc0195d6b08 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Fri, 6 Oct 2023 22:59:36 +0100
Subject: put all src downloads under src/
build/release/src was partly re-written to accomodate this
memtest86plus was patched to have a central Makefile, and
lbmk modified to use that, rather than mess with build32
and build64. the central Makefile just builds both targets
or cleans both targets
Signed-off-by: Leah Rowe <leah@libreboot.org>
---
script/build/coreboot/grub | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
(limited to 'script/build/coreboot/grub')
diff --git a/script/build/coreboot/grub b/script/build/coreboot/grub
index 7f448e24..49b8b416 100755
--- a/script/build/coreboot/grub
+++ b/script/build/coreboot/grub
@@ -5,11 +5,12 @@
[ "x${DEBUG+set}" = 'xset' ] && set -v
set -u -e
+. "include/err.sh"
+
elfdir="elf/grub"
grubcfgsdir="config/grub"
layoutdir="/boot/grub/layouts"
-. "include/err.sh"
. "${grubcfgsdir}/modules.list"
main()
@@ -21,16 +22,16 @@ main()
handle_dependencies()
{
- [ -d "grub/" ] || x_ ./update project repo grub
- [ -f "grub/grub-mkstandalone" ] || build_grub_utils
- [ -d "${elfdir}" ] || x_ mkdir -p "${elfdir}"
+ [ -d "src/grub" ] || x_ ./update project repo grub
+ [ -f "src/grub/grub-mkstandalone" ] || build_grub_utils
+ x_ mkdir -p "${elfdir}"
x_ rm -f "${elfdir}/"*
}
build_grub_utils()
{
(
- x_ cd grub/
+ x_ cd "src/grub"
[ ! -d Makefile ] || x_ make distclean
x_ ./bootstrap --gnulib-srcdir=gnulib/ --no-git
x_ ./autogen.sh
@@ -52,11 +53,11 @@ build_keymap_configs()
build_grub_payload()
{
- grub/grub-mkstandalone \
- --grub-mkimage="grub/grub-mkimage" \
+ ./src/grub/grub-mkstandalone \
+ --grub-mkimage="src/grub/grub-mkimage" \
-O i386-coreboot \
-o "${elfdir}/grub.elf" \
- -d grub/grub-core/ \
+ -d "src/grub/grub-core/" \
--fonts= --themes= --locales= \
--modules="${grub_modules}" \
--install-modules="${grub_install_modules}" \
--
cgit v1.2.1