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

[David Runge]

    Date: Wednesday, April 22, 2020 @ 12:44:35
  Author: dvzrv
Revision: 380718

upgpkg: edk2 202002-6: Adding the unsplit firmware (OVMF.fd) for Xen (FS#58635).

Modified:
  edk2/trunk/PKGBUILD
  edk2/trunk/edk2-ovmf.install

-------------------+
 PKGBUILD          |    7 ++++++-
 edk2-ovmf.install |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-22 12:35:17 UTC (rev 380717)
+++ PKGBUILD	2020-04-22 12:44:35 UTC (rev 380718)
@@ -5,7 +5,7 @@
 pkgbase=edk2
 pkgname=('edk2-shell' 'edk2-ovmf')
 pkgver=202002
-pkgrel=5
+pkgrel=6
 pkgdesc="Modern, feature-rich firmware development environment for the UEFI specifications"
 arch=('any')
 url="https://github.com/tianocore/edk2"
@@ -151,6 +151,9 @@
   local _arch
   # installing the various firmwares
   for _arch in ${_arch_list[@]}; do
+    # installing OVMF.fd for xen: https://bugs.archlinux.org/task/58635
+    install -vDm 644 "Build/Ovmf${_arch}/${_build_type}_${_build_plugin}/FV/OVMF.fd" \
+      -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
     install -vDm 644 "Build/Ovmf${_arch}/${_build_type}_${_build_plugin}/FV/OVMF_CODE.fd" \
       -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
     install -vDm 644 "Build/Ovmf${_arch}/${_build_type}_${_build_plugin}/FV/OVMF_VARS.fd" \
@@ -164,6 +167,8 @@
       "${pkgdir}/usr/share/ovmf/${_arch,,}/OVMF_CODE.fd"
     ln -sfv "/usr/share/${pkgname}/${_arch,,}/OVMF_VARS.fd" \
       "${pkgdir}/usr/share/ovmf/${_arch,,}/OVMF_VARS.fd"
+    ln -sfv "/usr/share/${pkgname}/${_arch,,}/OVMF.fd" \
+      "${pkgdir}/usr/share/ovmf/${_arch,,}/OVMF.fd"
   done
   # installing qemu descriptors in accordance with qemu:
   # https://git.qemu.org/?p=qemu.git;a=tree;f=pc-bios/descriptors

Modified: edk2-ovmf.install
===================================================================
--- edk2-ovmf.install	2020-04-22 12:35:17 UTC (rev 380717)
+++ edk2-ovmf.install	2020-04-22 12:44:35 UTC (rev 380718)
@@ -1,6 +1,6 @@
 post_install() {
   # note for users of ovmf
-  if [ "$(vercmp "$1" '202002-5')" -le 0 ]; then
+  if [ "$(vercmp "$1" '202002-6')" -le 0 ]; then
     echo -e "The firmware location has changed to /usr/share/edk2-ovmf/. Symlinks were created for backwards compatibility.\nNOTE: To update the paths run 'virsh edit' on virtual machines that use OVMF."
   fi
 }