From 6d6bd5eee0cdb626fb5e054db08c8e6136cfe579 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Sat, 27 Aug 2022 21:25:43 +0300 Subject: build/roms: Rebuild cbutils module before starting coreboot build In recent coreboot versions, running distclean started to erase the cbfstool binary we built earlier in the util/cbfstool dir via the cbutils build script call. The coreboot build puts it in a different directory, and the roms build script can't find it when trying to add payloads to the roms. This doesn't make the script fail (because set -e is stupid like that), and the build appears to succeed if you don't look close enough to see the "cbfsutil not found" error. Build the coreboot utils we want at the places we want them after calling distclean, so that we can actually use cbfsutil and avoid silently-broken roms with newer coreboot versions. Signed-off-by: Alper Nebi Yasak --- resources/scripts/build/boot/roms_helper | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper index deb40d57..951e19ba 100755 --- a/resources/scripts/build/boot/roms_helper +++ b/resources/scripts/build/boot/roms_helper @@ -307,6 +307,7 @@ mkCoreboot() { make distclean ) cp "${cbcfgpath}" "${cbdir}"/.config + ./build module cbutils ${cbdir#coreboot/} ( cd "${cbdir}" make -j$(nproc) -- cgit v1.2.1