As the recent work to get PCI Passthrough testing working shows, putting
`/bin/false` as a ROM into guest context doesn't work so well.
For all ROM paths where we're skipping the build, use a slightly-plausible but
likely non-existent path instead.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
---
automation/scripts/build | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/automation/scripts/build b/automation/scripts/build
index d830cff7b7c7..197d085f3e07 100755
--- a/automation/scripts/build
+++ b/automation/scripts/build
@@ -67,9 +67,9 @@ else
if [[ "${cc_is_clang}" == "y" ]]; then
# SeaBIOS cannot be built with clang
- cfgargs+=("--with-system-seabios=/usr/share/seabios/bios.bin")
+ cfgargs+=("--with-system-seabios=/usr/share/no-seabios.bin")
# iPXE cannot be built with clang
- cfgargs+=("--with-system-ipxe=/usr/lib/ipxe/ipxe.pxe")
+ cfgargs+=("--with-system-ipxe=/usr/share/no-ipxe.pxe")
# newlib cannot be built with clang so we cannot build stubdoms
cfgargs+=("--disable-stubdom")
fi
@@ -87,7 +87,7 @@ else
# SeaBIOS requires GCC 4.6 or later
if [[ "${cc_is_gcc}" == "y" && "${cc_ver}" -lt 0x040600 ]]; then
- cfgargs+=("--with-system-seabios=/bin/false")
+ cfgargs+=("--with-system-seabios=/usr/share/no-seabios.bin")
fi
./configure "${cfgargs[@]}"
--
2.30.2
On Wed, 26 Apr 2023, Andrew Cooper wrote: > As the recent work to get PCI Passthrough testing working shows, putting > `/bin/false` as a ROM into guest context doesn't work so well. > > For all ROM paths where we're skipping the build, use a slightly-plausible but > likely non-existent path instead. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Assuming you (or patchew) tested it: Acked-by: Stefano Stabellini <sstabellini@kernel.org> > --- > CC: Anthony PERARD <anthony.perard@citrix.com> > CC: Stefano Stabellini <sstabellini@kernel.org> > CC: Michal Orzel <michal.orzel@amd.com> > CC: Doug Goldstein <cardoe@cardoe.com> > CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> > --- > automation/scripts/build | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/automation/scripts/build b/automation/scripts/build > index d830cff7b7c7..197d085f3e07 100755 > --- a/automation/scripts/build > +++ b/automation/scripts/build > @@ -67,9 +67,9 @@ else > > if [[ "${cc_is_clang}" == "y" ]]; then > # SeaBIOS cannot be built with clang > - cfgargs+=("--with-system-seabios=/usr/share/seabios/bios.bin") > + cfgargs+=("--with-system-seabios=/usr/share/no-seabios.bin") > # iPXE cannot be built with clang > - cfgargs+=("--with-system-ipxe=/usr/lib/ipxe/ipxe.pxe") > + cfgargs+=("--with-system-ipxe=/usr/share/no-ipxe.pxe") > # newlib cannot be built with clang so we cannot build stubdoms > cfgargs+=("--disable-stubdom") > fi > @@ -87,7 +87,7 @@ else > > # SeaBIOS requires GCC 4.6 or later > if [[ "${cc_is_gcc}" == "y" && "${cc_ver}" -lt 0x040600 ]]; then > - cfgargs+=("--with-system-seabios=/bin/false") > + cfgargs+=("--with-system-seabios=/usr/share/no-seabios.bin") > fi > > ./configure "${cfgargs[@]}" > -- > 2.30.2 >
© 2016 - 2024 Red Hat, Inc.