From c83d1a8dc4efea50aa17af930ec7b8289dad2390 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 20 Aug 2023 16:36:49 +0100 Subject: [PATCH] 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 --- resources/scripts/build/boot/roms_helper | 2 +- resources/scripts/build/{payload/grub => grub/payload} | 2 +- resources/scripts/build/{module/grub => grub/utils} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename resources/scripts/build/{payload/grub => grub/payload} (99%) rename resources/scripts/build/{module/grub => grub/utils} (100%) 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 similarity index 99% rename from resources/scripts/build/payload/grub rename to 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 similarity index 100% rename from resources/scripts/build/module/grub rename to resources/scripts/build/grub/utils