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

2020-05-05 Thread David Runge via arch-commits 
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
===
--- PKGBUILD2020-05-05 20:00:55 UTC (rev 382347)
+++ PKGBUILD2020-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
 }

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

2020-05-05 Thread David Runge via arch-commits 
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
===
--- PKGBUILD2020-05-05 12:48:18 UTC (rev 382295)
+++ PKGBUILD2020-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
 }

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

2020-04-23 Thread David Runge via arch-commits 
Date: Thursday, April 23, 2020 @ 11:46:12
  Author: dvzrv
Revision: 380772

upgpkg: edk2 202002-7: Updating the post_install() message to be more specific 
about backwards compatible symlinks being part of the package.

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

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

Modified: PKGBUILD
===
--- PKGBUILD2020-04-23 10:40:13 UTC (rev 380771)
+++ PKGBUILD2020-04-23 11:46:12 UTC (rev 380772)
@@ -5,7 +5,7 @@
 pkgbase=edk2
 pkgname=('edk2-shell' 'edk2-ovmf')
 pkgver=202002
-pkgrel=6
+pkgrel=7
 pkgdesc="Modern, feature-rich firmware development environment for the UEFI 
specifications"
 arch=('any')
 url="https://github.com/tianocore/edk2;

Modified: edk2-ovmf.install
===
--- edk2-ovmf.install   2020-04-23 10:40:13 UTC (rev 380771)
+++ edk2-ovmf.install   2020-04-23 11:46:12 UTC (rev 380772)
@@ -1,6 +1,6 @@
 post_install() {
   # note for users of ovmf
-  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."
+  if [ "$(vercmp "$1" '202002-7')" -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
 }

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

2020-04-22 Thread David Runge via arch-commits 
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
===
--- PKGBUILD2020-04-22 12:35:17 UTC (rev 380717)
+++ PKGBUILD2020-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
 }

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

2020-04-21 Thread David Runge via arch-commits 
Date: Tuesday, April 21, 2020 @ 20:39:09
  Author: dvzrv
Revision: 380688

upgpkg: edk2 202002-5: Setting a proper post_install() message in 
edk2-ovmf.install for users of ovmf.

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

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

Modified: PKGBUILD
===
--- PKGBUILD2020-04-21 18:44:23 UTC (rev 380687)
+++ PKGBUILD2020-04-21 20:39:09 UTC (rev 380688)
@@ -5,7 +5,7 @@
 pkgbase=edk2
 pkgname=('edk2-shell' 'edk2-ovmf')
 pkgver=202002
-pkgrel=4
+pkgrel=5
 pkgdesc="Modern, feature-rich firmware development environment for the UEFI 
specifications"
 arch=('any')
 url="https://github.com/tianocore/edk2;

Modified: edk2-ovmf.install
===
--- edk2-ovmf.install   2020-04-21 18:44:23 UTC (rev 380687)
+++ edk2-ovmf.install   2020-04-21 20:39:09 UTC (rev 380688)
@@ -1,5 +1,6 @@
-post_upgrade() {
-  if [ "$(vercmp "$2" 202002-1)" -le 0 ]; then
-echo -e "The firmware location has changed to /usr/share/edk2-ovmf/.\n 
Symlinks were created for backwards compatibility.\n To update the paths run 
'virsh edit' on the virtual machines that use OVMF."
+post_install() {
+  # note for users of ovmf
+  if [ "$(vercmp "$1" '202002-5')" -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
 }

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

2020-04-21 Thread David Runge via arch-commits 
Date: Tuesday, April 21, 2020 @ 15:48:02
  Author: dvzrv
Revision: 380685

upgpkg: edk2 202002-4: Adding symlinks for backwards compatibility with ovmf 
(FS#66322). Adding an install file for edk2-ovmf to explain how to change 
firmware locations in existing virtual machines.

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

+
 PKGBUILD   |   12 ++--
 edk2-ovmf.install  |5 +
 edk2-shell.install |1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-21 14:49:34 UTC (rev 380684)
+++ PKGBUILD2020-04-21 15:48:02 UTC (rev 380685)
@@ -5,7 +5,7 @@
 pkgbase=edk2
 pkgname=('edk2-shell' 'edk2-ovmf')
 pkgver=202002
-pkgrel=3
+pkgrel=4
 pkgdesc="Modern, feature-rich firmware development environment for the UEFI 
specifications"
 arch=('any')
 url="https://github.com/tianocore/edk2;
@@ -146,6 +146,7 @@
   conflicts=('ovmf')
   replaces=('ovmf')
   license+=('MIT')
+  install="${pkgname}.install"
   cd "$pkgbase-$pkgver"
   local _arch
   # installing the various firmwares
@@ -156,12 +157,19 @@
   -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
+install -vdm 755 "${pkgdir}/usr/share/ovmf/${_arch,,}"
+ln -sfv "/usr/share/${pkgname}/${_arch,,}/OVMF_CODE.secboot.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"
   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 a symlink for legacy applications
+  # adding a symlink for applications with questionable heuristics (such as 
lxd)
   ln -svf "/usr/share/${pkgname}" "${pkgdir}/usr/share/OVMF"
   # licenses
   install -vDm 644 License.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"

Added: edk2-ovmf.install
===
--- edk2-ovmf.install   (rev 0)
+++ edk2-ovmf.install   2020-04-21 15:48:02 UTC (rev 380685)
@@ -0,0 +1,5 @@
+post_upgrade() {
+  if [ "$(vercmp "$2" 202002-1)" -le 0 ]; then
+echo -e "The firmware location has changed to /usr/share/edk2-ovmf/.\n 
Symlinks were created for backwards compatibility.\n To update the paths run 
'virsh edit' on the virtual machines that use OVMF."
+  fi
+}

Added: edk2-shell.install
===
--- edk2-shell.install  (rev 0)
+++ edk2-shell.install  2020-04-21 15:48:02 UTC (rev 380685)
@@ -0,0 +1 @@
+# empty install file to satisfy makepkg