diff --git a/edk2-build b/edk2-build index 2f555895123353796406e1ae40e7a64166ba0894..5865fd2bdd5be529f6e5279ea91b684105d835f1 100644 --- a/edk2-build +++ b/edk2-build @@ -27,6 +27,12 @@ DEBUG_PRINT_ERROR_LEVEL = 0x8040004F [opts.armvirt.silent] DEBUG_PRINT_ERROR_LEVEL = 0x80000000 +[pcds.nx.strict] +PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD5 + +[pcds.nx.broken.grub] +# grub.efi uses EfiLoaderData for code +PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1 ##################################################################### # stateful ovmf builds (with vars in flash) @@ -89,6 +95,7 @@ conf = ArmVirtPkg/ArmVirtQemu.dsc arch = AARCH64 opts = ovmf.common armvirt.verbose +pcds = nx.broken.grub plat = ArmVirtQemu-AARCH64 dest = edk2-build-dir/aarch64 cpy1 = FV/QEMU_EFI.fd @@ -104,6 +111,7 @@ conf = ArmVirtPkg/ArmVirtQemu.dsc arch = AARCH64 opts = ovmf.common armvirt.silent +pcds = nx.broken.grub plat = ArmVirtQemu-AARCH64 dest = edk2-build-dir/aarch64 cpy1 = FV/QEMU_EFI.fd QEMU_EFI.silent.fd diff --git a/edk2.spec b/edk2.spec index 7b966b53ed7d4a419ff0c70c5b710514dc178585..d93fc4651ab9ab8da46fb6e887f8c1ccca90d7ee 100644 --- a/edk2.spec +++ b/edk2.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %undefine _auto_set_build_flags ExclusiveArch: x86_64 aarch64 @@ -193,13 +193,13 @@ touch OvmfPkg/AmdSev/Grub/grub.efi # dummy %if %{build_ovmf} -./edk2-build.py --config edk2-build --silent --release-date "$RELEASE_DATE" -m ovmf +./edk2-build.py --config edk2-build --release-date "$RELEASE_DATE" -m ovmf build_iso edk2-build-dir/ovmf %endif %if %{build_aarch64} -./edk2-build.py --config edk2-build --silent --release-date "$RELEASE_DATE" -m armvirt +./edk2-build.py --config edk2-build --release-date "$RELEASE_DATE" -m armvirt for raw in */aarch64/*.raw; do qcow2="${raw%.raw}.qcow2" qemu-img convert -f raw -O qcow2 -o cluster_size=4096 -S 4096 "$raw" "$qcow2" @@ -358,5 +358,8 @@ install -m 0644 \ %changelog -* Wed Mar 15 2023 Chunmei Xu - 202303-1 +* Sun Apr 23 2023 Chunmei Xu - 202302-2 +- add nx config to fix vm failed on aarch64 + +* Wed Mar 15 2023 Chunmei Xu - 202302-1 - init from upstream