From 3492c78d217602027ef6df218e50151b58ba9623 Mon Sep 17 00:00:00 2001 From: kth5 Date: Tue, 16 Jul 2024 08:23:37 +0200 Subject: [PATCH] * update edk2 to 202311-1 --- edk2/PKGBUILD | 73 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 30 deletions(-) diff --git a/edk2/PKGBUILD b/edk2/PKGBUILD index 0965cf2874..56fe76c055 100644 --- a/edk2/PKGBUILD +++ b/edk2/PKGBUILD @@ -1,25 +1,37 @@ -# POWER Maintainer: Alexander Baldeck # Maintainer: David Runge # Contributor: Alexander Epaneshnikov _brotli_ver=1.0.9 -_openssl_ver=1.1.1s +_openssl_ver=3.0.9 pkgbase=edk2 pkgname=(edk2-arm edk2-aarch64 edk2-shell edk2-ovmf) -pkgver=202211 -_commit=fff6d81270b57ee786ea18ad74f43149b9f03494 # refs/tags/edk2-stable202211 -pkgrel=3 +pkgver=202311 +_commit=8736b8fdca85e02933cdb0a13309de14c9799ece # refs/tags/edk2-stable202311 +pkgrel=1 pkgdesc="Modern, feature-rich firmware development environment for the UEFI specifications" arch=(any) url="https://github.com/tianocore/edk2" -license=(BSD) -makedepends=(aarch64-linux-gnu-gcc arm-none-eabi-gcc acpica git iasl util-linux-libs nasm python seabios) -options=(!makeflags !distcc) +license=( + Apache-2.0 + BSD-2-Clause-Patent + MIT +) +makedepends=( + aarch64-linux-gnu-gcc + arm-none-eabi-gcc + acpica + git + util-linux-libs + nasm + python + seabios +) +options=(!makeflags) source=( git+$url#tag=$_commit $pkgbase-softfloat::git+https://github.com/ucb-bar/berkeley-softfloat-3.git https://www.openssl.org/source/openssl-$_openssl_ver.tar.gz{,.asc} - brotli-$_brotli_ver.tar.gz::https://github.com/google/brotli/archive/v$_brotli_ver.tar.gz + https://github.com/google/brotli/archive/v$_brotli_ver/brotli-$_brotli_ver.tar.gz 50-edk2-ovmf-i386-secure.json 50-edk2-ovmf-i386-secure-4m.json 50-edk2-ovmf-x86_64-secure.json @@ -46,7 +58,7 @@ source=( ) sha512sums=('SKIP' 'SKIP' - '2ef983f166b5e1bf456ca37938e7e39d58d4cd85e9fc4b5174a05f5c37cc5ad89c3a9af97a6919bcaab128a8a92e4bdc8a045e5d9156d90768da8f73ac67c5b9' + '86c99146b37236419b110db77dd3ac3992e6bed78c258f0cc3434ca233460b4e17c0ac81d7058547fe9cb72a9fd80ee56d4b4916bb731dbe2bbcf1c3d46bf31a' 'SKIP' 'b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5' '9182615c6f89e4f3c19f1b0f4434aa0a3293f982cf3ed783a2c140c2555d824b417c7c3c7a00ad10616188507f5068226c720b20ffd41d44449605ba0844bad2' @@ -74,7 +86,7 @@ sha512sums=('SKIP' 'd074c794796d17d77eed7c34201d93d7ef3f1322fe1ea4a2ddd7137fae884d49f94f465ee39cfd8346b026142668a41f5a8671e521409505dd6d002f71c0eebc') b2sums=('SKIP' 'SKIP' - 'ecd19eaf84dbc80448b51651abe52a89cc0052f024537959c4ebe61528988f235d661244fce6967159a876dd038c817bad19df742e828ca1cbae97ce6a4124bb' + 'cc1df41fa12ba4443e15e94f6ebdc5e103b9dab5eab2e1c8f74e6a74fa2c38207817921b65d7293cb241c190a910191c7163600bb75243adde0e2f9ec31cc885' 'SKIP' '8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904' '98742b83c2d605772a1bfa64ee434430413516db13d80235f0bc0be3a0e930aa17d737a6d2c95ce3d60f33de9f93679e09f421632d9e3fc9575d662fcf198f4b' @@ -109,12 +121,12 @@ _arch_list=(ARM AARCH64 IA32 X64) _build_type=RELEASE _build_plugin=GCC5 -prepare() { - if [ ! "${CARCH}" = 'x86_64' ]; then - error "Must be built on a x86_64 host" - return 1 - fi +pkgver() { + cd $pkgbase + git describe --tags --abbrev=7 | sed 's/^edk2-stable//;s/\([^-]*-g\)/r\1/;s/-/./g' +} +prepare() { # patch to be able to use brotli 1.0.9 patch -Np1 -d $pkgbase -i ../$pkgbase-202202-brotli.patch @@ -189,6 +201,7 @@ build() { ARCH=ARM make -C BaseTools echo "Building base tools" make -C BaseTools + # expose build tooling in PATH . edksetup.sh for _arch in ${_arch_list[@]}; do @@ -199,7 +212,7 @@ build() { case "$_arch" in IA32) echo "Building ovmf ($_arch) with secure boot support" - OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32.dsc \ + BaseTools/BinWrappers/PosixLike/build -p OvmfPkg/OvmfPkgIa32.dsc \ -a "$_arch" \ "${_common_args[@]}" \ "${_efi_args[@]}" \ @@ -210,7 +223,7 @@ build() { -D SMM_REQUIRE mv -v Build/Ovmf{Ia32,IA32-secure} echo "Building ovmf ($_arch) with secure boot support (4MB FD)" - OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32.dsc \ + BaseTools/BinWrappers/PosixLike/build -p OvmfPkg/OvmfPkgIa32.dsc \ -a "$_arch" \ "${_common_args[@]}" \ "${_efi_args[@]}" \ @@ -221,7 +234,7 @@ build() { -D SMM_REQUIRE mv -v Build/Ovmf{Ia32,IA32-secure-4mb} echo "Building ovmf ($_arch) with CSM support" - OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32.dsc \ + BaseTools/BinWrappers/PosixLike/build -p OvmfPkg/OvmfPkgIa32.dsc \ -a "${_arch}" \ "${_common_args[@]}" \ "${_efi_args[@]}" \ @@ -230,7 +243,7 @@ build() { -D LOAD_X64_ON_IA32_ENABLE mv -v Build/Ovmf{Ia32,IA32-csm} echo "Building ovmf ($_arch) with CSM support (4MB FD)" - OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32.dsc \ + BaseTools/BinWrappers/PosixLike/build -p OvmfPkg/OvmfPkgIa32.dsc \ -a "${_arch}" \ "${_common_args[@]}" \ "${_efi_args[@]}" \ @@ -239,7 +252,7 @@ build() { -D LOAD_X64_ON_IA32_ENABLE mv -v Build/Ovmf{Ia32,IA32-csm-4mb} echo "Building ovmf ($_arch) default" - OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32.dsc \ + BaseTools/BinWrappers/PosixLike/build -p OvmfPkg/OvmfPkgIa32.dsc \ -a "$_arch" \ "${_common_args[@]}" \ "${_efi_args[@]}" \ @@ -247,7 +260,7 @@ build() { -D LOAD_X64_ON_IA32_ENABLE mv -v Build/Ovmf{Ia32,IA32} echo "Building ovmf ($_arch) default (4MB FD)" - OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32.dsc \ + BaseTools/BinWrappers/PosixLike/build -p OvmfPkg/OvmfPkgIa32.dsc \ -a "$_arch" \ "${_common_args[@]}" \ "${_efi_args[@]}" \ @@ -257,20 +270,20 @@ build() { ;; X64) echo "Building ovmf ($_arch) with microvm support (4MB FD)" - OvmfPkg/build.sh -p OvmfPkg/Microvm/Microvm$_arch.dsc \ + BaseTools/BinWrappers/PosixLike/build -p OvmfPkg/Microvm/Microvm$_arch.dsc \ -a "$_arch" \ "${_common_args[@]}" \ "${_efi_args[@]}" \ "${_4mb_args[@]}" mv -v Build/MicrovmX64{,-4mb} echo "Building ovmf ($_arch) with microvm support" - OvmfPkg/build.sh -p OvmfPkg/Microvm/Microvm$_arch.dsc \ + BaseTools/BinWrappers/PosixLike/build -p OvmfPkg/Microvm/Microvm$_arch.dsc \ -a "$_arch" \ "${_common_args[@]}" \ "${_efi_args[@]}" \ "${_x86_args[@]}" echo "Building ovmf ($_arch) with secure boot support" - OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32X64.dsc \ + BaseTools/BinWrappers/PosixLike/build -p OvmfPkg/OvmfPkgIa32X64.dsc \ -a IA32 -a "$_arch" \ "${_common_args[@]}" \ "${_efi_args[@]}" \ @@ -280,7 +293,7 @@ build() { -D EXCLUDE_SHELL_FROM_FD mv -v Build/Ovmf3264{,-secure} echo "Building ovmf ($_arch) with secure boot support (4MB FD)" - OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32X64.dsc \ + BaseTools/BinWrappers/PosixLike/build -p OvmfPkg/OvmfPkgIa32X64.dsc \ -a IA32 -a "$_arch" \ "${_common_args[@]}" \ "${_efi_args[@]}" \ @@ -290,7 +303,7 @@ build() { -D EXCLUDE_SHELL_FROM_FD mv -v Build/Ovmf3264{,-secure-4mb} echo "Building ovmf ($_arch) with CSM support" - OvmfPkg/build.sh -p OvmfPkg/OvmfPkg$_arch.dsc \ + BaseTools/BinWrappers/PosixLike/build -p OvmfPkg/OvmfPkg$_arch.dsc \ -a "${_arch}" \ "${_common_args[@]}" \ "${_efi_args[@]}" \ @@ -298,7 +311,7 @@ build() { -D CSM_ENABLE mv -v Build/OvmfX64{,-csm} echo "Building ovmf ($_arch) with CSM support (4MB FD)" - OvmfPkg/build.sh -p OvmfPkg/OvmfPkg$_arch.dsc \ + BaseTools/BinWrappers/PosixLike/build -p OvmfPkg/OvmfPkg$_arch.dsc \ -a "${_arch}" \ "${_common_args[@]}" \ "${_efi_args[@]}" \ @@ -306,14 +319,14 @@ build() { -D CSM_ENABLE mv -v Build/OvmfX64{,-csm-4mb} echo "Building ovmf (${_arch}) without secure boot (4MB FD)" - OvmfPkg/build.sh -p OvmfPkg/OvmfPkg$_arch.dsc \ + BaseTools/BinWrappers/PosixLike/build -p OvmfPkg/OvmfPkg$_arch.dsc \ -a "$_arch" \ "${_common_args[@]}" \ "${_efi_args[@]}" \ "${_4mb_args[@]}" mv -v Build/OvmfX64{,-4mb} echo "Building ovmf (${_arch}) without secure boot" - OvmfPkg/build.sh -p OvmfPkg/OvmfPkg$_arch.dsc \ + BaseTools/BinWrappers/PosixLike/build -p OvmfPkg/OvmfPkg$_arch.dsc \ -a "$_arch" \ "${_common_args[@]}" \ "${_efi_args[@]}" \