[arch-commits] Commit in ovmf/trunk (PKGBUILD)

[Anatol Pomozov]

    Date: Monday, February 24, 2020 @ 05:40:36
  Author: anatolik
Revision: 376115

FS#63299 reenable build for i32 firmware

Modified:
  ovmf/trunk/PKGBUILD

----------+
 PKGBUILD |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-23 22:29:30 UTC (rev 376114)
+++ PKGBUILD	2020-02-24 05:40:36 UTC (rev 376115)
@@ -14,10 +14,12 @@
 _edk2_tag=edk2-stable${_edk_ver}
 source=(https://github.com/tianocore/edk2/archive/${_edk2_tag}.zip
         https://www.openssl.org/source/openssl-$_openssl_ver.tar.gz{,.asc}
+        60-edk2-ovmf-i386.json
         60-edk2-ovmf-x86_64.json) # FS#64175 ; the file content should match https://git.qemu.org/?p=qemu.git;a=tree;f=pc-bios/descriptors
 sha256sums=('c6f691aa91afbaab811a369fe729f61d8e5b58bb5ad79a45446c9ee849c1a60b'
             '5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b'
             'SKIP'
+            '088830129f80643dfdee15af5ffddf2b309b062e3b2ee28faf2f01a43e656ba3'
             'b8f189f09593298c53e8b2afceadb17610b047fde51f4658e7373caeb3d0b856')
 validpgpkeys=(8657ABB260F056B1E5190839D9C4D26D0E604491)
 options=(!makeflags)
@@ -38,17 +40,21 @@
   export EDK_TOOLS_PATH="${srcdir}"/edk2-${_edk2_tag}/BaseTools
   . edksetup.sh BaseTools
 
+  # 64bit build
   ./BaseTools/BinWrappers/PosixLike/build -t $_toolchain_opt -a X64 -p OvmfPkg/OvmfPkgX64.dsc -n $(nproc) -b RELEASE -D FD_SIZE_2MB -D NETWORK_IP6_ENABLE -D TPM2_ENABLE -D SECURE_BOOT_ENABLE -D HTTP_BOOT_ENABLE -D TLS_ENABLE
 
-  # build fails for 32bit binary
-  # ./BaseTools/BinWrappers/PosixLike/build -t $_toolchain_opt -a IA32 -p OvmfPkg/OvmfPkgIa32.dsc -n $(nproc) -b RELEASE -D FD_SIZE_2MB
+  # 32bit build
+  ./BaseTools/BinWrappers/PosixLike/build -t $_toolchain_opt -a IA32 -p OvmfPkg/OvmfPkgIa32.dsc -n $(nproc) -b RELEASE -D FD_SIZE_2MB -D NETWORK_IP6_ENABLE -D TPM2_ENABLE -D SECURE_BOOT_ENABLE -D HTTP_BOOT_ENABLE -D TLS_ENABLE
 }
 
 package() {
-  #install -D -m644 "${srcdir}"/edk2-${_edk2_tag}/Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/OVMF_CODE.fd "${pkgdir}"/usr/share/ovmf/ia32/OVMF_CODE.fd
-  #install -D -m644 "${srcdir}"/edk2-${_edk2_tag}/Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/OVMF_VARS.fd "${pkgdir}"/usr/share/ovmf/ia32/OVMF_VARS.fd
+  install -D -m644 "${srcdir}"/60-edk2-ovmf-i386.json "${pkgdir}"/usr/share/qemu/firmware/60-edk2-ovmf-i386.json
+  install -D -m644 "${srcdir}"/edk2-${_edk2_tag}/Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/OVMF_CODE.fd "${pkgdir}"/usr/share/ovmf/ia32/OVMF_CODE.fd
+  install -D -m644 "${srcdir}"/edk2-${_edk2_tag}/Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/OVMF_VARS.fd "${pkgdir}"/usr/share/ovmf/ia32/OVMF_VARS.fd
+
+  install -D -m644 "${srcdir}"/60-edk2-ovmf-x86_64.json "${pkgdir}"/usr/share/qemu/firmware/60-edk2-ovmf-x86_64.json
   install -D -m644 "${srcdir}"/edk2-${_edk2_tag}/Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/OVMF_CODE.fd "${pkgdir}"/usr/share/ovmf/x64/OVMF_CODE.fd
   install -D -m644 "${srcdir}"/edk2-${_edk2_tag}/Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/OVMF_VARS.fd "${pkgdir}"/usr/share/ovmf/x64/OVMF_VARS.fd
+
   install -D -m644 "${srcdir}"/edk2-${_edk2_tag}/OvmfPkg/License.txt "${pkgdir}"/usr/share/licenses/ovmf/License.txt
-  install -D -m644 "${srcdir}"/60-edk2-ovmf-x86_64.json "${pkgdir}"/usr/share/qemu/firmware/60-edk2-ovmf-x86_64.json
 }