From 5bab3bbc33c810cac1b04ab36fe273c614345d9a Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 20 May 2023 18:06:15 +0100 Subject: build/grub: introduce main(), split it up easier to read Signed-off-by: Leah Rowe --- resources/scripts/build/module/grub | 62 +++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/resources/scripts/build/module/grub b/resources/scripts/build/module/grub index da4e0e0f..1fdd7a26 100755 --- a/resources/scripts/build/module/grub +++ b/resources/scripts/build/module/grub @@ -2,48 +2,50 @@ # helper script: builds GRUB2 source code # -# Copyright (C) 2014, 2015, 2020 Leah Rowe +# Copyright (C) 2014, 2015, 2020, 2023 Leah Rowe # Copyright (C) 2015, 2016 Klemens Nanni # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . # -# This script assumes that the working directory is the root -# of git or release archive - [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e -# Build GRUB2 as coreboot payload +main() +{ + printf "Building GRUB\n" -printf "Building GRUB\n" + if [ ! -d "grub/" ]; then + ./download grub + fi +} -if [ ! -d "grub/" ]; then - ./download grub -fi +build_grub() +{ + ( + cd grub/ -# use a subshell to not end up in grub/ in case of build issues -( -cd grub/ + # clean up first + [ -d Makefile ] && make distclean -# clean up first -[ -d Makefile ] && make distclean + ./bootstrap --gnulib-srcdir=gnulib/ --no-git -./bootstrap --gnulib-srcdir=gnulib/ --no-git + # build + ./autogen.sh + ./configure --with-platform=coreboot + make -j$(nproc) + ) +} -# build -./autogen.sh -./configure --with-platform=coreboot -make -j$(nproc) -) +main $@ -- cgit v1.2.1