From fa926632148b78ed327f5d674dad9a5ee243af9a Mon Sep 17 00:00:00 2001 From: Riku Viitanen Date: Mon, 21 Aug 2023 20:35:06 +0300 Subject: memtest86+ v6.20 uses 32-bit variant for x86_32 arch. 64-bit for x86_64. resources/scripts/build/src/for: modified it a bit. when building e.g. "memtest86plus/build32" it correctly fetches "memtest86plus" instead. but builds memtest86plus/build32, which is inside that git repo Signed-off-by: Riku Viitanen --- resources/scripts/build/boot/roms_helper | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'resources/scripts/build/boot') 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 @@ # # Copyright (C) 2022 Caleb La Grange # Copyright (C) 2022 Alper Nebi Yasak +# Copyright (C) 2023 Riku Viitanen # # 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 -- cgit v1.2.1