summaryrefslogtreecommitdiff
path: root/resources/scripts/build
diff options
context:
space:
mode:
authorAlper Nebi Yasak <alpernebiyasak@gmail.com>2022-12-07 21:41:33 +0300
committerAlper Nebi Yasak <alpernebiyasak@gmail.com>2022-12-10 14:19:00 +0300
commit9fb4ecec62b0430fa8e405d2133a4579020e522b (patch)
tree8ae5395f280fbda1a9bd567125c8ae49f02547f9 /resources/scripts/build
parent4e3097b5e7b6b80dff3f76046f28e5816e877578 (diff)
build/roms: Don't build Memtest86+ when not specified by cmdline
When overriding which payloads will be built with the -p command line argument, the roms_helper script builds the Memtest86+ payload before checking if it should be disabled. Move the build command after the command line override. Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Diffstat (limited to 'resources/scripts/build')
-rwxr-xr-xresources/scripts/build/boot/roms_helper12
1 files changed, 6 insertions, 6 deletions
diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper
index e2b152d9..a59c4285 100755
--- a/resources/scripts/build/boot/roms_helper
+++ b/resources/scripts/build/boot/roms_helper
@@ -146,12 +146,6 @@ if [ "${payload_uboot}" = "y" ] && \
uboot_config="default"
fi
-if [ "${payload_memtest}" = "y" ]; then
- if [ ! -f "memtest86plus/memtest" ]; then
- ./build module memtest86plus
- fi
-fi
-
# Override all payload directives with cmdline args
if [ ! -z ${payloads} ]; then
echo "setting payloads $payloads"
@@ -219,6 +213,12 @@ if [ ! -f "${seavgabiosrom}" ] \
fi
fi
+if [ "${payload_memtest}" = "y" ]; then
+ if [ ! -f "memtest86plus/memtest" ]; then
+ ./build module memtest86plus
+ fi
+fi
+
[ -d "${romdir}/" ] || mkdir -p "${romdir}/"
rm -f "${romdir}"/*