[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[CI 15/17] grub-shell: Update qemu UEFI firmware names to be more generi
From: |
Glenn Washburn |
Subject: |
[CI 15/17] grub-shell: Update qemu UEFI firmware names to be more generic |
Date: |
Thu, 18 Feb 2021 20:59:34 -0600 |
The current qemu firmware paths for arm-efi and arm64-efi are hardcoded
and not available on Ubuntu/Debian. Make these paths relative and basenames
generic. The idea is that regardless where or what names firmware images
are installed under they can be copied and renamed into a temporary
directory. Then use the -L argument to qemu to point to that directory.
For convenience, the GRUB source directory which build grub-shell will be
added to the list of firmware paths that qemu will search. So all that is
needed is to copy the firmwares to the source directory with potential
renames.
Signed-off-by: Glenn Washburn <development@efficientek.com>
---
tests/util/grub-shell.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 332fae704..33d39d4dd 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -74,7 +74,7 @@ exec_show_error () {
work_directory=${WORKDIR:-`mktemp -d "${TMPDIR:-/tmp}/grub-shell.XXXXXXXXXX"`}
|| exit 1
. "${builddir}/grub-core/modinfo.sh"
-qemuopts="${GRUB_QEMU_OPTS}"
+qemuopts="${GRUB_QEMU_OPTS} -L ${srcdir}"
serial_port=com0
serial_null=
halt_cmd=halt
@@ -194,7 +194,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}"
in
boot=hd
console=console
trim=1
- qemuopts="-machine virt -cpu cortex-a57 -bios
/usr/share/qemu-efi/QEMU_EFI.fd $qemuopts"
+ qemuopts="-machine virt -cpu cortex-a57 -bios OVMF-aarch64.fd $qemuopts"
disk="device virtio-blk-device,drive=hd1 -drive if=none,id=hd1,file="
serial_port=
;;
@@ -203,7 +203,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}"
in
boot=hd
console=console
trim=1
- qemuopts="-machine virt -bios /usr/share/ovmf-arm/QEMU_EFI.fd $qemuopts"
+ qemuopts="-machine virt -bios OVMF-arm.fd $qemuopts"
disk="device virtio-blk-device,drive=hd1 -drive if=none,id=hd1,file="
serial_port=efi0
;;
--
2.27.0
- [CI 04/17] tests: Fail immediately when grub-shell fails and do not occlude the error code, (continued)
- [CI 04/17] tests: Fail immediately when grub-shell fails and do not occlude the error code, Glenn Washburn, 2021/02/18
- [CI 05/17] grub-shell: Allow specifying non-default trim line contents, Glenn Washburn, 2021/02/18
- [CI 07/17] grub-shell: Only show grub-mkrescue output if it returns an error, Glenn Washburn, 2021/02/18
- [CI 08/17] grub-shell: Allow setting default timeout via GRUB_SHELL_DEFAULT_TIMEOUT envvar, Glenn Washburn, 2021/02/18
- [CI 06/17] grub-shell: Trim line should always be matched from the beginning of the line, Glenn Washburn, 2021/02/18
- [CI 10/17] grub-shell: Add grub output logfile with grub-shell --debug, Glenn Washburn, 2021/02/18
- [CI 11/17] grub-shell: Set exit status to qemu exit status, Glenn Washburn, 2021/02/18
- [CI 12/17] tests: Allow turning on shell tracing from environment variables, Glenn Washburn, 2021/02/18
- [CI 13/17] grub-shell: Add --verbose to mkrescue when $debug is greater than 2, Glenn Washburn, 2021/02/18
- [CI 09/17] grub-shell: Put all generated files into working dir and use better file names, Glenn Washburn, 2021/02/18
- [CI 15/17] grub-shell: Update qemu UEFI firmware names to be more generic,
Glenn Washburn <=
- [CI 14/17] grub-shell: Use malta qemu-mips machine type instead off non-existant indy, Glenn Washburn, 2021/02/18
- [CI 17/17] keep: remove a lot of cruft that we probably want to reuse at some point, Glenn Washburn, 2021/02/18
- [CI 16/17] ci: Add .gitlab-ci.yml for continuous integration with Gitlab CI, Glenn Washburn, 2021/02/18