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

[David Runge]

    Date: Tuesday, May 5, 2020 @ 14:08:39
  Author: dvzrv
Revision: 382296

upgpkg: edk2 202002-8: Switching to non-secure-boot symlinks.

The ovmf package built the firmware descriptors with secure boot enabled,
but secure boot has not been enforced in the qemu (JSON) descriptor files.
Further information can be found in (FS#66528).

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-05 12:48:18 UTC (rev 382295)
+++ PKGBUILD	2020-05-05 14:08:39 UTC (rev 382296)
@@ -5,7 +5,7 @@
 pkgbase=edk2
 pkgname=('edk2-shell' 'edk2-ovmf')
 pkgver=202002
-pkgrel=7
+pkgrel=8
 pkgdesc="Modern, feature-rich firmware development environment for the UEFI specifications"
 arch=('any')
 url="https://github.com/tianocore/edk2"
@@ -160,10 +160,11 @@
       -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)
-    # https://bugs.archlinux.org/task/66322
+    # 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.secboot.fd" \
+    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"

Modified: edk2-ovmf.install
===================================================================
--- edk2-ovmf.install	2020-05-05 12:48:18 UTC (rev 382295)
+++ edk2-ovmf.install	2020-05-05 14:08:39 UTC (rev 382296)
@@ -1,6 +1,6 @@
 post_install() {
   # note for users of ovmf
-  if [ "$(vercmp "$1" '202002-7')" -le 0 ]; then
+  if [ "$(vercmp "$1" '202002-8')" -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
 }