[gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2/

[gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2/

[James Le Cuirot]

commit:     21806a819cc79eb9f19415f7b5ed29393c2a3f43
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 25 15:17:24 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 16:29:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21806a81

sys-firmware/edk2: Drop obsolete reference to USE=binary and update URL

I don't think using UefiShell.img actually works any more, but the new version
bump will automatically create OVMF_VARS.secboot.fd for you.

Closes: https://bugs.gentoo.org/926630
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 sys-firmware/edk2/edk2-202202.ebuild | 13 ++++---------
 sys-firmware/edk2/edk2-202405.ebuild | 13 ++++---------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/sys-firmware/edk2/edk2-202202.ebuild b/sys-firmware/edk2/edk2-202202.ebuild
index 2baca0ed771a..9adf4e411eeb 100644
--- a/sys-firmware/edk2/edk2-202202.ebuild
+++ b/sys-firmware/edk2/edk2-202202.ebuild
@@ -49,16 +49,11 @@ virtual machines. The firmware is located under
 	/usr/share/edk2-ovmf/OVMF_VARS.fd
 	/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd
 
-If USE=binary is enabled, we also install an OVMF variables file (coming from
-fedora) that contains secureboot default keys
-
-	/usr/share/edk2-ovmf/OVMF_VARS.secboot.fd
-
-If you have compiled this package by hand, you need to either populate all
-necessary EFI variables by hand by booting
-	/usr/share/edk2-ovmf/UefiShell.(iso|img)
+To use Secure Boot, you need to either populate the necessary EFI
+variables by booting:
+	/usr/share/edk2-ovmf/UefiShell.img
 or creating OVMF_VARS.secboot.fd by hand:
-	https://github.com/puiterwijk/qemu-ovmf-secureboot
+	https://github.com/rhuefi/qemu-ovmf-secureboot
 
 The firmware does not support csm (due to no free csm implementation
 available). If you need a firmware with csm support you have to download

diff --git a/sys-firmware/edk2/edk2-202405.ebuild b/sys-firmware/edk2/edk2-202405.ebuild
index aca5700f3df5..cfd276ee0215 100644
--- a/sys-firmware/edk2/edk2-202405.ebuild
+++ b/sys-firmware/edk2/edk2-202405.ebuild
@@ -44,16 +44,11 @@ virtual machines. The firmware is located under
 	/usr/share/edk2-ovmf/OVMF_VARS.fd
 	/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd
 
-If USE=binary is enabled, we also install an OVMF variables file (coming from
-fedora) that contains secureboot default keys
-
-	/usr/share/edk2-ovmf/OVMF_VARS.secboot.fd
-
-If you have compiled this package by hand, you need to either populate all
-necessary EFI variables by hand by booting
-	/usr/share/edk2-ovmf/UefiShell.(iso|img)
+To use Secure Boot, you need to either populate the necessary EFI
+variables by booting:
+	/usr/share/edk2-ovmf/UefiShell.img
 or creating OVMF_VARS.secboot.fd by hand:
-	https://github.com/puiterwijk/qemu-ovmf-secureboot
+	https://github.com/rhuefi/qemu-ovmf-secureboot
 
 The firmware does not support csm (due to no free csm implementation
 available). If you need a firmware with csm support you have to download

[gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2/

[James Le Cuirot]

commit:     14804cc2b74bb38b68677ab2727d374be0cad71b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 25 16:42:44 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 16:29:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14804cc2

sys-firmware/edk2: Add missing BDEPEND on sys-apps/which

The new version bump won't use this.

Closes: https://bugs.gentoo.org/853271
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 sys-firmware/edk2/edk2-202202.ebuild | 1 +
 sys-firmware/edk2/edk2-202405.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sys-firmware/edk2/edk2-202202.ebuild b/sys-firmware/edk2/edk2-202202.ebuild
index 9adf4e411eeb..539834c04ff2 100644
--- a/sys-firmware/edk2/edk2-202202.ebuild
+++ b/sys-firmware/edk2/edk2-202202.ebuild
@@ -30,6 +30,7 @@ KEYWORDS="-* amd64"
 
 BDEPEND="app-emulation/qemu
 	>=dev-lang/nasm-2.0.7
+	sys-apps/which
 	>=sys-power/iasl-20160729
 	${PYTHON_DEPS}"
 RDEPEND="!sys-firmware/edk2-ovmf-bin"

diff --git a/sys-firmware/edk2/edk2-202405.ebuild b/sys-firmware/edk2/edk2-202405.ebuild
index af3e168f1b95..045d8e67c200 100644
--- a/sys-firmware/edk2/edk2-202405.ebuild
+++ b/sys-firmware/edk2/edk2-202405.ebuild
@@ -33,6 +33,7 @@ KEYWORDS="-* ~amd64"
 
 BDEPEND="app-emulation/qemu
 	>=dev-lang/nasm-2.0.7
+	sys-apps/which
 	>=sys-power/iasl-20160729
 	${PYTHON_DEPS}"
 RDEPEND="!sys-firmware/edk2-ovmf-bin"