diff --git a/3.5.0.tar.gz b/3.5.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a2be1b584cbec60770d4836764ffc0c7c044b903 Binary files /dev/null and b/3.5.0.tar.gz differ diff --git a/brotli-gitf4153a0.tar.gz b/brotli-gita528bce.tar.gz similarity index 41% rename from brotli-gitf4153a0.tar.gz rename to brotli-gita528bce.tar.gz index e252ff46bcbe34cd17d2d4ba6cea479a59792604..21f3a0b6d3dde9ada5b17ca853a1ab0e8320683c 100644 Binary files a/brotli-gitf4153a0.tar.gz and b/brotli-gita528bce.tar.gz differ diff --git a/edk2-platforms-7f42d4034c8f.tar.xz b/edk2-platforms-7f42d4034c8f.tar.xz deleted file mode 100644 index 75212941f914a44f3b3104085740efc963937816..0000000000000000000000000000000000000000 Binary files a/edk2-platforms-7f42d4034c8f.tar.xz and /dev/null differ diff --git a/edk2-platforms-a912d9fcf7d1.tar.xz b/edk2-platforms-a912d9fcf7d1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..d95202a65b56ac401d864d3130504acdce945e37 Binary files /dev/null and b/edk2-platforms-a912d9fcf7d1.tar.xz differ diff --git a/edk2-stable202402.tar.gz b/edk2-stable202405.tar.gz similarity index 65% rename from edk2-stable202402.tar.gz rename to edk2-stable202405.tar.gz index 07ca4d6cb44cf9282ddb0aea91ce2838987e2ba9..7be8f9ac1238409afcf9d0f9591602b994cb2380 100644 Binary files a/edk2-stable202402.tar.gz and b/edk2-stable202405.tar.gz differ diff --git a/edk2.spec b/edk2.spec index 9ee41a6b47dfb6367a5759519e022e65b76282b0..d0dac7b9a0b6919a59ea824d0e56be1833b48c5c 100644 --- a/edk2.spec +++ b/edk2.spec @@ -1,11 +1,11 @@ -%define anolis_release 6 +%define anolis_release 1 %undefine _auto_set_build_flags ExclusiveArch: x86_64 aarch64 loongarch64 -# edk2-stable202402 -%define GITDATE 20240214 -%define GITCOMMIT edc6681206c1 +# edk2-stable202405 +%define GITDATE 20240524 +%define GITCOMMIT 3e722403cd16 %define TOOLCHAIN GCC5 %define OPENSSL_VER 3.0.12 @@ -27,7 +27,7 @@ ExclusiveArch: x86_64 aarch64 loongarch64 Name: edk2 -Version: 202402 +Version: 202405 Release: %{anolis_release}%{?dist} Summary: UEFI firmware for 64-bit virtual machines License: BSD-2-Clause-Patent and OpenSSL and MIT @@ -38,11 +38,13 @@ Source1: ovmf-whitepaper-c770f8c.txt Source2: openssl-%{OPENSSL_VER}.tar.gz # https://github.com/ucb-bar/berkeley-softfloat-3/tree/b64af41c3276f97f0e181920400ee056b9c88037 Source3: softfloat-%{softfloat_version}.tar.xz -# https://github.com/tianocore/edk2-platforms/commit/7f42d4034c8f4266da691df69dce18234f752cb4 -Source4: edk2-platforms-7f42d4034c8f.tar.xz +# https://github.com/tianocore/edk2-platforms/tree/a912d9fcf7d1f735e999b6587896dd3597a36560 +Source4: edk2-platforms-a912d9fcf7d1.tar.xz Source5: https://github.com/akheron/jansson/releases/download/v2.13.1/jansson-2.13.1.tar.bz2 -# https://github.com/google/brotli/tree/f4153a09f87cbb9c826d8fc12c74642bb2d879ea -Source6: brotli-gitf4153a0.tar.gz +# https://github.com/google/brotli/tree/a528bce9f65be7515a47cec2cbdcd8023822b99b +Source6: brotli-gita528bce.tar.gz +# https://github.com/DMTF/libspdm/releases +Source7: 3.5.0.tar.gz # json description files Source10: 50-edk2-aarch64.json @@ -60,36 +62,33 @@ Source51: 51-edk2-loongarch64-verbose.json Source80: https://gitlab.com/kraxel/edk2-build-config/-/blob/master/bin/edk2-build.py Source81: edk2-build +# update 202405 need new patch # LoongArch patches for edk2-platforms -Source90: 0023-Platform-Loongson-Remove-minimium-memory-size-limita.patch -Source91: 0024-Platform-Loongson-Modify-loongarch-uefi-firmware-siz.patch - -Patch0001: 0001-MdePkg-Add-StandardSignatureIsHygonGenuine-in-BaseCp.patch -Patch0002: 0002-UefiCpuPkg-LocalApicLib-Exclude-second-SendIpi-seque.patch -Patch0003: 0003-OvmfPkg-Add-CSV-secure-call-library-on-Hygon-CPU.patch -Patch0004: 0004-OvmfPkg-Tcg-Add-CsvLib-for-TpmMmioSevDecryptPei.patch -Patch0005: 0005-OvmfPkg-ResetVector-Support-CSV-in-ResetVector-phase.patch -Patch0006: 0006-OvmfPkg-PlatformPei-Initialize-CSV-VM-s-memory.patch -Patch0007: 0007-OvmfPkg-BaseMemcryptSevLib-update-page-status-to-Sec.patch -Patch0008: 0008-OvmfPkg-Add-CsvDxe-driver.patch -Patch0009: 0009-OvmfPkg-IoMmuDxe-Add-CsvIoMmu-protocol.patch -Patch0010: 0010-OvmfPkg-Reserve-a-CPUID-table-page-for-CSV-guest.patch -Patch0011: 0011-OvmfPkg-Use-classic-mmio-window-for-CSV-guest.patch -Patch0012: 0012-OvmfPkg-BaseMemEncryptLib-Detect-SEV-live-migration-.patch -Patch0013: 0013-OvmfPkg-BaseMemEncryptLib-Hypercall-API-for-page-enc.patch -Patch0014: 0014-OvmfPkg-BaseMemEncryptLib-Invoke-page-encryption-sta.patch -Patch0015: 0015-OvmfPkg-VmgExitLib-Encryption-state-change-hypercall.patch -Patch0016: 0016-OvmfPkg-PlatformPei-Mark-SEC-GHCB-page-as-unencrypte.patch -Patch0017: 0017-OvmfPkg-AmdSevDxe-Add-support-for-SEV-live-migration.patch -Patch0018: 0018-OvmfPkg-BaseMemcryptSevLib-Correct-the-calculation-o.patch -Patch0019: 0019-OvmfPkg-BaseMemEncryptLib-Return-SUCCESS-if-not-supp.patch -Patch0020: 0020-OvmfPkg-BaseMemEncryptLib-Save-memory-encrypt-status.patch -Patch0021: 0021-OvmfPkg-IoMmuDxe-Implement-SetAttribute-of-CsvIoMmu.patch - -# CVE-2023-45236 & CVE-2023-45237 -# Upstream fix: https://github.com/tianocore/edk2/security/advisories/GHSA-hc6x-cw6p-gj7h -# 漏洞 8-9 的补丁文件现在通过 https://bugzilla.tianocore.org/show_bug.cgi?id=4541 和 https://bugzilla.tianocore.org/show_bug.cgi?id=4542 提供。这些修补程序已集成到 2024 年 5 月的 EDK2 版本 （edk2-stable202405） 中。 -Patch0022: 0022-Bugfix-for-CVE-2023-45236-CVE-2023-45237.patch +#Source90: 0023-Platform-Loongson-Remove-minimium-memory-size-limita.patch +#Source91: 0024-Platform-Loongson-Modify-loongarch-uefi-firmware-siz.patch + +# update 202405 need new patch +#Patch0001: 0001-MdePkg-Add-StandardSignatureIsHygonGenuine-in-BaseCp.patch +#Patch0002: 0002-UefiCpuPkg-LocalApicLib-Exclude-second-SendIpi-seque.patch +#Patch0003: 0003-OvmfPkg-Add-CSV-secure-call-library-on-Hygon-CPU.patch +#Patch0004: 0004-OvmfPkg-Tcg-Add-CsvLib-for-TpmMmioSevDecryptPei.patch +#Patch0005: 0005-OvmfPkg-ResetVector-Support-CSV-in-ResetVector-phase.patch +#Patch0006: 0006-OvmfPkg-PlatformPei-Initialize-CSV-VM-s-memory.patch +#Patch0007: 0007-OvmfPkg-BaseMemcryptSevLib-update-page-status-to-Sec.patch +#Patch0008: 0008-OvmfPkg-Add-CsvDxe-driver.patch +#Patch0009: 0009-OvmfPkg-IoMmuDxe-Add-CsvIoMmu-protocol.patch +#Patch0010: 0010-OvmfPkg-Reserve-a-CPUID-table-page-for-CSV-guest.patch +#Patch0011: 0011-OvmfPkg-Use-classic-mmio-window-for-CSV-guest.patch +#Patch0012: 0012-OvmfPkg-BaseMemEncryptLib-Detect-SEV-live-migration-.patch +#Patch0013: 0013-OvmfPkg-BaseMemEncryptLib-Hypercall-API-for-page-enc.patch +#Patch0014: 0014-OvmfPkg-BaseMemEncryptLib-Invoke-page-encryption-sta.patch +#Patch0015: 0015-OvmfPkg-VmgExitLib-Encryption-state-change-hypercall.patch +#Patch0016: 0016-OvmfPkg-PlatformPei-Mark-SEC-GHCB-page-as-unencrypte.patch +#Patch0017: 0017-OvmfPkg-AmdSevDxe-Add-support-for-SEV-live-migration.patch +#Patch0018: 0018-OvmfPkg-BaseMemcryptSevLib-Correct-the-calculation-o.patch +#Patch0019: 0019-OvmfPkg-BaseMemEncryptLib-Return-SUCCESS-if-not-supp.patch +#Patch0020: 0020-OvmfPkg-BaseMemEncryptLib-Save-memory-encrypt-status.patch +#Patch0021: 0021-OvmfPkg-IoMmuDxe-Implement-SetAttribute-of-CsvIoMmu.patch BuildRequires: python3-devel BuildRequires: libuuid-devel @@ -230,6 +229,7 @@ mv CryptoPkg/Library/OpensslLib/openssl-%{OPENSSL_VER} CryptoPkg/Library/Openssl tar -xf %{SOURCE3} --strip-components=1 --directory ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3/ tar -xf %{SOURCE4} --strip-components=1 "*/Drivers" "*/Features" "*/Platform" "*/Silicon" tar -xf %{SOURCE5} --strip-components=1 --directory RedfishPkg/Library/JsonLib/jansson +tar -xf %{SOURCE7} --strip-components=1 --directory SecurityPkg/DeviceSecurity/SpdmLib/libspdm tar -C MdeModulePkg/Library/BrotliCustomDecompressLib -a -f %{SOURCE6} -x tar -C BaseTools/Source/C/BrotliCompress -a -f %{SOURCE6} -x # include paths pointing to unused submodules @@ -247,10 +247,11 @@ cp -a -- \ %{SOURCE50} %{SOURCE51} %{SOURCE80} %{SOURCE81} \ . +# update 202405 need new patch # The following patches need to be applied in the Platform directory of edk2-platforms, # so the patches must be applied after edk2-platforms is unpacked. -%{__patch} -p1 -i %{SOURCE90} -%{__patch} -p1 -i %{SOURCE91} +#%%{__patch} -p1 -i %{SOURCE90} +#%%{__patch} -p1 -i %{SOURCE91} %build @@ -494,6 +495,9 @@ install -m 0644 \ %changelog +* Fri Nov 22 2024 mgb01105731 - 202405-1 +- update to 20240524 + * Tue Nov 19 2024 Xiaotian Wu - 202402-6 - Update LoongArch virtual machine - 0023-Platform-Loongson-Remove-minimium-memory-size-limita.patch