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

[David Runge]

    Date: Tuesday, May 5, 2020 @ 20:26:00
  Author: dvzrv
Revision: 382348

upgpkg: edk2 202002-9: Using only a single symlink for /usr/share/ovmf for backwards compatibility.

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-05 20:00:55 UTC (rev 382347)
+++ PKGBUILD	2020-05-05 20:26:00 UTC (rev 382348)
@@ -5,7 +5,7 @@
 pkgbase=edk2
 pkgname=('edk2-shell' 'edk2-ovmf')
 pkgver=202002
-pkgrel=8
+pkgrel=9
 pkgdesc="Modern, feature-rich firmware development environment for the UEFI specifications"
 arch=('any')
 url="https://github.com/tianocore/edk2"
@@ -160,21 +160,14 @@
       -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
     install -vDm 644 "Build/Ovmf${_arch}-secure/${_build_type}_${_build_plugin}/FV/OVMF_CODE.fd" \
       "${pkgdir}/usr/share/${pkgname}/${_arch,,}/OVMF_CODE.secboot.fd"
-    # adding symlinks for previous ovmf location (only secure boot was provided
-    # as the default, but was never enforced)
-    # https://bugs.archlinux.org/task/66528
-    install -vdm 755 "${pkgdir}/usr/share/ovmf/${_arch,,}"
-    ln -sfv "/usr/share/${pkgname}/${_arch,,}/OVMF_CODE.fd" \
-      "${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
   # https://bugs.archlinux.org/task/64206
   install -vDm 644 ../*"${pkgname}"*.json -t "${pkgdir}/usr/share/qemu/firmware"
+  # adding symlink for previous ovmf location
+  # https://bugs.archlinux.org/task/66528
+  ln -svf "/usr/share/${pkgname}" "${pkgdir}/usr/share/ovmf"
   # adding a symlink for applications with questionable heuristics (such as lxd)
   ln -svf "/usr/share/${pkgname}" "${pkgdir}/usr/share/OVMF"
   # licenses

Modified: edk2-ovmf.install
===================================================================
--- edk2-ovmf.install	2020-05-05 20:00:55 UTC (rev 382347)
+++ edk2-ovmf.install	2020-05-05 20:26:00 UTC (rev 382348)
@@ -1,6 +1,6 @@
 post_install() {
   # note for users of ovmf
-  if [ "$(vercmp "$1" '202002-8')" -le 0 ]; then
+  if [ "$(vercmp "$1" '202002-9')" -le 0 ]; then
     echo -e "The firmware location has changed to /usr/share/edk2-ovmf/. Symlinks are provided for backwards compatibility.\nNOTE: To update the paths run 'virsh edit' on virtual machines that use OVMF."
   fi
 }