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

[Anatol Pomozov]

    Date: Wednesday, January 8, 2020 @ 20:36:35
  Author: anatolik
Revision: 372832

upgpkg: ovmf 1:r26976.bd85bf54c2-1

FS#64206 FS#64175 Provide "firmware description" file

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

--------------------------+
 60-edk2-ovmf-x86_64.json |   34 ++++++++++++++++++++++++++++++++++
 PKGBUILD                 |   13 ++++++++-----
 2 files changed, 42 insertions(+), 5 deletions(-)

Added: 60-edk2-ovmf-x86_64.json
===================================================================
--- 60-edk2-ovmf-x86_64.json	                        (rev 0)
+++ 60-edk2-ovmf-x86_64.json	2020-01-08 20:36:35 UTC (rev 372832)
@@ -0,0 +1,34 @@
+{
+    "description": "OVMF UEFI firmware for x86_64",
+    "interface-types": [
+        "uefi"
+    ],
+    "mapping": {
+        "device": "flash",
+        "executable": {
+            "filename": "/usr/share/ovmf/x64/OVMF_CODE.fd",
+            "format": "raw"
+        },
+        "nvram-template": {
+            "filename": "/usr/share/ovmf/x64/OVMF_VARS.fd",
+            "format": "raw"
+        }
+    },
+    "targets": [
+        {
+            "architecture": "x86_64",
+            "machines": [
+                "pc-i440fx-*",
+                "pc-q35-*"
+            ]
+        }
+    ],
+    "features": [
+        "acpi-s3",
+        "amd-sev",
+        "verbose-dynamic"
+    ],
+    "tags": [
+
+    ]
+}

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-08 18:58:39 UTC (rev 372831)
+++ PKGBUILD	2020-01-08 20:36:35 UTC (rev 372832)
@@ -1,6 +1,6 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=ovmf
-pkgver=r26214.20d2e5a125
+pkgver=r26976.bd85bf54c2
 epoch=1
 pkgrel=1
 arch=('any')
@@ -8,13 +8,15 @@
 url="http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=EDK2"
 license=('custom')
 makedepends=('git' 'python' 'iasl' 'nasm' 'subversion' 'perl-libwww' 'bc')
-_commit=edk2-stable201905
-_openssl_ver=1.1.1b
+_commit=edk2-stable201911
+_openssl_ver=1.1.1b # it should be 1.1.1d here but it has a compilation issue https://github.com/openssl/openssl/issues/9858
 source=(edk2::git+https://github.com/tianocore/edk2#commit=$_commit
-        https://www.openssl.org/source/openssl-$_openssl_ver.tar.gz{,.asc})
+        https://www.openssl.org/source/openssl-$_openssl_ver.tar.gz{,.asc}
+        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=('SKIP'
             '5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b'
-            'SKIP')
+            'SKIP'
+            'b8f189f09593298c53e8b2afceadb17610b047fde51f4658e7373caeb3d0b856')
 validpgpkeys=(8657ABB260F056B1E5190839D9C4D26D0E604491)
 options=(!makeflags)
 _toolchain_opt=GCC5
@@ -55,4 +57,5 @@
   install -D -m644 "${srcdir}"/edk2/Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/OVMF_CODE.fd "${pkgdir}"/usr/share/ovmf/x64/OVMF_CODE.fd
   install -D -m644 "${srcdir}"/edk2/Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/OVMF_VARS.fd "${pkgdir}"/usr/share/ovmf/x64/OVMF_VARS.fd
   install -D -m644 "${srcdir}"/edk2/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
 }