summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-08-20 16:36:49 +0100
committerLeah Rowe <leah@libreboot.org>2023-08-20 16:40:11 +0100
commitc83d1a8dc4efea50aa17af930ec7b8289dad2390 (patch)
treeb009c990e513af0c47b45af3f75cf4bece8c5831
parent438bf2c9b113eab11439c9c65449e269e5b4b095 (diff)
unify grub scripts under one directory
new commands are thus, build grub payloads: ./build grub payload (formerly ./build payload grub) build grub utils: ./build grub utils (formerly ./build module grub) The scripts is build/module/ will mostly be deleted. I say mostly, because some of them are being moved instead. The deleted ones will be ones that basically just run "make" in the target directory. They will be unified, in a follow-up patch. Signed-off-by: Leah Rowe <leah@libreboot.org>
-rwxr-xr-xresources/scripts/build/boot/roms_helper2
-rwxr-xr-xresources/scripts/build/grub/payload (renamed from resources/scripts/build/payload/grub)2
-rwxr-xr-xresources/scripts/build/grub/utils (renamed from resources/scripts/build/module/grub)0
3 files changed, 2 insertions, 2 deletions
diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper
index 0ae914e1..8ea3ae0e 100755
--- a/resources/scripts/build/boot/roms_helper
+++ b/resources/scripts/build/boot/roms_helper
@@ -205,7 +205,7 @@ if [ "${payload_grub}" = "y" ] \
if [ ! -f "${grubelf}" ] || [ ! -f "${grubcfg}" ] || \
[ ! -f "${grubtestcfg}" ]; then
- ./build payload grub
+ ./build grub payload
fi
done
fi
diff --git a/resources/scripts/build/payload/grub b/resources/scripts/build/grub/payload
index 636e9f3e..bf52d2a1 100755
--- a/resources/scripts/build/payload/grub
+++ b/resources/scripts/build/grub/payload
@@ -33,7 +33,7 @@ main()
[ ! -d "grub/" ] && \
./fetch grub
[ ! -f "grub/grub-mkstandalone" ] && \
- ./build module grub
+ ./build grub utils
[ ! -d "elf/" ] && \
mkdir -p elf/
[ ! -d "elf/grub" ] && \
diff --git a/resources/scripts/build/module/grub b/resources/scripts/build/grub/utils
index edad6b2a..edad6b2a 100755
--- a/resources/scripts/build/module/grub
+++ b/resources/scripts/build/grub/utils