diff options
| author | Leah Rowe <vimuser@noreply.codeberg.org> | 2023-08-22 13:47:40 +0000 |
|---|---|---|
| committer | Leah Rowe <vimuser@noreply.codeberg.org> | 2023-08-22 13:47:40 +0000 |
| commit | dfb93166bbb69745e7f08a469cca98c7ed45aa09 (patch) | |
| tree | 34d6f3ea5e461d7a773df230df09602a35668499 /resources/scripts/build | |
| parent | 1bd842097b544d8fee6416c74fb33dd0dcfac460 (diff) | |
| parent | fa926632148b78ed327f5d674dad9a5ee243af9a (diff) | |
Merge pull request 'memtest86+ v6.20' (#116) from Riku_V/lbmk:memtest into master
Reviewed-on: https://codeberg.org/libreboot/lbmk/pulls/116
Diffstat (limited to 'resources/scripts/build')
| -rwxr-xr-x | resources/scripts/build/boot/roms_helper | 15 | ||||
| -rwxr-xr-x | resources/scripts/build/src/for | 6 |
2 files changed, 11 insertions, 10 deletions
diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper index 8438fffc..f78c7cc8 100755 --- a/resources/scripts/build/boot/roms_helper +++ b/resources/scripts/build/boot/roms_helper @@ -7,6 +7,7 @@ # <vitali64pmemail@protonmail.com> # Copyright (C) 2022 Caleb La Grange <thonkpeasant@protonmail.com> # Copyright (C) 2022 Alper Nebi Yasak <alpernebiyasak@gmail.com> +# Copyright (C) 2023 Riku Viitanen <riku.viitanen@protonmail.com> # # 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 @@ -100,8 +101,7 @@ uboot_config="undefined" [ "${arch}" = "undefined" ] && \ err "Target '${board}' does not define a CPU type. Skipping build." -[ "${payload_memtest}" != "n" ] && \ - [ "${payload_memtest}" != "y" ] && \ +[ "${payload_memtest}" != "y" ] && \ payload_memtest="n" [ "${payload_grub_withseabios}" = "y" ] && \ payload_grub="y" @@ -169,8 +169,9 @@ if [ ! -f "${seavgabiosrom}" ] \ ./handle config file -b seabios fi -[ "${payload_memtest}" = "y" ] && [ ! -f "memtest86plus/memtest" ] && \ - ./build src for -b memtest86plus +memtest_bin="memtest86plus/build${arch#*_}/memtest.bin" +[ "${payload_memtest}" = "y" ] && [ ! -f "${memtest_bin}" ] && \ + ./build src for -b ${memtest_bin%/*} [ -d "${romdir}/" ] || mkdir -p "${romdir}/" rm -f "${romdir}"/* @@ -492,10 +493,10 @@ mkRoms() corebootrom="$(mktemp -t coreboot_rom.XXXXXXXXXX)" cp "${_corebootrom}" "${corebootrom}" - if [ "${displaymode}" = "txtmode" ] && \ - [ "${payload_memtest}" = "y" ]; then + if [ "${payload_memtest}" = "y" ]; then "${cbfstool}" "${corebootrom}" add-payload \ - -f memtest86plus/memtest -n img/memtest -c lzma || exit 1 + -f ${memtest_bin} -n img/memtest \ + -c lzma || exit 1 fi if [ "${payload_seabios}" = "y" ]; then diff --git a/resources/scripts/build/src/for b/resources/scripts/build/src/for index 032895e2..6761f160 100755 --- a/resources/scripts/build/src/for +++ b/resources/scripts/build/src/for @@ -44,9 +44,9 @@ main() [ -z "${project}" ] && err "project name not specified" [ "${project}" = "ich9utils" ] && project="util/ich9utils" - [ -d "${project}" ] || ./fetch "${project}" || \ - err "Cannot download project, ${project}" - [ -d "${project}" ] || err "Project, ${project}, not downloaded" + [ -d "${project}" ] || ./fetch "${project%/*}" \ + || err "Cannot download project, ${project%/*}" + [ -d "${project}" ] || err "Project, ${project%/*}, not downloaded" if [ "${project}" = "uefitool" ]; then ( |