Changeset a114e09 in mainline for tools/grub/mkimage.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/mkimage.sh (modified) (1 diff)

tools/grub/mkimage.sh

@@ -39 +39 @@
 orig_dir="$(cd "$(dirname "$0")" && pwd)"
 grub_tools_dir="$orig_dir/grub-build/i386-pc/bin"
-grub_mod_dir="$orig_dir/../../boot/grub.pc/i386-pc"
+grub_mod_dir="$orig_dir/../../boot/grub/ia32-pc/i386-pc"
 
 "$grub_tools_dir"/grub-mkimage --directory "$grub_mod_dir" \