Changeset a114e09 in mainline for tools/grub/grub-update.sh

Timestamp:

2019-04-10T15:04:17Z (6 years ago)

Author:

Jakub Jermář <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c7c3508

Parents:

3ef901d0

git-author:

Petr Pavlu <setup@…> (2019-03-31 10:06:45)

git-committer:

Jakub Jermář <jakub@…> (2019-04-10 15:04:17)

Message:

Allow per-boot-architecture GRUB files

Organize pre-compiled GRUB binaries per-architecture in order to prepare
the layout for adding an AArch64-EFI version of this bootloader:

• Rename boot/grub.pc to boot/grub/ia32-pc.
• Rename boot/grub.efi to boot/grub/ia32-efi.
• Create symlinks boot/grub/amd64-pc and amd64-efi pointing to boot/grub/ia32-pc and ia32-efi, respectively.

File:

• tools/grub/grub-update.sh (modified) (4 diffs)

tools/grub/grub-update.sh

@@ -72 +72 @@
 git reset --hard "$grub_rev" || exit 1
 
-echo "$grub_rev" >"$helenosdir"/boot/grub.pc/REVISION || exit 1
-echo "$grub_rev" > "$helenosdir"/boot/grub.efi/REVISION || exit 1
+echo "$grub_rev" >"$helenosdir"/boot/grub/ia32-pc/REVISION || exit 1
+echo "$grub_rev" > "$helenosdir"/boot/grub/ia32-efi/REVISION || exit 1
 
 # Build each platform to a different directory
@@ -82 +82 @@
 
 # Extract El Torrito boot image for i386-pc
-cd "$helenosdir"/boot/grub.pc || exit 1
+cd "$helenosdir"/boot/grub/ia32-pc || exit 1
 rm -f pc.img || exit 1
 "$builddir"/i386-pc/bin/grub-mkrescue -o phony --xorriso="$origdir/getimage.sh" || exit 1
 
 # Extract El Torrito boot image for i386-efi
-cd "$helenosdir"/boot/grub.efi || exit 1
+cd "$helenosdir"/boot/grub/ia32-efi || exit 1
 rm -f efi.img.gz || exit 1
 "$builddir"/i386-efi/bin/grub-mkrescue -o phony --xorriso="$origdir/getimage.sh" || exit 1
@@ -93 +93 @@
 
 # Extract El Torrito boot image for x86_64-efi
-cd "$helenosdir"/boot/grub.efi || exit 1
+cd "$helenosdir"/boot/grub/ia32-efi || exit 1
 rm -f efi.img.gz || exit 1
 "$builddir"/x86_64-efi/bin/grub-mkrescue -o phony --xorriso="$origdir/getimage.sh" || exit 1
@@ -106 +106 @@
 
 # Update Grub files for all platforms
-grub_files_update grub.pc i386-pc
-grub_files_update grub.efi i386-efi
-grub_files_update grub.efi x86_64-efi
+grub_files_update grub/ia32-pc i386-pc
+grub_files_update grub/ia32-efi i386-efi
+grub_files_update grub/ia32-efi x86_64-efi
 
 echo "GRUB update successful."