diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-10-06 22:59:36 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-10-07 00:11:21 +0100 |
| commit | 4e39d5a5a808b0d59c6fb3426e1d9bc0195d6b08 (patch) | |
| tree | 26ccd90ebffb18c70132e6192f27bac1c4c3522c /script/build/coreboot | |
| parent | 965b6a7ed73f1dbd78a353c83b99a88b50c86f38 (diff) | |
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>
Diffstat (limited to 'script/build/coreboot')
| -rwxr-xr-x | script/build/coreboot/grub | 17 | ||||
| -rwxr-xr-x | script/build/coreboot/utils | 4 |
2 files changed, 11 insertions, 10 deletions
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}" \ diff --git a/script/build/coreboot/utils b/script/build/coreboot/utils index e3d471ad..65c565bb 100755 --- a/script/build/coreboot/utils +++ b/script/build/coreboot/utils @@ -29,13 +29,13 @@ build_for_mainboard() { } buildutils() { - [ -d "coreboot/${1}/" ] || \ + [ -d "src/coreboot/${1}/" ] || \ x_ ./update project trees coreboot ${1} for util in cbfstool ifdtool; do [ -f "cbutils/${1}/${util}" ] && continue [ -d "cbutils/${1}" ] || x_ mkdir -p "cbutils/${1}" - utildir="coreboot/${1}/util/${util}" + utildir="src/coreboot/${1}/util/${util}" x_ make distclean -C "${utildir}" x_ make -j$(nproc) -C "${utildir}" x_ cp "${utildir}/${util}" "cbutils/${1}" |