diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-10-06 01:34:14 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-10-06 01:34:14 +0100 |
| commit | 1c2de7f962115a96668aa1f66b1cc1fee3be6922 (patch) | |
| tree | 7487c70c1d4992a24c1be4ab87b16b69aba86014 /script | |
| parent | 176722a841e59f4a6664bad45dc9344364a4a166 (diff) | |
unify build/grub/* to build/coreboot/grub
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script')
| -rwxr-xr-x | script/build/boot/roms | 2 | ||||
| -rwxr-xr-x | script/build/coreboot/grub (renamed from script/build/grub/payload) | 14 | ||||
| -rwxr-xr-x | script/build/grub/utils | 29 |
3 files changed, 14 insertions, 31 deletions
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 $@ |