summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-10-06 01:34:14 +0100
committerLeah Rowe <leah@libreboot.org>2023-10-06 01:34:14 +0100
commit1c2de7f962115a96668aa1f66b1cc1fee3be6922 (patch)
tree7487c70c1d4992a24c1be4ab87b16b69aba86014
parent176722a841e59f4a6664bad45dc9344364a4a166 (diff)
unify build/grub/* to build/coreboot/grub
Signed-off-by: Leah Rowe <leah@libreboot.org>
l---------handle1
-rwxr-xr-xlbmk4
-rwxr-xr-xscript/build/boot/roms2
-rwxr-xr-xscript/build/coreboot/grub (renamed from script/build/grub/payload)14
-rwxr-xr-xscript/build/grub/utils29
5 files changed, 16 insertions, 34 deletions
diff --git a/handle b/handle
deleted file mode 120000
index 012b4ec0..00000000
--- a/handle
+++ /dev/null
@@ -1 +0,0 @@
-lbmk \ No newline at end of file
diff --git a/lbmk b/lbmk
index b2e97b00..2fe1bbd2 100755
--- a/lbmk
+++ b/lbmk
@@ -96,8 +96,8 @@ usage()
For each of the above modes, you may also do:
${progname} <MODE> list
- Example: ./build grub list, which would yield:
- $(./build grub list)
+ Example: ./build coreboot list, which would yield:
+ $(./build coreboot list)
Refer to ${project} documentation for more info.
EOF
diff --git a/script/build/boot/roms b/script/build/boot/roms
index 9736ee7f..e111fdb0 100755
--- a/script/build/boot/roms
+++ b/script/build/boot/roms
@@ -166,7 +166,7 @@ build_dependency_grub()
rebuild_grub="y" && break
done
[ "${rebuild_grub}" = "y" ] || return 0
- x_ ./build grub payload
+ x_ ./build coreboot grub
}
build_dependency_uboot()
diff --git a/script/build/grub/payload b/script/build/coreboot/grub
index 03549ef6..7f448e24 100755
--- a/script/build/grub/payload
+++ b/script/build/coreboot/grub
@@ -22,11 +22,23 @@ main()
handle_dependencies()
{
[ -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}"
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()
{
for keylayoutfile in "${grubcfgsdir}/keymap/"*.gkb; do
diff --git a/script/build/grub/utils b/script/build/grub/utils
deleted file mode 100755
index edb78bb1..00000000
--- a/script/build/grub/utils
+++ /dev/null
@@ -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 $@