From c83d1a8dc4efea50aa17af930ec7b8289dad2390 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 20 Aug 2023 16:36:49 +0100 Subject: unify grub scripts under one directory new commands are thus, build grub payloads: ./build grub payload (formerly ./build payload grub) build grub utils: ./build grub utils (formerly ./build module grub) The scripts is build/module/ will mostly be deleted. I say mostly, because some of them are being moved instead. The deleted ones will be ones that basically just run "make" in the target directory. They will be unified, in a follow-up patch. Signed-off-by: Leah Rowe --- resources/scripts/build/boot/roms_helper | 2 +- resources/scripts/build/grub/payload | 98 ++++++++++++++++++++++++++++++++ resources/scripts/build/grub/utils | 61 ++++++++++++++++++++ resources/scripts/build/module/grub | 61 -------------------- resources/scripts/build/payload/grub | 98 -------------------------------- 5 files changed, 160 insertions(+), 160 deletions(-) create mode 100755 resources/scripts/build/grub/payload create mode 100755 resources/scripts/build/grub/utils delete mode 100755 resources/scripts/build/module/grub delete mode 100755 resources/scripts/build/payload/grub (limited to 'resources') diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper index 0ae914e1..8ea3ae0e 100755 --- a/resources/scripts/build/boot/roms_helper +++ b/resources/scripts/build/boot/roms_helper @@ -205,7 +205,7 @@ if [ "${payload_grub}" = "y" ] \ if [ ! -f "${grubelf}" ] || [ ! -f "${grubcfg}" ] || \ [ ! -f "${grubtestcfg}" ]; then - ./build payload grub + ./build grub payload fi done fi diff --git a/resources/scripts/build/grub/payload b/resources/scripts/build/grub/payload new file mode 100755 index 00000000..bf52d2a1 --- /dev/null +++ b/resources/scripts/build/grub/payload @@ -0,0 +1,98 @@ +#!/usr/bin/env sh + +# generate GRUB ELF files (coreboot payload) and configuration files +# +# Copyright (C) 2014,2015,2020,2021,2023 Leah Rowe +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e + +grubcfgsdir="resources/grub" +keymap="" + +. "${grubcfgsdir}/modules.list" + +main() +{ + printf "Creating GRUB payloads and configuration files\n" + + [ ! -d "grub/" ] && \ + ./fetch grub + [ ! -f "grub/grub-mkstandalone" ] && \ + ./build grub utils + [ ! -d "elf/" ] && \ + mkdir -p elf/ + [ ! -d "elf/grub" ] && \ + mkdir -p elf/grub/ + + rm -f elf/grub/* + + # Separate GRUB payload per keymap to save space in ROM. + + for keylayoutfile in ${grubcfgsdir}/keymap/*.gkb; do + build_grub_payloads "${keylayoutfile}" + done + + printf "Done! Check elf/grub/ to see the files.\n\n" +} + +build_grub_payloads() +{ + keylayoutfile=${1} + + if [ ! -f "${keylayoutfile}" ]; then + continue + fi + keymap="${keylayoutfile##${grubcfgsdir}/keymap/}" + keymap="${keymap%.gkb}" + + build_grub_elf "${keylayoutfile}" + create_grub_config + + printf "Created 'elf/grub/grub_%s.elf' and configs.'\n" \ + "${keymap}" +} + +build_grub_elf() +{ + keylayoutfile=${1} + + gcfg="/boot/grub/grub.cfg=${grubcfgsdir}" + gcfg="${gcfg}/config/grub_memdisk.cfg" + grubk="/boot/grub/layouts/${keymap}.gkb=${keylayoutfile}" + grub/grub-mkstandalone \ + --grub-mkimage="grub/grub-mkimage" \ + -O i386-coreboot \ + -o elf/grub/grub_${keymap}.elf \ + -d grub/grub-core/ \ + --fonts= --themes= --locales= \ + --modules="${grub_modules}" \ + --install-modules="${grub_install_modules}" \ + ${gcfg} ${grubk} +} + +create_grub_config() +{ + sed "s/usqwerty/${keymap}/" \ + < ${grubcfgsdir}/config/grub.cfg \ + > elf/grub/grub_${keymap}.cfg + sed "s/grubtest.cfg/grub.cfg/" \ + < elf/grub/grub_${keymap}.cfg \ + > elf/grub/grub_${keymap}_test.cfg +} + +main $@ diff --git a/resources/scripts/build/grub/utils b/resources/scripts/build/grub/utils new file mode 100755 index 00000000..edad6b2a --- /dev/null +++ b/resources/scripts/build/grub/utils @@ -0,0 +1,61 @@ +#!/usr/bin/env sh + +# helper script: builds GRUB2 source code +# +# 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 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 . +# + +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e + +main() +{ + printf "Building GRUB\n" + + if [ ! -d "grub/" ]; then + ./fetch grub || exit 1 + fi + + build_grub +} + +build_grub() +{ + ( + cd grub/ || err "cd" + + # clean up first + if [ -d Makefile ]; then + make distclean || err "make-distclean" + fi + + ./bootstrap --gnulib-srcdir=gnulib/ --no-git || err "bootstrap" + + # build + ./autogen.sh || err "autogen" + ./configure --with-platform=coreboot || err "configure" + make -j$(nproc) || err "make" + ) +} + +err() +{ + printf "%s: error: %s\n" $0 $1 + exit 1 +} + +main $@ diff --git a/resources/scripts/build/module/grub b/resources/scripts/build/module/grub deleted file mode 100755 index edad6b2a..00000000 --- a/resources/scripts/build/module/grub +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env sh - -# helper script: builds GRUB2 source code -# -# 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 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 . -# - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -main() -{ - printf "Building GRUB\n" - - if [ ! -d "grub/" ]; then - ./fetch grub || exit 1 - fi - - build_grub -} - -build_grub() -{ - ( - cd grub/ || err "cd" - - # clean up first - if [ -d Makefile ]; then - make distclean || err "make-distclean" - fi - - ./bootstrap --gnulib-srcdir=gnulib/ --no-git || err "bootstrap" - - # build - ./autogen.sh || err "autogen" - ./configure --with-platform=coreboot || err "configure" - make -j$(nproc) || err "make" - ) -} - -err() -{ - printf "%s: error: %s\n" $0 $1 - exit 1 -} - -main $@ diff --git a/resources/scripts/build/payload/grub b/resources/scripts/build/payload/grub deleted file mode 100755 index 636e9f3e..00000000 --- a/resources/scripts/build/payload/grub +++ /dev/null @@ -1,98 +0,0 @@ -#!/usr/bin/env sh - -# generate GRUB ELF files (coreboot payload) and configuration files -# -# Copyright (C) 2014,2015,2020,2021,2023 Leah Rowe -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -grubcfgsdir="resources/grub" -keymap="" - -. "${grubcfgsdir}/modules.list" - -main() -{ - printf "Creating GRUB payloads and configuration files\n" - - [ ! -d "grub/" ] && \ - ./fetch grub - [ ! -f "grub/grub-mkstandalone" ] && \ - ./build module grub - [ ! -d "elf/" ] && \ - mkdir -p elf/ - [ ! -d "elf/grub" ] && \ - mkdir -p elf/grub/ - - rm -f elf/grub/* - - # Separate GRUB payload per keymap to save space in ROM. - - for keylayoutfile in ${grubcfgsdir}/keymap/*.gkb; do - build_grub_payloads "${keylayoutfile}" - done - - printf "Done! Check elf/grub/ to see the files.\n\n" -} - -build_grub_payloads() -{ - keylayoutfile=${1} - - if [ ! -f "${keylayoutfile}" ]; then - continue - fi - keymap="${keylayoutfile##${grubcfgsdir}/keymap/}" - keymap="${keymap%.gkb}" - - build_grub_elf "${keylayoutfile}" - create_grub_config - - printf "Created 'elf/grub/grub_%s.elf' and configs.'\n" \ - "${keymap}" -} - -build_grub_elf() -{ - keylayoutfile=${1} - - gcfg="/boot/grub/grub.cfg=${grubcfgsdir}" - gcfg="${gcfg}/config/grub_memdisk.cfg" - grubk="/boot/grub/layouts/${keymap}.gkb=${keylayoutfile}" - grub/grub-mkstandalone \ - --grub-mkimage="grub/grub-mkimage" \ - -O i386-coreboot \ - -o elf/grub/grub_${keymap}.elf \ - -d grub/grub-core/ \ - --fonts= --themes= --locales= \ - --modules="${grub_modules}" \ - --install-modules="${grub_install_modules}" \ - ${gcfg} ${grubk} -} - -create_grub_config() -{ - sed "s/usqwerty/${keymap}/" \ - < ${grubcfgsdir}/config/grub.cfg \ - > elf/grub/grub_${keymap}.cfg - sed "s/grubtest.cfg/grub.cfg/" \ - < elf/grub/grub_${keymap}.cfg \ - > elf/grub/grub_${keymap}_test.cfg -} - -main $@ -- cgit v1.2.1