From ea0f0cbf62cabc224a25acdb8c2e2bbb2cc3e4e4 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 20 Sep 2022 09:22:56 +0200 Subject: [PATCH] add 4m builds --- edk2.spec | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/edk2.spec b/edk2.spec index 4c547e7..09516c6 100644 --- a/edk2.spec +++ b/edk2.spec @@ -23,8 +23,10 @@ ExclusiveArch: x86_64 aarch64 %ifarch aarch64 %define build_aarch64 1 %endif +%define build_ovmf_4m 0 %else %define build_ovmf 1 +%define build_ovmf_4m 1 %define build_aarch64 1 %endif @@ -270,6 +272,9 @@ OVMF_SB_FLAGS="${OVMF_SB_FLAGS} -D SECURE_BOOT_ENABLE" OVMF_SB_FLAGS="${OVMF_SB_FLAGS} -D SMM_REQUIRE" OVMF_SB_FLAGS="${OVMF_SB_FLAGS} -D EXCLUDE_SHELL_FROM_FD" +OVMF_4M_FLAGS="" +OVMF_4M_FLAGS="${OVMF_4M_FLAGS} -D FD_SIZE_IN_KB=4096" + %if %{disable_werror} sed -i -e 's/-Werror//' Conf/tools_def.txt %endif @@ -318,6 +323,19 @@ build_iso() { %if %{build_ovmf} +%if %{build_ovmf_4m} +build ${OVMF_FLAGS} ${OVMF_4M_FLAGS} -a X64 \ + -p OvmfPkg/OvmfPkgX64.dsc +build ${OVMF_SB_FLAGS} ${OVMF_4M_FLAGS} -a IA32 -a X64 \ + -p OvmfPkg/OvmfPkgIa32X64.dsc + +mkdir ovmf-4m +cp -a Build/OvmfX64/DEBUG_%{TOOLCHAIN}/FV/OVMF_*.fd ovmf-4m +cp -a Build/Ovmf3264/DEBUG_%{TOOLCHAIN}/FV/OVMF_CODE.fd ovmf-4m/OVMF_CODE.secboot.fd +ls -la ovmf-4m +rm -rf Build/OvmfX64 +%endif + # Build with neither SB nor SMM; include UEFI shell. build ${OVMF_FLAGS} -a X64 \ -p OvmfPkg/OvmfPkgX64.dsc @@ -428,6 +446,10 @@ mkdir -p \ %{buildroot}%{_datadir}/OVMF \ %{buildroot}%{_datadir}/%{name}/ovmf +%if %{build_ovmf_4m} +cp -a ovmf-4m %{buildroot}%{_datadir}/%{name} +%endif + install -m 0644 Build/OvmfX64/DEBUG_%{TOOLCHAIN}/FV/OVMF_CODE.fd \ %{buildroot}%{_datadir}/%{name}/ovmf/OVMF_CODE.fd install -m 0644 Build/OvmfX64/DEBUG_%{TOOLCHAIN}/FV/OVMF_CODE.fd \ @@ -612,6 +634,11 @@ virt-fw-vars --input Build/Ovmf3264/DEBUG_%{TOOLCHAIN}/FV/OVMF_VARS.secboot.fd \ %{_datadir}/qemu/firmware/60-edk2-ovmf-nosb.json %{_datadir}/qemu/firmware/60-edk2-ovmf-microvm.json %endif +%if %{build_ovmf_4m} +%{_datadir}/%{name}/ovmf-4m/OVMF_CODE.fd +%{_datadir}/%{name}/ovmf-4m/OVMF_CODE.secboot.fd +%{_datadir}/%{name}/ovmf-4m/OVMF_VARS.fd +%endif # endif build_ovmf %endif