[arch-commits] Commit in ovmf/trunk (60-edk2-ovmf-i386.json PKGBUILD)

[Anatol Pomozov]

    Date: Sunday, March 8, 2020 @ 03:14:38
  Author: anatolik
Revision: 376956

upgpkg: ovmf 1:202002-1

It also adds non-split OVMF file FS#58635

Added:
  ovmf/trunk/60-edk2-ovmf-i386.json
Modified:
  ovmf/trunk/PKGBUILD

------------------------+
 60-edk2-ovmf-i386.json |   33 +++++++++++++++++++++++++++++++++
 PKGBUILD               |   12 +++++++-----
 2 files changed, 40 insertions(+), 5 deletions(-)

Added: 60-edk2-ovmf-i386.json
===================================================================
--- 60-edk2-ovmf-i386.json	                        (rev 0)
+++ 60-edk2-ovmf-i386.json	2020-03-08 03:14:38 UTC (rev 376956)
@@ -0,0 +1,33 @@
+{
+    "description": "UEFI firmware for i386",
+    "interface-types": [
+        "uefi"
+    ],
+    "mapping": {
+        "device": "flash",
+        "executable": {
+            "filename": "/usr/share/ovmf/ia32/OVMF_CODE.fd",
+            "format": "raw"
+        },
+        "nvram-template": {
+            "filename": "/usr/share/ovmf/ia32/OVMF_VARS.fd",
+            "format": "raw"
+        }
+    },
+    "targets": [
+        {
+            "architecture": "i386",
+            "machines": [
+                "pc-i440fx-*",
+                "pc-q35-*"
+            ]
+        }
+    ],
+    "features": [
+        "acpi-s3",
+        "verbose-dynamic"
+    ],
+    "tags": [
+
+    ]
+}

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-08 02:28:26 UTC (rev 376955)
+++ PKGBUILD	2020-03-08 03:14:38 UTC (rev 376956)
@@ -1,6 +1,6 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 
-_edk_ver=201911
+_edk_ver=202002
 pkgname=ovmf
 pkgver=$_edk_ver
 epoch=1
@@ -16,7 +16,7 @@
         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'
+sha256sums=('280865c85cadf1d1d7029984b734d3245872a4aa631c6150025285e361e3df77'
             '5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b'
             'SKIP'
             '088830129f80643dfdee15af5ffddf2b309b062e3b2ee28faf2f01a43e656ba3'
@@ -40,19 +40,21 @@
   export EDK_TOOLS_PATH="${srcdir}"/edk2-${_edk2_tag}/BaseTools
   . edksetup.sh BaseTools
 
+  # 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
+
   # 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
-
-  # 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}"/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.fd "${pkgdir}"/usr/share/ovmf/ia32/OVMF.fd
   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.fd "${pkgdir}"/usr/share/ovmf/x64/OVMF.fd
   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