tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Only pass SeaBIOS fw_opt for x86 non-EFI platforms

Browse Source 
This breaks the tests on pseries - just restrict it to x86 platforms
that don't specify an EFI.

Signed-off-by: Daniel Axtens <dja@axtens.net>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Daniel Axtens 2022-04-21 15:24:13 +10:00 committed by Daniel Kiper
parent 2f4430cc0a
commit 188d2ff1c3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/util/grub-shell.in
View File

@ -376,8 +376,12 @@ if test -z "$debug"; then
# workaround unfortunately causes qemu to issue a warning 'externally
# provided fw_cfg item names should be prefixed with "opt/"', but there
# doesn't seem to be a better option.
#
# SeaBIOS is used for i386, except on EFI.
if [ ${grub_modinfo_target_cpu} == 'i386' ] && [ ${grub_modinfo_platform} != 'efi' ]; then
qemuopts="${qemuopts} -fw_cfg name=etc/sercon-port,string=0"
fi
fi
if [ x$boot != xnet ] && [ x$boot != xemu ]; then
pkgdatadir="@builddir@" "@builddir@/grub-mkrescue" "--output=${isofile}" "--override-directory=${builddir}/grub-core" \