| Message ID | 20220308145521.3106395-6-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | edk2: update to stable202202 | expand |
On 8/3/22 15:55, Gerd Hoffmann wrote: > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > roms/Makefile.edk2 | 11 +++++++++++ > 1 file changed, 11 insertions(+) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Gerd Hoffmann <kraxel@redhat.com> writes: > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Out of interest how do you usually trigger these builds? ➜ make pc-bios/edk2-x86_64-microvm.fd GIT ui/keycodemapdb meson tests/fp/berkeley-testfloat-3 tests/fp/berkeley-softfloat-3 dtc capstone slirp make: *** No rule to make target 'pc-bios/edk2-x86_64-microvm.fd'. Stop. 🕙11:56:30 alex@zen:qemu.git/builds/all on review/edk2-version-bump [$!?] [🔴 USAGE] ✗ cd roms/ 🕙11:57:07 alex@zen:builds/all/roms on review/edk2-version-bump [$!?] ➜ make ../pc-bios/edk2-x86_64-microvm.fd make: *** No rule to make target '../pc-bios/edk2-x86_64-microvm.fd'. Stop. 🕙11:57:10 alex@zen:builds/all/roms on review/edk2-version-bump [$!?] [🔴 USAGE] ✗ > --- > roms/Makefile.edk2 | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 > index a669019fe5b2..57996c968687 100644 > --- a/roms/Makefile.edk2 > +++ b/roms/Makefile.edk2 > @@ -33,6 +33,7 @@ flashdevs := \ > i386-secure-code \ > x86_64-code \ > x86_64-secure-code \ > + x86_64-microvm \ > \ > arm-vars \ > i386-vars > @@ -145,6 +146,16 @@ submodules: > -D SMM_REQUIRE > cp edk2/Build/Ovmf3264/$(target)_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@ > > +../pc-bios/edk2-x86_64-microvm.fd: submodules > + +./edk2-build.sh \ > + x86_64 \ > + --arch=X64 \ > + --platform=OvmfPkg/Microvm/MicrovmX64.dsc \ > + -D NETWORK_IP6_ENABLE \ > + -D NETWORK_HTTP_BOOT_ENABLE \ > + -D NETWORK_TLS_ENABLE > + cp edk2/Build/MicrovmX64/$(target)_$(call toolchain,x86_64)/FV/MICROVM.fd $@ > + > ../pc-bios/edk2-arm-vars.fd: ../pc-bios/edk2-arm-code.fd > cp edk2/Build/ArmVirtQemu-ARM/$(target)_$(call toolchain,arm)/FV/QEMU_VARS.fd \ > $@
On Wed, Mar 09, 2022 at 11:55:26AM +0000, Alex Bennée wrote: > > Gerd Hoffmann <kraxel@redhat.com> writes: > > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > > Out of interest how do you usually trigger these builds? make -C roms efi (try "make -C roms help" for all firmware build targets). HTH, Gerd
On 9/3/22 13:12, Gerd Hoffmann wrote: > On Wed, Mar 09, 2022 at 11:55:26AM +0000, Alex Bennée wrote: >> >> Gerd Hoffmann <kraxel@redhat.com> writes: >> >>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> >> >> Out of interest how do you usually trigger these builds? > > make -C roms efi > > (try "make -C roms help" for all firmware build targets). See also the 'build-edk2' job in .gitlab-ci.d/edk2.yml.
On Wed, Mar 9, 2022 at 5:43 PM Gerd Hoffmann <kraxel@redhat.com> wrote: > > On Wed, Mar 09, 2022 at 11:55:26AM +0000, Alex Bennée wrote: > > > > Gerd Hoffmann <kraxel@redhat.com> writes: > > > > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > > > > Out of interest how do you usually trigger these builds? > > make -C roms efi Ah good to know. I used instructions here last time: https://wiki.ubuntu.com/UEFI/EDK2 > > (try "make -C roms help" for all firmware build targets). > > HTH, > Gerd >
diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index a669019fe5b2..57996c968687 100644 --- a/roms/Makefile.edk2 +++ b/roms/Makefile.edk2 @@ -33,6 +33,7 @@ flashdevs := \ i386-secure-code \ x86_64-code \ x86_64-secure-code \ + x86_64-microvm \ \ arm-vars \ i386-vars @@ -145,6 +146,16 @@ submodules: -D SMM_REQUIRE cp edk2/Build/Ovmf3264/$(target)_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@ +../pc-bios/edk2-x86_64-microvm.fd: submodules + +./edk2-build.sh \ + x86_64 \ + --arch=X64 \ + --platform=OvmfPkg/Microvm/MicrovmX64.dsc \ + -D NETWORK_IP6_ENABLE \ + -D NETWORK_HTTP_BOOT_ENABLE \ + -D NETWORK_TLS_ENABLE + cp edk2/Build/MicrovmX64/$(target)_$(call toolchain,x86_64)/FV/MICROVM.fd $@ + ../pc-bios/edk2-arm-vars.fd: ../pc-bios/edk2-arm-code.fd cp edk2/Build/ArmVirtQemu-ARM/$(target)_$(call toolchain,arm)/FV/QEMU_VARS.fd \ $@
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- roms/Makefile.edk2 | 11 +++++++++++ 1 file changed, 11 insertions(+)