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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2017-05-06  6:09 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2017-05-06  6:09 UTC (permalink / raw
  To: gentoo-commits

commit:     e5625a98fde19c6d754043d3dc468f88982aeaa9
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat May  6 06:04:59 2017 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat May  6 06:07:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5625a98

sys-firmware/edk2-ovmf: bugfix, inherit readme.gentoo-r1

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
index 46896bd2aea..7015a7b73e5 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils python-any-r1
+inherit eutils python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
 HOMEPAGE="http://www.tianocore.org/edk2 https://github.com/tianocore/edk2"
@@ -42,8 +42,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-build_system_fixes.patch
 )
 
-DOC_CONTENTS="
-This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
 virtual machines. The firmware is located under
 	/usr/share/edk2-ovmf/OVMF.fd
 	/usr/share/edk2-ovmf/OVMF_CODE.fd
@@ -62,7 +62,7 @@ In order to use the firmware you can run qemu the following way
 
 You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
 	nvram = [
-		"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd"
+		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
 	]"
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2017-08-13 12:36 David Seifert
  0 siblings, 0 replies; 56+ messages in thread
From: David Seifert @ 2017-08-13 12:36 UTC (permalink / raw
  To: gentoo-commits

commit:     fb56716f5836403ae4df67ac2dd5c2dc5f4f0cda
Author:     charIes17 <charles17 <AT> arcor <DOT> de>
AuthorDate: Sun Aug 13 11:08:52 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 11:38:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb56716f

sys-firmware/edk2-ovmf: HOMEPAGE (avoid redirect)

HOMEPAGE http://www.tianocore.org/edk2/ redirects to
https://github.com/tianocore/tianocore.github.io/wiki/EDK-II

Package-Manager: Portage-2.3.6, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5402

 sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
index 7015a7b73e5..da81b2e028d 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
-HOMEPAGE="http://www.tianocore.org/edk2 https://github.com/tianocore/edk2"
+HOMEPAGE="https://github.com/tianocore/edk2"
 
 # inherit git-r3
 # EGIT_REPO_URI="https://github.com/tianocore/edk2"


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2017-09-01  1:09 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2017-09-01  1:09 UTC (permalink / raw
  To: gentoo-commits

commit:     edfe027b092f6558fa96ff761c91547fd2d5a7a9
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  1 01:04:00 2017 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Sep  1 01:04:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edfe027b

sys-firmware/edk2-ovmf: stabilize on amd64, x86, bug #625614

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
index da81b2e028d..a8c0062de01 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="+binary"
 
 REQUIRED_USE="


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2017-12-12 18:01 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2017-12-12 18:01 UTC (permalink / raw
  To: gentoo-commits

commit:     7fb961811b5e4499235f3acfced5d218573b7ca5
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 30 23:34:06 2017 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 18:01:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb96181

sys-firmware/edk2-ovmf: Depends on dev-lang/python[sqlite], add -9999 ebuild

Closes: https://bugs.gentoo.org/617668
Closes: https://github.com/gentoo/gentoo/pull/6366
Package-Manager: Portage-2.3.16, Repoman-2.3.6
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 .../edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild | 116 +++++++++++++++++++++
 sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild       | 116 +++++++++++++++++++++
 2 files changed, 232 insertions(+)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild
new file mode 100644
index 00000000000..5dc75dbd084
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+NON_BINARY_DEPEND="
+	>=dev-lang/nasm-2.0.7
+	>=sys-power/iasl-20160729
+	${PYTHON_DEPS}
+"
+DEPEND=""
+RDEPEND=""
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tianocore/edk2"
+	DEPEND+="
+		${NON_BINARY_DEPEND}
+	"
+else
+	SRC_URI="
+		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
+		!binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz )"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	IUSE="+binary"
+	REQUIRED_USE+="
+		!amd64? ( binary )
+	"
+	DEPEND+="
+		!binary? (
+			amd64? (
+				${NON_BINARY_DEPEND}
+			)
+		)"
+	PATCHES=(
+		"${FILESDIR}"/${P}-build_system_fixes.patch
+	)
+fi
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+	/usr/share/edk2-ovmf/OVMF.fd
+	/usr/share/edk2-ovmf/OVMF_CODE.fd
+	/usr/share/edk2-ovmf/OVMF_VARS.fd
+
+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
+one for yourself. Firmware blobs are commonly labeled
+	OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+	$ qemu-system-x86_64 \
+		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+		...
+
+You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
+	nvram = [
+		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+	]"
+
+pkg_setup() {
+	 [[ ${PV} != "9999" ]] && use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if  [[ ${PV} != "9999" ]] && use binary; then
+		eapply_user
+		return
+	fi
+	default
+}
+
+src_compile() {
+	TARGET_ARCH=X64
+	TARGET_NAME=RELEASE
+	TARGET_TOOLS=GCC49
+
+	[[ ${PV} != "9999" ]] && use binary && return
+
+	emake ARCH=${TARGET_ARCH} -C BaseTools -j1
+
+	. ./edksetup.sh
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		-D FD_SIZE_2MB \
+		|| die "OvmfPkg/build.sh failed"
+}
+
+src_install() {
+	local builddir="Build/OvmfX64/${TARGET_NAME}_${TARGET_TOOLS}/FV"
+
+	insinto /usr/share/${PN}
+	doins "${builddir}"/OVMF{,_CODE,_VARS}.fd
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild
new file mode 100644
index 00000000000..9fc2de7937d
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+NON_BINARY_DEPEND="
+	>=dev-lang/nasm-2.0.7
+	>=sys-power/iasl-20160729
+	${PYTHON_DEPS}
+"
+DEPEND=""
+RDEPEND=""
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tianocore/edk2"
+	DEPEND+="
+		${NON_BINARY_DEPEND}
+	"
+else
+	SRC_URI="
+		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
+		!binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz )"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	IUSE="+binary"
+	REQUIRED_USE+="
+		!amd64? ( binary )
+	"
+	DEPEND+="
+		!binary? (
+			amd64? (
+				${NON_BINARY_DEPEND}
+			)
+		)"
+	PATCHES=(
+		"${FILESDIR}"/${P}-build_system_fixes.patch
+	)
+fi
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+	/usr/share/edk2-ovmf/OVMF.fd
+	/usr/share/edk2-ovmf/OVMF_CODE.fd
+	/usr/share/edk2-ovmf/OVMF_VARS.fd
+
+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
+one for yourself. Firmware blobs are commonly labeled
+	OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+	$ qemu-system-x86_64 \
+		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+		...
+
+You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
+	nvram = [
+		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+	]"
+
+pkg_setup() {
+	 [[ ${PV} != "9999" ]] && use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if  [[ ${PV} != "9999" ]] && use binary; then
+		eapply_user
+		return
+	fi
+	default
+}
+
+src_compile() {
+	TARGET_ARCH=X64
+	TARGET_NAME=RELEASE
+	TARGET_TOOLS=GCC49
+
+	[[ ${PV} != "9999" ]] && use binary && return
+
+	emake ARCH=${TARGET_ARCH} -C BaseTools
+
+	. ./edksetup.sh
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		-D FD_SIZE_2MB \
+		|| die "OvmfPkg/build.sh failed"
+}
+
+src_install() {
+	local builddir="Build/OvmfX64/${TARGET_NAME}_${TARGET_TOOLS}/FV"
+
+	insinto /usr/share/${PN}
+	doins "${builddir}"/OVMF{,_CODE,_VARS}.fd
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2018-02-12  0:42 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2018-02-12  0:42 UTC (permalink / raw
  To: gentoo-commits

commit:     43e07df10c13de3a56d3356da669d6cd62ef354c
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 12 00:09:30 2018 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 00:42:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43e07df1

sys-firmware/edk2-ovmf: stabilize for amd64 / x86

No changes that would require a new stabilization process. Simple
internal ebuild maintenance.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild
index 5dc75dbd084..502a513b8bd 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,7 +31,7 @@ else
 	SRC_URI="
 		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
 		!binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz )"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2018-02-12  0:42 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2018-02-12  0:42 UTC (permalink / raw
  To: gentoo-commits

commit:     390fecf137f86fd8f86c50fb52106a0cceeeb974
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 12 00:10:10 2018 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 00:42:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=390fecf1

sys-firmware/edk2-ovmf: drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild    | 108 ---------------------
 1 file changed, 108 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
deleted file mode 100644
index a8c0062de01..00000000000
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
-HOMEPAGE="https://github.com/tianocore/edk2"
-
-# inherit git-r3
-# EGIT_REPO_URI="https://github.com/tianocore/edk2"
-# EGIT_BRANCH="UDK2017"
-# EGIT_COMMIT="f30c40618b1f3537705b450a91ce00b9e587badb"
-
-SRC_URI="
-	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
-	!binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz )"
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="+binary"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	!amd64? ( binary )"
-
-DEPEND="
-	!binary? (
-		amd64? (
-			>=dev-lang/nasm-2.0.7
-			>=sys-power/iasl-20160729
-			${PYTHON_DEPS}
-		)
-	)"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build_system_fixes.patch
-)
-
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
-virtual machines. The firmware is located under
-	/usr/share/edk2-ovmf/OVMF.fd
-	/usr/share/edk2-ovmf/OVMF_CODE.fd
-	/usr/share/edk2-ovmf/OVMF_VARS.fd
-
-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
-one for yourself. Firmware blobs are commonly labeled
-	OVMF{,_CODE,_VARS}-with-csm.fd
-
-In order to use the firmware you can run qemu the following way
-
-	$ qemu-system-x86_64 \
-		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
-		...
-
-You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
-	nvram = [
-		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-	]"
-
-pkg_setup() {
-	use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use binary; then
-		eapply_user
-		return
-	fi
-	default
-}
-
-src_compile() {
-	TARGET_ARCH=X64
-	TARGET_NAME=RELEASE
-	TARGET_TOOLS=GCC49
-
-	use binary && return
-
-	emake ARCH=${TARGET_ARCH} -C BaseTools -j1
-
-	. ./edksetup.sh
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		-D FD_SIZE_2MB \
-		|| die "OvmfPkg/build.sh failed"
-}
-
-src_install() {
-	local builddir="Build/OvmfX64/${TARGET_NAME}_${TARGET_TOOLS}/FV"
-
-	insinto /usr/share/${PN}
-	doins "${builddir}"/OVMF{,_CODE,_VARS}.fd
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2018-03-30 16:51 Aaron Bauman
  0 siblings, 0 replies; 56+ messages in thread
From: Aaron Bauman @ 2018-03-30 16:51 UTC (permalink / raw
  To: gentoo-commits

commit:     179c742b06eb57c51e7df4a6ae948684f3b5dab8
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 16:18:09 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 16:50:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=179c742b

sys-firmware/edk2-ovmf: amd64 stable

Bug: https://bugs.gentoo.org/650772
Package-Manager: Portage-2.3.26, Repoman-2.3.7

 sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
index ff5c5d8fabd..24cda80f16d 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
@@ -31,7 +31,7 @@ else
 	SRC_URI="
 		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
 		!binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz )"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2019-07-22  9:28 Michał Górny
  0 siblings, 0 replies; 56+ messages in thread
From: Michał Górny @ 2019-07-22  9:28 UTC (permalink / raw
  To: gentoo-commits

commit:     95056d1601a99f0a74bc4dca553a3122f52cb144
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 15:46:13 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 09:28:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95056d16

sys-firmware/edk2-ovmf: Remove mistaken use of PYTHON_REQUIRED_USE

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild      | 5 +----
 sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild | 5 +----
 sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild                | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
index ba74bacb77c..380bbdaac45 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,9 +11,6 @@ inherit eutils python-any-r1 readme.gentoo-r1
 DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
 HOMEPAGE="https://github.com/tianocore/edk2"
 
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
 SOURCE_DEPEND="
 	>=dev-lang/nasm-2.0.7
 	>=sys-power/iasl-20160729

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild
index 502a513b8bd..a487faaeb8d 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,9 +11,6 @@ inherit eutils python-any-r1 readme.gentoo-r1
 DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
 HOMEPAGE="https://github.com/tianocore/edk2"
 
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
 NON_BINARY_DEPEND="
 	>=dev-lang/nasm-2.0.7
 	>=sys-power/iasl-20160729

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild
index 9fc2de7937d..a3779c68d3d 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,9 +11,6 @@ inherit eutils python-any-r1 readme.gentoo-r1
 DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
 HOMEPAGE="https://github.com/tianocore/edk2"
 
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
 NON_BINARY_DEPEND="
 	>=dev-lang/nasm-2.0.7
 	>=sys-power/iasl-20160729


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2019-07-28 23:17 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2019-07-28 23:17 UTC (permalink / raw
  To: gentoo-commits

commit:     aed5cfd1b2ec95c1b90d2a07ebaa6182a07ea95d
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 21:08:35 2019 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 23:17:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aed5cfd1

sys-firmware/edk2-ovmf: drop vulnerable

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 .../edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild | 113 ---------------------
 1 file changed, 113 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild
deleted file mode 100644
index a487faaeb8d..00000000000
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
-HOMEPAGE="https://github.com/tianocore/edk2"
-
-NON_BINARY_DEPEND="
-	>=dev-lang/nasm-2.0.7
-	>=sys-power/iasl-20160729
-	${PYTHON_DEPS}
-"
-DEPEND=""
-RDEPEND=""
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tianocore/edk2"
-	DEPEND+="
-		${NON_BINARY_DEPEND}
-	"
-else
-	SRC_URI="
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
-		!binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz )"
-	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
-	IUSE="+binary"
-	REQUIRED_USE+="
-		!amd64? ( binary )
-	"
-	DEPEND+="
-		!binary? (
-			amd64? (
-				${NON_BINARY_DEPEND}
-			)
-		)"
-	PATCHES=(
-		"${FILESDIR}"/${P}-build_system_fixes.patch
-	)
-fi
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
-virtual machines. The firmware is located under
-	/usr/share/edk2-ovmf/OVMF.fd
-	/usr/share/edk2-ovmf/OVMF_CODE.fd
-	/usr/share/edk2-ovmf/OVMF_VARS.fd
-
-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
-one for yourself. Firmware blobs are commonly labeled
-	OVMF{,_CODE,_VARS}-with-csm.fd
-
-In order to use the firmware you can run qemu the following way
-
-	$ qemu-system-x86_64 \
-		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
-		...
-
-You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
-	nvram = [
-		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-	]"
-
-pkg_setup() {
-	 [[ ${PV} != "9999" ]] && use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if  [[ ${PV} != "9999" ]] && use binary; then
-		eapply_user
-		return
-	fi
-	default
-}
-
-src_compile() {
-	TARGET_ARCH=X64
-	TARGET_NAME=RELEASE
-	TARGET_TOOLS=GCC49
-
-	[[ ${PV} != "9999" ]] && use binary && return
-
-	emake ARCH=${TARGET_ARCH} -C BaseTools -j1
-
-	. ./edksetup.sh
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		-D FD_SIZE_2MB \
-		|| die "OvmfPkg/build.sh failed"
-}
-
-src_install() {
-	local builddir="Build/OvmfX64/${TARGET_NAME}_${TARGET_TOOLS}/FV"
-
-	insinto /usr/share/${PN}
-	doins "${builddir}"/OVMF{,_CODE,_VARS}.fd
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2019-07-28 23:17 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2019-07-28 23:17 UTC (permalink / raw
  To: gentoo-commits

commit:     fff18dae2f07b0bf7b885912abfdc49fa283055e
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 21:11:51 2019 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 23:17:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fff18dae

sys-firmware/edk2-ovmf: update live ebuild

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 ...k2-ovmf-9999.ebuild => edk2-ovmf-999999.ebuild} | 73 +++++++++++++++++-----
 1 file changed, 57 insertions(+), 16 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
similarity index 50%
rename from sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild
rename to sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
index a3779c68d3d..8bd303ef2cb 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit eutils python-any-r1 readme.gentoo-r1
 
@@ -12,22 +12,21 @@ DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
 HOMEPAGE="https://github.com/tianocore/edk2"
 
 NON_BINARY_DEPEND="
+	app-emulation/qemu
 	>=dev-lang/nasm-2.0.7
 	>=sys-power/iasl-20160729
 	${PYTHON_DEPS}
 "
 DEPEND=""
 RDEPEND=""
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == "999999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/tianocore/edk2"
 	DEPEND+="
 		${NON_BINARY_DEPEND}
 	"
 else
-	SRC_URI="
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
-		!binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz )"
+	SRC_URI=""
 	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 	IUSE="+binary"
 	REQUIRED_USE+="
@@ -40,7 +39,6 @@ else
 			)
 		)"
 	PATCHES=(
-		"${FILESDIR}"/${P}-build_system_fixes.patch
 	)
 fi
 
@@ -50,9 +48,20 @@ SLOT="0"
 DISABLE_AUTOFORMATTING=true
 DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
 virtual machines. The firmware is located under
-	/usr/share/edk2-ovmf/OVMF.fd
 	/usr/share/edk2-ovmf/OVMF_CODE.fd
 	/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)
+or creating OVMF_VARS.secboot.fd by hand:
+	https://github.com/puiterwijk/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
@@ -68,14 +77,15 @@ In order to use the firmware you can run qemu the following way
 You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
 	nvram = [
 		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+		\"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
 	]"
 
 pkg_setup() {
-	 [[ ${PV} != "9999" ]] && use binary || python-any-r1_pkg_setup
+	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
 }
 
 src_prepare() {
-	if  [[ ${PV} != "9999" ]] && use binary; then
+	if  [[ ${PV} != "999999" ]] && use binary; then
 		eapply_user
 		return
 	fi
@@ -87,23 +97,54 @@ src_compile() {
 	TARGET_NAME=RELEASE
 	TARGET_TOOLS=GCC49
 
-	[[ ${PV} != "9999" ]] && use binary && return
+	BUILD_FLAGS="-D TLS_ENABLE \
+		-D HTTP_BOOT_ENABLE \
+		-D NETWORK_IP6_ENABLE \
+		-D FD_SIZE_2MB"
+
+	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
+		-D SECURE_BOOT_ENABLE \
+		-D SMM_REQUIRE \
+		-D EXCLUDE_SHELL_FROM_FD"
+
+	[[ ${PV} != "999999" ]] && use binary && return
 
 	emake ARCH=${TARGET_ARCH} -C BaseTools
 
 	. ./edksetup.sh
 
+	# Build all EFI firmware blobs:
+
+	mkdir -p ovmf
+
 	./OvmfPkg/build.sh \
 		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		-D FD_SIZE_2MB \
-		|| die "OvmfPkg/build.sh failed"
+		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
+	rm -rf Build/OvmfX64
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
+	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
+	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
+
+	# Build a convenience UefiShell.img:
+
+	mkdir -p iso_image/efi/boot || die "mkdir failed"
+	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
+	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
+	qemu-img convert --image-opts \
+		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
+		ovmf/UefiShell.img || die "qemu-img failed"
 }
 
 src_install() {
-	local builddir="Build/OvmfX64/${TARGET_NAME}_${TARGET_TOOLS}/FV"
-
 	insinto /usr/share/${PN}
-	doins "${builddir}"/OVMF{,_CODE,_VARS}.fd
+	doins ovmf/*
 
 	readme.gentoo_create_doc
 }


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2019-07-28 23:17 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2019-07-28 23:17 UTC (permalink / raw
  To: gentoo-commits

commit:     6137d4c59ea47d77517e925d8bfd46b8b3b1f669
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 21:00:39 2019 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 23:17:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6137d4c5

sys-firmware/edk2-ovmf: version bump to 201905

 * switch to new upstream version number

 * add secure boot support

 * versions contains security fixes for all vulnerabilities identified
   in #678906c1

Closes: https://bugs.gentoo.org/680920
Closes: https://bugs.gentoo.org/681936
Closes: https://bugs.gentoo.org/665152
Bug: https://bugs.gentoo.org/678906
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sys-firmware/edk2-ovmf/Manifest                |   5 +-
 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 153 +++++++++++++++++++++++++
 2 files changed, 156 insertions(+), 2 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index a061a11c712..579051780e0 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,4 +1,5 @@
 DIST edk2-ovmf-2017_p20180211-bin.tar.xz 910896 BLAKE2B 2d2ead282cebc1254cae2b10042f809e887a17a83fe67998ddcadf86cdf07e615594b243ab35d3fa8a6d6ce218f8f0bad758ee1db2ab4ff6c08d65419f4078b0 SHA512 88c3c4d7cecc2af1cc4dfa06686f34cc3a5facfb24750c766b47f53dec7267b95b58b391d23038e6a589d1687d2c117f1912d10118e26f99c0906c3d8e90deed
 DIST edk2-ovmf-2017_p20180211.tar.xz 22977736 BLAKE2B 4d95eaf3017668197632ab7e035ad6c9f1490bde3d27e575170541fd64773fef8676406c88451b8dc996d9d7dd625fa389279105951f02e08f6de025075bd172 SHA512 ee3d70da562ed7dc4647576da8605d25fd9f991b4a96c2ed106e0d1b697af9e0624ad161750ccba7ab3db553ab1c6177780dd9c29a70073eb17729e9ae24c5a7
-DIST edk2-ovmf-2017_pre20170505-bin.tar.xz 874904 BLAKE2B a381d3ca20cf0e1f3aff74335c1d783bb80f0b5c7a8716d8154f2e0a19255780e5b08fae37cab9fa484fc1cbe3bc3b5d40339634ee3b0808bd2b3a8b2849730a SHA512 c7a7d83758214b6ab63c6cefe827a601aaa7656b7f01e03413c84d913078a2b0d8037f70de34d42d8e1614aee794e0ffd7d9e62314eb4e04c21256b70338af5c
-DIST edk2-ovmf-2017_pre20170505.tar.xz 22952060 BLAKE2B 7d4da1fed8e76f643e2856be2485f6c398896d61b7ad8fb013e891fd73f69c4acfd9980e7f95aec002cee647719a622711100f8cb6829edecae35ed31b3ef563 SHA512 6da859360448fd6d04d1492c88a7e935f7108c524f7ccfe6aa4c13bf9af9695dbc4a5b8efa274adc86d3105946aaa1ba80bcd9713facdca153f1a3d873797b63
+DIST edk2-ovmf-201905-bin.tar.xz 3017256 BLAKE2B 6a106f111a363f1c2de33c4e7eba48183da6047654512939c286c6d0369e3b4c7705c271e61fa95299ba2b629022be7b5ef665ff096d41373583f5409b5c32fb SHA512 4a174dc1d64769a93de3bf5f9d787e278bfab57e2317699d722aa772e64e8867b3998b7feee58d5e4c66adc79ba9c5023dae2ce786159db7a740b86cf35d923d
+DIST edk2-ovmf-201905-bundled.tar.xz 3538508 BLAKE2B a1766180c84ee83987f50fdb6a6c9891dfb983ff78c98f7bc38635ffe484ebf29d4286ff97d7747080e28a655ff14b5939d4505d75ebe6655ecacc7f9d405469 SHA512 be3d8ef1ffb1ddce64883d9ef8dc598c7026d23d2e33c33949d28de81513b6a7f04f840ccb3d42664e918c6603487fbe594261c327921f3250c3998218572774
+DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de2691524e55c96d8a0e85aab1385a9abddc47c13ce3236b952c1299514e542ad0fa4bc9550cc4527945c05109d227a698293 SHA512 91188923f7d1ab83c0d6abf7ec6d59f357d0341a617ad6a3ae05f3d0e041dff43f62b014b0c5fc5d15e16d8f1c279c581a5cd64b31e3d52b340d7ef90adb50f1

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
new file mode 100644
index 00000000000..246a3853850
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit eutils python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+NON_BINARY_DEPEND="
+	>=dev-lang/nasm-2.0.7
+	>=sys-power/iasl-20160729
+	${PYTHON_DEPS}
+"
+DEPEND=""
+RDEPEND=""
+if [[ ${PV} == "999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tianocore/edk2"
+	DEPEND+="
+		${NON_BINARY_DEPEND}
+	"
+else
+	# Binary versions taken from fedora:
+	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
+	#   edk2-ovmf-20190501stable-2.fc31.noarch.rpm
+	SRC_URI="
+		!binary? (
+			https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
+			https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.xz
+		)
+		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
+		"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	IUSE="+binary"
+	REQUIRED_USE+="
+		!amd64? ( binary )
+	"
+	DEPEND+="
+		!binary? (
+			amd64? (
+				${NON_BINARY_DEPEND}
+			)
+		)"
+	PATCHES=(
+	)
+fi
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+
+S="${WORKDIR}/edk2-edk2-stable${PV}"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+	/usr/share/edk2-ovmf/OVMF_CODE.fd
+	/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)
+or creating OVMF_VARS.secboot.fd by hand:
+	https://github.com/puiterwijk/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
+one for yourself. Firmware blobs are commonly labeled
+	OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+	$ qemu-system-x86_64 \
+		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+		...
+
+You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
+	nvram = [
+		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+		\"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+	]"
+
+pkg_setup() {
+	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if  [[ ${PV} != "999999" ]] && use binary; then
+		eapply_user
+		return
+	fi
+	default
+}
+
+src_compile() {
+	TARGET_ARCH=X64
+	TARGET_NAME=RELEASE
+	TARGET_TOOLS=GCC49
+
+	BUILD_FLAGS="-D TLS_ENABLE \
+		-D HTTP_BOOT_ENABLE \
+		-D NETWORK_IP6_ENABLE \
+		-D FD_SIZE_2MB"
+
+	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
+		-D SECURE_BOOT_ENABLE \
+		-D SMM_REQUIRE \
+		-D EXCLUDE_SHELL_FROM_FD"
+
+	[[ ${PV} != "999999" ]] && use binary && return
+
+	emake ARCH=${TARGET_ARCH} -C BaseTools
+
+	. ./edksetup.sh
+
+	mkdir -p ovmf
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
+	rm -rf Build/OvmfX64
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
+	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || dies "cp failed"
+	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || dies "cp failed"
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins ovmf/*
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2019-07-28 23:17 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2019-07-28 23:17 UTC (permalink / raw
  To: gentoo-commits

commit:     1bf61089297e21d870768a00e5103e23b0c611b6
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 22:44:15 2019 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 23:17:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bf61089

sys-firmware/edk2-ovmf: also create a convenience UefiShell.img

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
index 246a3853850..6e9f4e3babf 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -12,6 +12,7 @@ DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
 HOMEPAGE="https://github.com/tianocore/edk2"
 
 NON_BINARY_DEPEND="
+	app-emulation/qemu
 	>=dev-lang/nasm-2.0.7
 	>=sys-power/iasl-20160729
 	${PYTHON_DEPS}
@@ -123,6 +124,8 @@ src_compile() {
 
 	. ./edksetup.sh
 
+	# Build all EFI firmware blobs:
+
 	mkdir -p ovmf
 
 	./OvmfPkg/build.sh \
@@ -137,8 +140,17 @@ src_compile() {
 		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
 
 	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
-	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || dies "cp failed"
-	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || dies "cp failed"
+	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
+	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
+
+	# Build a convenience UefiShell.img:
+
+	mkdir -p iso_image/efi/boot || die "mkdir failed"
+	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
+	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
+	qemu-img convert --image-opts \
+		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
+		ovmf/UefiShell.img || die "qemu-img failed"
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2019-08-18 21:51 Agostino Sarubbo
  0 siblings, 0 replies; 56+ messages in thread
From: Agostino Sarubbo @ 2019-08-18 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     4515e0d63a7ce72d5b090ed426a597c575f74410
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 21:49:02 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Aug 18 21:49:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4515e0d6

sys-firmware/edk2-ovmf: amd64 stable wrt bug #678906

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
index 6e9f4e3babf..913d6914f20 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -36,7 +36,7 @@ else
 		)
 		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
 		"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2019-08-19 11:37 Agostino Sarubbo
  0 siblings, 0 replies; 56+ messages in thread
From: Agostino Sarubbo @ 2019-08-19 11:37 UTC (permalink / raw
  To: gentoo-commits

commit:     7faadadedf0816e2bee285f66589183cc1fdb725
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 11:36:56 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 11:36:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7faadade

sys-firmware/edk2-ovmf: x86 stable wrt bug #678906

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
index 913d6914f20..45682bed9bf 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -36,7 +36,7 @@ else
 		)
 		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
 		"
-	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2020-02-10 13:26 Michał Górny
  0 siblings, 0 replies; 56+ messages in thread
From: Michał Górny @ 2020-02-10 13:26 UTC (permalink / raw
  To: gentoo-commits

commit:     29a2b20c966b08299e6ecc4695680f1e47c0d03c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 13:06:07 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 13:26:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29a2b20c

sys-firmware/edk2-ovmf: Remove py2 where possible

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 2 +-
 sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
index 13b1feca47f..1abe540a07b 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit eutils python-any-r1 readme.gentoo-r1
 

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
index 4e5483b25b7..e8acffa9d29 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit eutils python-any-r1 readme.gentoo-r1
 


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2020-08-19 22:40 Sam James
  0 siblings, 0 replies; 56+ messages in thread
From: Sam James @ 2020-08-19 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     923df930f71fbb7e65fee543c2bba529d3255814
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 22:37:46 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 22:37:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=923df930

sys-firmware/edk2-ovmf: arm64 stable (bug #738056)

Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
index 1abe540a07b..4a71ef4068c 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -36,7 +36,7 @@ else
 		)
 		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
 		"
-	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2020-10-02 10:38 Vadim Misbakh-Soloviov
  0 siblings, 0 replies; 56+ messages in thread
From: Vadim Misbakh-Soloviov @ 2020-10-02 10:38 UTC (permalink / raw
  To: gentoo-commits

commit:     4342ef6d64286089e4a4b25dca5b15a5edb53dca
Author:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  2 10:37:58 2020 +0000
Commit:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Fri Oct  2 10:37:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4342ef6d

sys-firmware/edk2-ovmf: Bump

Bug: https://bugs.gentoo.org/712288
Bug: https://bugs.gentoo.org/744412
Bug: https://bugs.gentoo.org/734146
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>

 sys-firmware/edk2-ovmf/Manifest                    |  5 +++
 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild     |  3 ++
 ...-ovmf-201905.ebuild => edk2-ovmf-202008.ebuild} | 39 ++++++++++++++++------
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index fa1a6639d99..771bdb3c5eb 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,3 +1,8 @@
+DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
 DIST edk2-ovmf-201905-bin.tar.xz 3017256 BLAKE2B 6a106f111a363f1c2de33c4e7eba48183da6047654512939c286c6d0369e3b4c7705c271e61fa95299ba2b629022be7b5ef665ff096d41373583f5409b5c32fb SHA512 4a174dc1d64769a93de3bf5f9d787e278bfab57e2317699d722aa772e64e8867b3998b7feee58d5e4c66adc79ba9c5023dae2ce786159db7a740b86cf35d923d
 DIST edk2-ovmf-201905-bundled.tar.xz 3538508 BLAKE2B a1766180c84ee83987f50fdb6a6c9891dfb983ff78c98f7bc38635ffe484ebf29d4286ff97d7747080e28a655ff14b5939d4505d75ebe6655ecacc7f9d405469 SHA512 be3d8ef1ffb1ddce64883d9ef8dc598c7026d23d2e33c33949d28de81513b6a7f04f840ccb3d42664e918c6603487fbe594261c327921f3250c3998218572774
 DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de2691524e55c96d8a0e85aab1385a9abddc47c13ce3236b952c1299514e542ad0fa4bc9550cc4527945c05109d227a698293 SHA512 91188923f7d1ab83c0d6abf7ec6d59f357d0341a617ad6a3ae05f3d0e041dff43f62b014b0c5fc5d15e16d8f1c279c581a5cd64b31e3d52b340d7ef90adb50f1
+DIST edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560ed9f729d728f1dee3806814b1eb8d89dabc4fd70433f7f77656b65d9af7919d036074a53a95190a1aa8b65ab7d73495ffc SHA512 d0c8b249a7a2124e8bb63a4358466e86a3a837e76586565dd4762351998d8561374eabb8a1303dbf71ac269c15552d9e8cff71d65bc6fe8a3a81fb4fb032e0d8
+DIST edk2-ovmf-202008-qemu-firmware.tar.xz 688 BLAKE2B c9e62a79ded7c5f0abebf76e89d588209e2d17d5cd903c62296d0e408d31b3426a13ca189272bea021324a90c9b6d023721119fa55110c0bc1c17b00e4e14e12 SHA512 fad16d6e9cb00577761030b943b5bb2009b784fd99b37dcae1f8091efa48cd83bd99bf691b8e4c53d19bf8df1e2701498b3352a8b6f9fe56414fd75370c29c16
+DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666
+DIST openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz 9981169 BLAKE2B 33aac7364cdd45fec5654ab6caef84e1a829464380419c8a6bb311055c5a01c0aaff6e046a7c541a87e908fa9d26bae652f5be901461d03df36f2522f9c34b0c SHA512 db2087c04f0b428b3f4e1c8b3ac53cce69e0fd331ed2b86ba00facafd1685864d73f71c13eee48f4fe0af2bddad848f84a2b8ed2a17fabdf7fa2ed7d9eb39371

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
index 4a71ef4068c..91d22497f89 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -96,6 +96,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	sed -i -r \
+		-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
+		"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
 	if  [[ ${PV} != "999999" ]] && use binary; then
 		eapply_user
 		return

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
similarity index 73%
copy from sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
copy to sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
index 4a71ef4068c..4f3c1c5375d 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit eutils python-any-r1 readme.gentoo-r1
 
@@ -26,17 +26,23 @@ if [[ ${PV} == "999999" ]] ; then
 		${NON_BINARY_DEPEND}
 	"
 else
+	BUNDLED_OPENSSL_SUBMODULE_SHA="e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72"
+	BUNDLED_BROTLI_SUBMODULE_SHA="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
 	# Binary versions taken from fedora:
-	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
-	#   edk2-ovmf-20190501stable-2.fc31.noarch.rpm
+	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/e/
+	#   edk2-ovmf-20200801stable-1.fc34.noarch.rpm
+
+	# TODO: talk with tamiko about unbundling
 	SRC_URI="
 		!binary? (
 			https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
-			https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.xz
+			https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz
+			https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
+			https://dev.gentoo.org/~mva/distfiles/${P}-qemu-firmware.tar.xz
 		)
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
-		"
-	KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
+		binary? ( https://dev.gentoo.org/~mva/distfiles/${P}-bin.tar.xz )
+	"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )
@@ -96,9 +102,19 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if  [[ ${PV} != "999999" ]] && use binary; then
-		eapply_user
-		return
+	sed -i -r \
+		-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
+		"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+	if  [[ ${PV} != "999999" ]]; then
+		if use binary; then
+			eapply_user
+			return
+		else
+			# Bundled submodules
+			cp -rl "${WORKDIR}/openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}"/* "CryptoPkg/Library/OpensslLib/openssl/"
+			cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "BaseTools/Source/C/BrotliCompress/brotli/"
+			cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/"
+		fi
 	fi
 	default
 }
@@ -157,6 +173,9 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins ovmf/*
 
+	insinto /usr/share/qemu/firmware
+	doins qemu/*
+
 	readme.gentoo_create_doc
 }
 


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2020-10-02 10:53 Vadim Misbakh-Soloviov
  0 siblings, 0 replies; 56+ messages in thread
From: Vadim Misbakh-Soloviov @ 2020-10-02 10:53 UTC (permalink / raw
  To: gentoo-commits

commit:     6ac65a2f8d96632d610823b56df21d0c624a718a
Author:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  2 10:53:29 2020 +0000
Commit:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Fri Oct  2 10:53:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ac65a2f

sys-firmware/edk2-ovmf: fix qemu firmwares tarball digest

Bug: https://bugs.gentoo.org/734146
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>

 sys-firmware/edk2-ovmf/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index 771bdb3c5eb..bec7f6b201f 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -3,6 +3,6 @@ DIST edk2-ovmf-201905-bin.tar.xz 3017256 BLAKE2B 6a106f111a363f1c2de33c4e7eba481
 DIST edk2-ovmf-201905-bundled.tar.xz 3538508 BLAKE2B a1766180c84ee83987f50fdb6a6c9891dfb983ff78c98f7bc38635ffe484ebf29d4286ff97d7747080e28a655ff14b5939d4505d75ebe6655ecacc7f9d405469 SHA512 be3d8ef1ffb1ddce64883d9ef8dc598c7026d23d2e33c33949d28de81513b6a7f04f840ccb3d42664e918c6603487fbe594261c327921f3250c3998218572774
 DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de2691524e55c96d8a0e85aab1385a9abddc47c13ce3236b952c1299514e542ad0fa4bc9550cc4527945c05109d227a698293 SHA512 91188923f7d1ab83c0d6abf7ec6d59f357d0341a617ad6a3ae05f3d0e041dff43f62b014b0c5fc5d15e16d8f1c279c581a5cd64b31e3d52b340d7ef90adb50f1
 DIST edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560ed9f729d728f1dee3806814b1eb8d89dabc4fd70433f7f77656b65d9af7919d036074a53a95190a1aa8b65ab7d73495ffc SHA512 d0c8b249a7a2124e8bb63a4358466e86a3a837e76586565dd4762351998d8561374eabb8a1303dbf71ac269c15552d9e8cff71d65bc6fe8a3a81fb4fb032e0d8
-DIST edk2-ovmf-202008-qemu-firmware.tar.xz 688 BLAKE2B c9e62a79ded7c5f0abebf76e89d588209e2d17d5cd903c62296d0e408d31b3426a13ca189272bea021324a90c9b6d023721119fa55110c0bc1c17b00e4e14e12 SHA512 fad16d6e9cb00577761030b943b5bb2009b784fd99b37dcae1f8091efa48cd83bd99bf691b8e4c53d19bf8df1e2701498b3352a8b6f9fe56414fd75370c29c16
+DIST edk2-ovmf-202008-qemu-firmware.tar.xz 680 BLAKE2B 176f8e94a3f605acc72850634cbf155619490f5998125521a392a8e9c7d2b78841b841f0cb5ea860f14645b124cf1921256bbe46960efbe3401805d89bbfbed6 SHA512 b72f248ab4d49503c3e8e686e22beb77f0e48d2c6c9523f389f20504e0c30fa11fa0fcb5607d7d5bb1ba2433894fa458864c5761335e39de4b2a40b01203f043
 DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666
 DIST openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz 9981169 BLAKE2B 33aac7364cdd45fec5654ab6caef84e1a829464380419c8a6bb311055c5a01c0aaff6e046a7c541a87e908fa9d26bae652f5be901461d03df36f2522f9c34b0c SHA512 db2087c04f0b428b3f4e1c8b3ac53cce69e0fd331ed2b86ba00facafd1685864d73f71c13eee48f4fe0af2bddad848f84a2b8ed2a17fabdf7fa2ed7d9eb39371


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2020-10-02 11:06 Vadim Misbakh-Soloviov
  0 siblings, 0 replies; 56+ messages in thread
From: Vadim Misbakh-Soloviov @ 2020-10-02 11:06 UTC (permalink / raw
  To: gentoo-commits

commit:     c8e9de88098d4e56b80e93733ddca0661075134f
Author:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  2 11:06:17 2020 +0000
Commit:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Fri Oct  2 11:06:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e9de88

sys-firmware/edk2-ovmf: py3-patching is not needed on USE=binary

Bug: https://bugs.gentoo.org/746122
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 8 +++++---
 sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
index 91d22497f89..0ce07a1b445 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -96,9 +96,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i -r \
-		-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
-		"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+	if ! use binary; then
+		sed -i -r \
+			-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
+			"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+	fi
 	if  [[ ${PV} != "999999" ]] && use binary; then
 		eapply_user
 		return

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
index 4f3c1c5375d..2e326c433bc 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
@@ -102,9 +102,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i -r \
-		-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
-		"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+	if ! use binary; then
+		sed -i -r \
+			-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
+			"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+	fi
 	if  [[ ${PV} != "999999" ]]; then
 		if use binary; then
 			eapply_user


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2020-10-02 13:56 Vadim Misbakh-Soloviov
  0 siblings, 0 replies; 56+ messages in thread
From: Vadim Misbakh-Soloviov @ 2020-10-02 13:56 UTC (permalink / raw
  To: gentoo-commits

commit:     9b533dbf89d17e25421e07a2854be7f9b137b14e
Author:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  2 13:56:11 2020 +0000
Commit:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Fri Oct  2 13:56:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b533dbf

sys-firmware/edk2-ovmf: install qemu firmware jsons even with USE=binary

Bug: https://bugs.gentoo.org/746128
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
index 2e326c433bc..bd9480eb473 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
@@ -38,9 +38,9 @@ else
 			https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
 			https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz
 			https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
-			https://dev.gentoo.org/~mva/distfiles/${P}-qemu-firmware.tar.xz
 		)
 		binary? ( https://dev.gentoo.org/~mva/distfiles/${P}-bin.tar.xz )
+		https://dev.gentoo.org/~mva/distfiles/${P}-qemu-firmware.tar.xz
 	"
 	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 	IUSE="+binary"


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2020-10-11 23:44 Sam James
  0 siblings, 0 replies; 56+ messages in thread
From: Sam James @ 2020-10-11 23:44 UTC (permalink / raw
  To: gentoo-commits

commit:     cf308bab83ccd7025dc1ba2d747c1e5874238b36
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 23:43:44 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 23:43:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf308bab

sys-firmware/edk2-ovmf: Stabilize 202008 arm64, #744412

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
index bd9480eb473..2366fe02e7d 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
@@ -42,7 +42,7 @@ else
 		binary? ( https://dev.gentoo.org/~mva/distfiles/${P}-bin.tar.xz )
 		https://dev.gentoo.org/~mva/distfiles/${P}-qemu-firmware.tar.xz
 	"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 arm64 ~ppc ~ppc64 ~x86"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2020-10-13  9:26 Agostino Sarubbo
  0 siblings, 0 replies; 56+ messages in thread
From: Agostino Sarubbo @ 2020-10-13  9:26 UTC (permalink / raw
  To: gentoo-commits

commit:     9cda1d0a8cbfa54f631fc403e4b9c5a04d3d26b4
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 09:26:21 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 09:26:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cda1d0a

sys-firmware/edk2-ovmf: amd64 stable wrt bug #744412

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
index 2366fe02e7d..60818cfbafa 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
@@ -42,7 +42,7 @@ else
 		binary? ( https://dev.gentoo.org/~mva/distfiles/${P}-bin.tar.xz )
 		https://dev.gentoo.org/~mva/distfiles/${P}-qemu-firmware.tar.xz
 	"
-	KEYWORDS="~amd64 arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~x86"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2020-10-13 10:01 Agostino Sarubbo
  0 siblings, 0 replies; 56+ messages in thread
From: Agostino Sarubbo @ 2020-10-13 10:01 UTC (permalink / raw
  To: gentoo-commits

commit:     c827aa8e819372bb2e9fb2d12a2fcf6eb5bd0802
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 10:01:14 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 10:01:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c827aa8e

sys-firmware/edk2-ovmf: x86 stable wrt bug #744412

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
index 60818cfbafa..6b7b4fcd3a3 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
@@ -42,7 +42,7 @@ else
 		binary? ( https://dev.gentoo.org/~mva/distfiles/${P}-bin.tar.xz )
 		https://dev.gentoo.org/~mva/distfiles/${P}-qemu-firmware.tar.xz
 	"
-	KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2020-11-07  3:49 Georgy Yakovlev
  0 siblings, 0 replies; 56+ messages in thread
From: Georgy Yakovlev @ 2020-11-07  3:49 UTC (permalink / raw
  To: gentoo-commits

commit:     e029777591310932d3c3cb904ed426822e43f118
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  7 01:46:05 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Nov  7 02:09:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0297775

sys-firmware/edk2-ovmf: ppc64 stable, bug #750047

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 2 +-
 sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
index 0ce07a1b445..8b1c10b16ff 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -36,7 +36,7 @@ else
 		)
 		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
 		"
-	KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
index 6b7b4fcd3a3..8d1425ab22a 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
@@ -42,7 +42,7 @@ else
 		binary? ( https://dev.gentoo.org/~mva/distfiles/${P}-bin.tar.xz )
 		https://dev.gentoo.org/~mva/distfiles/${P}-qemu-firmware.tar.xz
 	"
-	KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2020-12-23  1:28 Thomas Deutschmann
  0 siblings, 0 replies; 56+ messages in thread
From: Thomas Deutschmann @ 2020-12-23  1:28 UTC (permalink / raw
  To: gentoo-commits

commit:     ffcb1841612a0f3edf1d057e1ef0c862a7cb8270
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 01:28:16 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 01:28:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffcb1841

sys-firmware/edk2-ovmf: security cleanup (bug #744412)

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-firmware/edk2-ovmf/Manifest                |   3 -
 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 170 -------------------------
 2 files changed, 173 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index bec7f6b201f..bcb2df5176f 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,7 +1,4 @@
 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
-DIST edk2-ovmf-201905-bin.tar.xz 3017256 BLAKE2B 6a106f111a363f1c2de33c4e7eba48183da6047654512939c286c6d0369e3b4c7705c271e61fa95299ba2b629022be7b5ef665ff096d41373583f5409b5c32fb SHA512 4a174dc1d64769a93de3bf5f9d787e278bfab57e2317699d722aa772e64e8867b3998b7feee58d5e4c66adc79ba9c5023dae2ce786159db7a740b86cf35d923d
-DIST edk2-ovmf-201905-bundled.tar.xz 3538508 BLAKE2B a1766180c84ee83987f50fdb6a6c9891dfb983ff78c98f7bc38635ffe484ebf29d4286ff97d7747080e28a655ff14b5939d4505d75ebe6655ecacc7f9d405469 SHA512 be3d8ef1ffb1ddce64883d9ef8dc598c7026d23d2e33c33949d28de81513b6a7f04f840ccb3d42664e918c6603487fbe594261c327921f3250c3998218572774
-DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de2691524e55c96d8a0e85aab1385a9abddc47c13ce3236b952c1299514e542ad0fa4bc9550cc4527945c05109d227a698293 SHA512 91188923f7d1ab83c0d6abf7ec6d59f357d0341a617ad6a3ae05f3d0e041dff43f62b014b0c5fc5d15e16d8f1c279c581a5cd64b31e3d52b340d7ef90adb50f1
 DIST edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560ed9f729d728f1dee3806814b1eb8d89dabc4fd70433f7f77656b65d9af7919d036074a53a95190a1aa8b65ab7d73495ffc SHA512 d0c8b249a7a2124e8bb63a4358466e86a3a837e76586565dd4762351998d8561374eabb8a1303dbf71ac269c15552d9e8cff71d65bc6fe8a3a81fb4fb032e0d8
 DIST edk2-ovmf-202008-qemu-firmware.tar.xz 680 BLAKE2B 176f8e94a3f605acc72850634cbf155619490f5998125521a392a8e9c7d2b78841b841f0cb5ea860f14645b124cf1921256bbe46960efbe3401805d89bbfbed6 SHA512 b72f248ab4d49503c3e8e686e22beb77f0e48d2c6c9523f389f20504e0c30fa11fa0fcb5607d7d5bb1ba2433894fa458864c5761335e39de4b2a40b01203f043
 DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
deleted file mode 100644
index 8b1c10b16ff..00000000000
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit eutils python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
-HOMEPAGE="https://github.com/tianocore/edk2"
-
-NON_BINARY_DEPEND="
-	app-emulation/qemu
-	>=dev-lang/nasm-2.0.7
-	>=sys-power/iasl-20160729
-	${PYTHON_DEPS}
-"
-DEPEND=""
-RDEPEND=""
-if [[ ${PV} == "999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tianocore/edk2"
-	DEPEND+="
-		${NON_BINARY_DEPEND}
-	"
-else
-	# Binary versions taken from fedora:
-	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
-	#   edk2-ovmf-20190501stable-2.fc31.noarch.rpm
-	SRC_URI="
-		!binary? (
-			https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
-			https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.xz
-		)
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
-		"
-	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-	IUSE="+binary"
-	REQUIRED_USE+="
-		!amd64? ( binary )
-	"
-	DEPEND+="
-		!binary? (
-			amd64? (
-				${NON_BINARY_DEPEND}
-			)
-		)"
-	PATCHES=(
-	)
-fi
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-
-S="${WORKDIR}/edk2-edk2-stable${PV}"
-
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
-virtual machines. The firmware is located under
-	/usr/share/edk2-ovmf/OVMF_CODE.fd
-	/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)
-or creating OVMF_VARS.secboot.fd by hand:
-	https://github.com/puiterwijk/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
-one for yourself. Firmware blobs are commonly labeled
-	OVMF{,_CODE,_VARS}-with-csm.fd
-
-In order to use the firmware you can run qemu the following way
-
-	$ qemu-system-x86_64 \
-		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
-		...
-
-You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
-	nvram = [
-		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-		\"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-	]"
-
-pkg_setup() {
-	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use binary; then
-		sed -i -r \
-			-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
-			"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
-	fi
-	if  [[ ${PV} != "999999" ]] && use binary; then
-		eapply_user
-		return
-	fi
-	default
-}
-
-src_compile() {
-	TARGET_ARCH=X64
-	TARGET_NAME=RELEASE
-	TARGET_TOOLS=GCC49
-
-	BUILD_FLAGS="-D TLS_ENABLE \
-		-D HTTP_BOOT_ENABLE \
-		-D NETWORK_IP6_ENABLE \
-		-D FD_SIZE_2MB"
-
-	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
-		-D SECURE_BOOT_ENABLE \
-		-D SMM_REQUIRE \
-		-D EXCLUDE_SHELL_FROM_FD"
-
-	[[ ${PV} != "999999" ]] && use binary && return
-
-	emake ARCH=${TARGET_ARCH} -C BaseTools
-
-	. ./edksetup.sh
-
-	# Build all EFI firmware blobs:
-
-	mkdir -p ovmf
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
-
-	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
-	rm -rf Build/OvmfX64
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
-
-	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
-	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
-	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
-
-	# Build a convenience UefiShell.img:
-
-	mkdir -p iso_image/efi/boot || die "mkdir failed"
-	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
-	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
-	qemu-img convert --image-opts \
-		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
-		ovmf/UefiShell.img || die "qemu-img failed"
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins ovmf/*
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2020-12-23  1:30 Thomas Deutschmann
  0 siblings, 0 replies; 56+ messages in thread
From: Thomas Deutschmann @ 2020-12-23  1:30 UTC (permalink / raw
  To: gentoo-commits

commit:     48493c5055195f3a1c1cacabdaf4368b7eaeba14
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 01:30:02 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 01:30:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48493c50

Revert "sys-firmware/edk2-ovmf: security cleanup (bug #744412)"

This reverts commit ffcb1841612a0f3edf1d057e1ef0c862a7cb8270.

Still needed for app-emulation/qemu.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-firmware/edk2-ovmf/Manifest                |   3 +
 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 170 +++++++++++++++++++++++++
 2 files changed, 173 insertions(+)

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index bcb2df5176f..bec7f6b201f 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,4 +1,7 @@
 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
+DIST edk2-ovmf-201905-bin.tar.xz 3017256 BLAKE2B 6a106f111a363f1c2de33c4e7eba48183da6047654512939c286c6d0369e3b4c7705c271e61fa95299ba2b629022be7b5ef665ff096d41373583f5409b5c32fb SHA512 4a174dc1d64769a93de3bf5f9d787e278bfab57e2317699d722aa772e64e8867b3998b7feee58d5e4c66adc79ba9c5023dae2ce786159db7a740b86cf35d923d
+DIST edk2-ovmf-201905-bundled.tar.xz 3538508 BLAKE2B a1766180c84ee83987f50fdb6a6c9891dfb983ff78c98f7bc38635ffe484ebf29d4286ff97d7747080e28a655ff14b5939d4505d75ebe6655ecacc7f9d405469 SHA512 be3d8ef1ffb1ddce64883d9ef8dc598c7026d23d2e33c33949d28de81513b6a7f04f840ccb3d42664e918c6603487fbe594261c327921f3250c3998218572774
+DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de2691524e55c96d8a0e85aab1385a9abddc47c13ce3236b952c1299514e542ad0fa4bc9550cc4527945c05109d227a698293 SHA512 91188923f7d1ab83c0d6abf7ec6d59f357d0341a617ad6a3ae05f3d0e041dff43f62b014b0c5fc5d15e16d8f1c279c581a5cd64b31e3d52b340d7ef90adb50f1
 DIST edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560ed9f729d728f1dee3806814b1eb8d89dabc4fd70433f7f77656b65d9af7919d036074a53a95190a1aa8b65ab7d73495ffc SHA512 d0c8b249a7a2124e8bb63a4358466e86a3a837e76586565dd4762351998d8561374eabb8a1303dbf71ac269c15552d9e8cff71d65bc6fe8a3a81fb4fb032e0d8
 DIST edk2-ovmf-202008-qemu-firmware.tar.xz 680 BLAKE2B 176f8e94a3f605acc72850634cbf155619490f5998125521a392a8e9c7d2b78841b841f0cb5ea860f14645b124cf1921256bbe46960efbe3401805d89bbfbed6 SHA512 b72f248ab4d49503c3e8e686e22beb77f0e48d2c6c9523f389f20504e0c30fa11fa0fcb5607d7d5bb1ba2433894fa458864c5761335e39de4b2a40b01203f043
 DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
new file mode 100644
index 00000000000..8b1c10b16ff
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit eutils python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+NON_BINARY_DEPEND="
+	app-emulation/qemu
+	>=dev-lang/nasm-2.0.7
+	>=sys-power/iasl-20160729
+	${PYTHON_DEPS}
+"
+DEPEND=""
+RDEPEND=""
+if [[ ${PV} == "999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tianocore/edk2"
+	DEPEND+="
+		${NON_BINARY_DEPEND}
+	"
+else
+	# Binary versions taken from fedora:
+	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
+	#   edk2-ovmf-20190501stable-2.fc31.noarch.rpm
+	SRC_URI="
+		!binary? (
+			https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
+			https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.xz
+		)
+		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
+		"
+	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
+	IUSE="+binary"
+	REQUIRED_USE+="
+		!amd64? ( binary )
+	"
+	DEPEND+="
+		!binary? (
+			amd64? (
+				${NON_BINARY_DEPEND}
+			)
+		)"
+	PATCHES=(
+	)
+fi
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+
+S="${WORKDIR}/edk2-edk2-stable${PV}"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+	/usr/share/edk2-ovmf/OVMF_CODE.fd
+	/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)
+or creating OVMF_VARS.secboot.fd by hand:
+	https://github.com/puiterwijk/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
+one for yourself. Firmware blobs are commonly labeled
+	OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+	$ qemu-system-x86_64 \
+		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+		...
+
+You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
+	nvram = [
+		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+		\"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+	]"
+
+pkg_setup() {
+	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if ! use binary; then
+		sed -i -r \
+			-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
+			"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+	fi
+	if  [[ ${PV} != "999999" ]] && use binary; then
+		eapply_user
+		return
+	fi
+	default
+}
+
+src_compile() {
+	TARGET_ARCH=X64
+	TARGET_NAME=RELEASE
+	TARGET_TOOLS=GCC49
+
+	BUILD_FLAGS="-D TLS_ENABLE \
+		-D HTTP_BOOT_ENABLE \
+		-D NETWORK_IP6_ENABLE \
+		-D FD_SIZE_2MB"
+
+	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
+		-D SECURE_BOOT_ENABLE \
+		-D SMM_REQUIRE \
+		-D EXCLUDE_SHELL_FROM_FD"
+
+	[[ ${PV} != "999999" ]] && use binary && return
+
+	emake ARCH=${TARGET_ARCH} -C BaseTools
+
+	. ./edksetup.sh
+
+	# Build all EFI firmware blobs:
+
+	mkdir -p ovmf
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
+	rm -rf Build/OvmfX64
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
+	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
+	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
+
+	# Build a convenience UefiShell.img:
+
+	mkdir -p iso_image/efi/boot || die "mkdir failed"
+	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
+	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
+	qemu-img convert --image-opts \
+		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
+		ovmf/UefiShell.img || die "qemu-img failed"
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins ovmf/*
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2021-03-11 17:03 Ben Kohler
  0 siblings, 0 replies; 56+ messages in thread
From: Ben Kohler @ 2021-03-11 17:03 UTC (permalink / raw
  To: gentoo-commits

commit:     9ca959e8e810e6d267bc8f9cfdb6369ff3d74236
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 11 17:02:31 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 17:03:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ca959e8

sys-firmware/edk2-ovmf: remove unmaintained 999999

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild | 154 -------------------------
 1 file changed, 154 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
deleted file mode 100644
index 75427b608e2..00000000000
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_7 )
-
-inherit eutils python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
-HOMEPAGE="https://github.com/tianocore/edk2"
-
-NON_BINARY_DEPEND="
-	app-emulation/qemu
-	>=dev-lang/nasm-2.0.7
-	>=sys-power/iasl-20160729
-	${PYTHON_DEPS}
-"
-DEPEND=""
-RDEPEND=""
-if [[ ${PV} == "999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tianocore/edk2"
-	DEPEND+="
-		${NON_BINARY_DEPEND}
-	"
-else
-	SRC_URI=""
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-	IUSE="+binary"
-	REQUIRED_USE+="
-		!amd64? ( binary )
-	"
-	DEPEND+="
-		!binary? (
-			amd64? (
-				${NON_BINARY_DEPEND}
-			)
-		)"
-	PATCHES=(
-	)
-fi
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
-virtual machines. The firmware is located under
-	/usr/share/edk2-ovmf/OVMF_CODE.fd
-	/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)
-or creating OVMF_VARS.secboot.fd by hand:
-	https://github.com/puiterwijk/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
-one for yourself. Firmware blobs are commonly labeled
-	OVMF{,_CODE,_VARS}-with-csm.fd
-
-In order to use the firmware you can run qemu the following way
-
-	$ qemu-system-x86_64 \
-		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
-		...
-
-You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
-	nvram = [
-		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-		\"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-	]"
-
-pkg_setup() {
-	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if  [[ ${PV} != "999999" ]] && use binary; then
-		eapply_user
-		return
-	fi
-	default
-}
-
-src_compile() {
-	TARGET_ARCH=X64
-	TARGET_NAME=RELEASE
-	TARGET_TOOLS=GCC49
-
-	BUILD_FLAGS="-D TLS_ENABLE \
-		-D HTTP_BOOT_ENABLE \
-		-D NETWORK_IP6_ENABLE \
-		-D FD_SIZE_2MB"
-
-	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
-		-D SECURE_BOOT_ENABLE \
-		-D SMM_REQUIRE \
-		-D EXCLUDE_SHELL_FROM_FD"
-
-	[[ ${PV} != "999999" ]] && use binary && return
-
-	emake ARCH=${TARGET_ARCH} -C BaseTools
-
-	. ./edksetup.sh
-
-	# Build all EFI firmware blobs:
-
-	mkdir -p ovmf
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
-
-	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
-	rm -rf Build/OvmfX64
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
-
-	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
-	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
-	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
-
-	# Build a convenience UefiShell.img:
-
-	mkdir -p iso_image/efi/boot || die "mkdir failed"
-	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
-	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
-	qemu-img convert --image-opts \
-		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
-		ovmf/UefiShell.img || die "qemu-img failed"
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins ovmf/*
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2021-04-04 23:07 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2021-04-04 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     98ee06b614dad0f70fa11493723e63b4d84679bf
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  4 23:05:58 2021 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Apr  4 23:06:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98ee06b6

sys-firmware/edk2-ovmf: drop old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sys-firmware/edk2-ovmf/Manifest                |   3 -
 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 170 -------------------------
 2 files changed, 173 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index bec7f6b201f..bcb2df5176f 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,7 +1,4 @@
 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
-DIST edk2-ovmf-201905-bin.tar.xz 3017256 BLAKE2B 6a106f111a363f1c2de33c4e7eba48183da6047654512939c286c6d0369e3b4c7705c271e61fa95299ba2b629022be7b5ef665ff096d41373583f5409b5c32fb SHA512 4a174dc1d64769a93de3bf5f9d787e278bfab57e2317699d722aa772e64e8867b3998b7feee58d5e4c66adc79ba9c5023dae2ce786159db7a740b86cf35d923d
-DIST edk2-ovmf-201905-bundled.tar.xz 3538508 BLAKE2B a1766180c84ee83987f50fdb6a6c9891dfb983ff78c98f7bc38635ffe484ebf29d4286ff97d7747080e28a655ff14b5939d4505d75ebe6655ecacc7f9d405469 SHA512 be3d8ef1ffb1ddce64883d9ef8dc598c7026d23d2e33c33949d28de81513b6a7f04f840ccb3d42664e918c6603487fbe594261c327921f3250c3998218572774
-DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de2691524e55c96d8a0e85aab1385a9abddc47c13ce3236b952c1299514e542ad0fa4bc9550cc4527945c05109d227a698293 SHA512 91188923f7d1ab83c0d6abf7ec6d59f357d0341a617ad6a3ae05f3d0e041dff43f62b014b0c5fc5d15e16d8f1c279c581a5cd64b31e3d52b340d7ef90adb50f1
 DIST edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560ed9f729d728f1dee3806814b1eb8d89dabc4fd70433f7f77656b65d9af7919d036074a53a95190a1aa8b65ab7d73495ffc SHA512 d0c8b249a7a2124e8bb63a4358466e86a3a837e76586565dd4762351998d8561374eabb8a1303dbf71ac269c15552d9e8cff71d65bc6fe8a3a81fb4fb032e0d8
 DIST edk2-ovmf-202008-qemu-firmware.tar.xz 680 BLAKE2B 176f8e94a3f605acc72850634cbf155619490f5998125521a392a8e9c7d2b78841b841f0cb5ea860f14645b124cf1921256bbe46960efbe3401805d89bbfbed6 SHA512 b72f248ab4d49503c3e8e686e22beb77f0e48d2c6c9523f389f20504e0c30fa11fa0fcb5607d7d5bb1ba2433894fa458864c5761335e39de4b2a40b01203f043
 DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
deleted file mode 100644
index 19f49566846..00000000000
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_7 )
-
-inherit eutils python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
-HOMEPAGE="https://github.com/tianocore/edk2"
-
-NON_BINARY_DEPEND="
-	app-emulation/qemu
-	>=dev-lang/nasm-2.0.7
-	>=sys-power/iasl-20160729
-	${PYTHON_DEPS}
-"
-DEPEND=""
-RDEPEND=""
-if [[ ${PV} == "999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tianocore/edk2"
-	DEPEND+="
-		${NON_BINARY_DEPEND}
-	"
-else
-	# Binary versions taken from fedora:
-	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
-	#   edk2-ovmf-20190501stable-2.fc31.noarch.rpm
-	SRC_URI="
-		!binary? (
-			https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
-			https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.xz
-		)
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
-		"
-	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-	IUSE="+binary"
-	REQUIRED_USE+="
-		!amd64? ( binary )
-	"
-	DEPEND+="
-		!binary? (
-			amd64? (
-				${NON_BINARY_DEPEND}
-			)
-		)"
-	PATCHES=(
-	)
-fi
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-
-S="${WORKDIR}/edk2-edk2-stable${PV}"
-
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
-virtual machines. The firmware is located under
-	/usr/share/edk2-ovmf/OVMF_CODE.fd
-	/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)
-or creating OVMF_VARS.secboot.fd by hand:
-	https://github.com/puiterwijk/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
-one for yourself. Firmware blobs are commonly labeled
-	OVMF{,_CODE,_VARS}-with-csm.fd
-
-In order to use the firmware you can run qemu the following way
-
-	$ qemu-system-x86_64 \
-		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
-		...
-
-You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
-	nvram = [
-		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-		\"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-	]"
-
-pkg_setup() {
-	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use binary; then
-		sed -i -r \
-			-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
-			"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
-	fi
-	if  [[ ${PV} != "999999" ]] && use binary; then
-		eapply_user
-		return
-	fi
-	default
-}
-
-src_compile() {
-	TARGET_ARCH=X64
-	TARGET_NAME=RELEASE
-	TARGET_TOOLS=GCC49
-
-	BUILD_FLAGS="-D TLS_ENABLE \
-		-D HTTP_BOOT_ENABLE \
-		-D NETWORK_IP6_ENABLE \
-		-D FD_SIZE_2MB"
-
-	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
-		-D SECURE_BOOT_ENABLE \
-		-D SMM_REQUIRE \
-		-D EXCLUDE_SHELL_FROM_FD"
-
-	[[ ${PV} != "999999" ]] && use binary && return
-
-	emake ARCH=${TARGET_ARCH} -C BaseTools
-
-	. ./edksetup.sh
-
-	# Build all EFI firmware blobs:
-
-	mkdir -p ovmf
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
-
-	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
-	rm -rf Build/OvmfX64
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
-
-	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
-	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
-	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
-
-	# Build a convenience UefiShell.img:
-
-	mkdir -p iso_image/efi/boot || die "mkdir failed"
-	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
-	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
-	qemu-img convert --image-opts \
-		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
-		ovmf/UefiShell.img || die "qemu-img failed"
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins ovmf/*
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2021-04-04 23:09 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2021-04-04 23:09 UTC (permalink / raw
  To: gentoo-commits

commit:     e520cd98a6bcf365a6f9718ff152b24537bac630
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  4 23:08:27 2021 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Apr  4 23:08:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e520cd98

Revert "sys-firmware/edk2-ovmf: drop old"

This reverts commit 98ee06b614dad0f70fa11493723e63b4d84679bf.

Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sys-firmware/edk2-ovmf/Manifest                |   3 +
 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 170 +++++++++++++++++++++++++
 2 files changed, 173 insertions(+)

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index bcb2df5176f..bec7f6b201f 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,4 +1,7 @@
 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
+DIST edk2-ovmf-201905-bin.tar.xz 3017256 BLAKE2B 6a106f111a363f1c2de33c4e7eba48183da6047654512939c286c6d0369e3b4c7705c271e61fa95299ba2b629022be7b5ef665ff096d41373583f5409b5c32fb SHA512 4a174dc1d64769a93de3bf5f9d787e278bfab57e2317699d722aa772e64e8867b3998b7feee58d5e4c66adc79ba9c5023dae2ce786159db7a740b86cf35d923d
+DIST edk2-ovmf-201905-bundled.tar.xz 3538508 BLAKE2B a1766180c84ee83987f50fdb6a6c9891dfb983ff78c98f7bc38635ffe484ebf29d4286ff97d7747080e28a655ff14b5939d4505d75ebe6655ecacc7f9d405469 SHA512 be3d8ef1ffb1ddce64883d9ef8dc598c7026d23d2e33c33949d28de81513b6a7f04f840ccb3d42664e918c6603487fbe594261c327921f3250c3998218572774
+DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de2691524e55c96d8a0e85aab1385a9abddc47c13ce3236b952c1299514e542ad0fa4bc9550cc4527945c05109d227a698293 SHA512 91188923f7d1ab83c0d6abf7ec6d59f357d0341a617ad6a3ae05f3d0e041dff43f62b014b0c5fc5d15e16d8f1c279c581a5cd64b31e3d52b340d7ef90adb50f1
 DIST edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560ed9f729d728f1dee3806814b1eb8d89dabc4fd70433f7f77656b65d9af7919d036074a53a95190a1aa8b65ab7d73495ffc SHA512 d0c8b249a7a2124e8bb63a4358466e86a3a837e76586565dd4762351998d8561374eabb8a1303dbf71ac269c15552d9e8cff71d65bc6fe8a3a81fb4fb032e0d8
 DIST edk2-ovmf-202008-qemu-firmware.tar.xz 680 BLAKE2B 176f8e94a3f605acc72850634cbf155619490f5998125521a392a8e9c7d2b78841b841f0cb5ea860f14645b124cf1921256bbe46960efbe3401805d89bbfbed6 SHA512 b72f248ab4d49503c3e8e686e22beb77f0e48d2c6c9523f389f20504e0c30fa11fa0fcb5607d7d5bb1ba2433894fa458864c5761335e39de4b2a40b01203f043
 DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
new file mode 100644
index 00000000000..19f49566846
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_7 )
+
+inherit eutils python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+NON_BINARY_DEPEND="
+	app-emulation/qemu
+	>=dev-lang/nasm-2.0.7
+	>=sys-power/iasl-20160729
+	${PYTHON_DEPS}
+"
+DEPEND=""
+RDEPEND=""
+if [[ ${PV} == "999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tianocore/edk2"
+	DEPEND+="
+		${NON_BINARY_DEPEND}
+	"
+else
+	# Binary versions taken from fedora:
+	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
+	#   edk2-ovmf-20190501stable-2.fc31.noarch.rpm
+	SRC_URI="
+		!binary? (
+			https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
+			https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.xz
+		)
+		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
+		"
+	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
+	IUSE="+binary"
+	REQUIRED_USE+="
+		!amd64? ( binary )
+	"
+	DEPEND+="
+		!binary? (
+			amd64? (
+				${NON_BINARY_DEPEND}
+			)
+		)"
+	PATCHES=(
+	)
+fi
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+
+S="${WORKDIR}/edk2-edk2-stable${PV}"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+	/usr/share/edk2-ovmf/OVMF_CODE.fd
+	/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)
+or creating OVMF_VARS.secboot.fd by hand:
+	https://github.com/puiterwijk/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
+one for yourself. Firmware blobs are commonly labeled
+	OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+	$ qemu-system-x86_64 \
+		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+		...
+
+You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
+	nvram = [
+		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+		\"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+	]"
+
+pkg_setup() {
+	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if ! use binary; then
+		sed -i -r \
+			-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
+			"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+	fi
+	if  [[ ${PV} != "999999" ]] && use binary; then
+		eapply_user
+		return
+	fi
+	default
+}
+
+src_compile() {
+	TARGET_ARCH=X64
+	TARGET_NAME=RELEASE
+	TARGET_TOOLS=GCC49
+
+	BUILD_FLAGS="-D TLS_ENABLE \
+		-D HTTP_BOOT_ENABLE \
+		-D NETWORK_IP6_ENABLE \
+		-D FD_SIZE_2MB"
+
+	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
+		-D SECURE_BOOT_ENABLE \
+		-D SMM_REQUIRE \
+		-D EXCLUDE_SHELL_FROM_FD"
+
+	[[ ${PV} != "999999" ]] && use binary && return
+
+	emake ARCH=${TARGET_ARCH} -C BaseTools
+
+	. ./edksetup.sh
+
+	# Build all EFI firmware blobs:
+
+	mkdir -p ovmf
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
+	rm -rf Build/OvmfX64
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
+	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
+	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
+
+	# Build a convenience UefiShell.img:
+
+	mkdir -p iso_image/efi/boot || die "mkdir failed"
+	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
+	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
+	qemu-img convert --image-opts \
+		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
+		ovmf/UefiShell.img || die "qemu-img failed"
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins ovmf/*
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2021-05-31 20:18 Michał Górny
  0 siblings, 0 replies; 56+ messages in thread
From: Michał Górny @ 2021-05-31 20:18 UTC (permalink / raw
  To: gentoo-commits

commit:     885f56e2bafb42122129f4c249e6959d4eeb6216
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 31 20:15:23 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 31 20:18:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=885f56e2

sys-firmware/edk2-ovmf: Enable py3.8 on 201905

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
index afd014e80a1..845ce19c2db 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..8} )
 
 inherit python-any-r1 readme.gentoo-r1
 


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2021-06-26 22:23 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2021-06-26 22:23 UTC (permalink / raw
  To: gentoo-commits

commit:     944a1bda9e2a0614e3a176588bb57477813e43dd
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 26 22:16:40 2021 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Jun 26 22:23:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=944a1bda

sys-firmware/edk2-ovmf: version bump to 202105

Bug: https://bugs.gentoo.org/797703
Bug: https://bugs.gentoo.org/797232
Bug: https://bugs.gentoo.org/798777
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sys-firmware/edk2-ovmf/Manifest                |   3 +
 sys-firmware/edk2-ovmf/edk2-ovmf-202105.ebuild | 173 +++++++++++++++++++++++++
 2 files changed, 176 insertions(+)

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index bec7f6b201f..cabce2d6cd2 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -5,4 +5,7 @@ DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de26915
 DIST edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560ed9f729d728f1dee3806814b1eb8d89dabc4fd70433f7f77656b65d9af7919d036074a53a95190a1aa8b65ab7d73495ffc SHA512 d0c8b249a7a2124e8bb63a4358466e86a3a837e76586565dd4762351998d8561374eabb8a1303dbf71ac269c15552d9e8cff71d65bc6fe8a3a81fb4fb032e0d8
 DIST edk2-ovmf-202008-qemu-firmware.tar.xz 680 BLAKE2B 176f8e94a3f605acc72850634cbf155619490f5998125521a392a8e9c7d2b78841b841f0cb5ea860f14645b124cf1921256bbe46960efbe3401805d89bbfbed6 SHA512 b72f248ab4d49503c3e8e686e22beb77f0e48d2c6c9523f389f20504e0c30fa11fa0fcb5607d7d5bb1ba2433894fa458864c5761335e39de4b2a40b01203f043
 DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666
+DIST edk2-ovmf-202105-bin.tar.xz 2573424 BLAKE2B f6b80bbd756287ec1f8f581e977eeacf06ba9b2cd2ea917a1824ce94d23f1a3c5034de2044f52e1d83a48d2bf8e2389bbad93cbf0c779d2cc880fbfd9c147867 SHA512 384e3324fb2483f378d79bddc3c43381e5c5fde662566f3c406dbaaa78185526894552b79246087d7fe1f89ae6a47d033cdbbe8ec4e1109a801f1b5085e24aeb
+DIST edk2-ovmf-202105-qemu-firmware.tar.xz 672 BLAKE2B e87845a84c83f65db836fd054c81a4f3062d5e0fcc51aa0ecf9c2d23c8741f218d38ef737d140f5935ce8d9c34508e5f3b9f54bf9c547a391fa63cdc2ecf1233 SHA512 6100502f26db26e407dacce57c96b1abfd372bcb31767a068332afa09ac435a092fd2a73db27670d27c6e927c26e88315346bbac70578571108434b9683bd00c
+DIST edk2-ovmf-202105.tar.gz 13702868 BLAKE2B 3ec01d467562380ca2fd3bd807d2f6c55e4637c1afd71533f8f5b22cc634dc4c8cb63dab921677f8b315d17b3c9d0b6b00a0e2f3f8da61107033e9e81bf5a64d SHA512 c263345cbb243c63985f974a61f37c577a139d6a7099d2b8c9e1a553e5ebf16de12fb711b72624081c6bf637f8084bbf71731ab99e5747d81da460388ac25791
 DIST openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz 9981169 BLAKE2B 33aac7364cdd45fec5654ab6caef84e1a829464380419c8a6bb311055c5a01c0aaff6e046a7c541a87e908fa9d26bae652f5be901461d03df36f2522f9c34b0c SHA512 db2087c04f0b428b3f4e1c8b3ac53cce69e0fd331ed2b86ba00facafd1685864d73f71c13eee48f4fe0af2bddad848f84a2b8ed2a17fabdf7fa2ed7d9eb39371

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105.ebuild
new file mode 100644
index 00000000000..e21a2c3a95d
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+BUNDLED_OPENSSL_SUBMODULE_SHA="e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72"
+BUNDLED_BROTLI_SUBMODULE_SHA="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+
+# TODO: talk with tamiko about unbundling (mva)
+
+# TODO: the binary 202105 package currently lacks the preseeded
+#       OVMF_VARS.secboot.fd file (that we typically get from fedora)
+
+SRC_URI="
+	!binary? (
+		https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz
+		https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
+	)
+	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
+	https://dev.gentoo.org/~tamiko/distfiles/${P}-qemu-firmware.tar.xz
+"
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="+binary"
+REQUIRED_USE+="
+	!amd64? ( binary )
+"
+
+NON_BINARY_DEPEND="
+	app-emulation/qemu
+	>=dev-lang/nasm-2.0.7
+	>=sys-power/iasl-20160729
+	${PYTHON_DEPS}
+"
+
+DEPEND+="
+	!binary? (
+		amd64? (
+			${NON_BINARY_DEPEND}
+		)
+	)"
+RDEPEND=""
+
+PATCHES=(
+)
+
+S="${WORKDIR}/edk2-edk2-stable${PV}"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+	/usr/share/edk2-ovmf/OVMF_CODE.fd
+	/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)
+or creating OVMF_VARS.secboot.fd by hand:
+	https://github.com/puiterwijk/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
+one for yourself. Firmware blobs are commonly labeled
+	OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+	$ qemu-system-x86_64 \
+		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+		..."
+
+pkg_setup() {
+	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use binary; then
+		eapply_user
+	else
+		# Bundled submodules
+		cp -rl "${WORKDIR}/openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}"/* "CryptoPkg/Library/OpensslLib/openssl/"
+		cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "BaseTools/Source/C/BrotliCompress/brotli/"
+		cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/"
+
+		sed -i -r \
+			-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
+			"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+
+		default
+	fi
+}
+
+src_compile() {
+	TARGET_ARCH=X64
+	TARGET_NAME=RELEASE
+	TARGET_TOOLS=GCC49
+
+	BUILD_FLAGS="-D TLS_ENABLE \
+		-D HTTP_BOOT_ENABLE \
+		-D NETWORK_IP6_ENABLE \
+		-D FD_SIZE_2MB"
+
+	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
+		-D SECURE_BOOT_ENABLE \
+		-D SMM_REQUIRE \
+		-D EXCLUDE_SHELL_FROM_FD"
+
+	[[ ${PV} != "999999" ]] && use binary && return
+
+	emake ARCH=${TARGET_ARCH} -C BaseTools
+
+	. ./edksetup.sh
+
+	# Build all EFI firmware blobs:
+
+	mkdir -p ovmf
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
+	rm -rf Build/OvmfX64
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
+	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
+	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
+
+	# Build a convenience UefiShell.img:
+
+	mkdir -p iso_image/efi/boot || die "mkdir failed"
+	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
+	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
+	qemu-img convert --image-opts \
+		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
+		ovmf/UefiShell.img || die "qemu-img failed"
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins ovmf/*
+
+	insinto /usr/share/qemu/firmware
+	doins qemu/*
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2021-06-27  7:52 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2021-06-27  7:52 UTC (permalink / raw
  To: gentoo-commits

commit:     7ece9892529e7690a1c763a4ab7f33046bc069ae
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 27 07:10:30 2021 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jun 27 07:52:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ece9892

sys-firmware/edk2-ovmf: enable tpm2 support

Bug: https://bugs.gentoo.org/798777
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sys-firmware/edk2-ovmf/Manifest                                       | 2 +-
 .../edk2-ovmf/{edk2-ovmf-202105.ebuild => edk2-ovmf-202105-r1.ebuild} | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index cabce2d6cd2..7f818651cef 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -5,7 +5,7 @@ DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de26915
 DIST edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560ed9f729d728f1dee3806814b1eb8d89dabc4fd70433f7f77656b65d9af7919d036074a53a95190a1aa8b65ab7d73495ffc SHA512 d0c8b249a7a2124e8bb63a4358466e86a3a837e76586565dd4762351998d8561374eabb8a1303dbf71ac269c15552d9e8cff71d65bc6fe8a3a81fb4fb032e0d8
 DIST edk2-ovmf-202008-qemu-firmware.tar.xz 680 BLAKE2B 176f8e94a3f605acc72850634cbf155619490f5998125521a392a8e9c7d2b78841b841f0cb5ea860f14645b124cf1921256bbe46960efbe3401805d89bbfbed6 SHA512 b72f248ab4d49503c3e8e686e22beb77f0e48d2c6c9523f389f20504e0c30fa11fa0fcb5607d7d5bb1ba2433894fa458864c5761335e39de4b2a40b01203f043
 DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666
-DIST edk2-ovmf-202105-bin.tar.xz 2573424 BLAKE2B f6b80bbd756287ec1f8f581e977eeacf06ba9b2cd2ea917a1824ce94d23f1a3c5034de2044f52e1d83a48d2bf8e2389bbad93cbf0c779d2cc880fbfd9c147867 SHA512 384e3324fb2483f378d79bddc3c43381e5c5fde662566f3c406dbaaa78185526894552b79246087d7fe1f89ae6a47d033cdbbe8ec4e1109a801f1b5085e24aeb
 DIST edk2-ovmf-202105-qemu-firmware.tar.xz 672 BLAKE2B e87845a84c83f65db836fd054c81a4f3062d5e0fcc51aa0ecf9c2d23c8741f218d38ef737d140f5935ce8d9c34508e5f3b9f54bf9c547a391fa63cdc2ecf1233 SHA512 6100502f26db26e407dacce57c96b1abfd372bcb31767a068332afa09ac435a092fd2a73db27670d27c6e927c26e88315346bbac70578571108434b9683bd00c
+DIST edk2-ovmf-202105-r1-bin.tar.xz 2633188 BLAKE2B 93b4bd1c75da69406b5d27ac32d8b7c63dc8248bcd5d54832e520a4b009be4b7f215eb7d489ecb7cb16d31e02452dfa06b8fa709f37c44e59b4ff70a550076c7 SHA512 356c2110abce43da9c0654324e222cbbab7085e3aa23d1ba4c98011e4d4992a37d61fa45394305b748d119dba12f65d7c7d630b9f8038065ba4672d758c702be
 DIST edk2-ovmf-202105.tar.gz 13702868 BLAKE2B 3ec01d467562380ca2fd3bd807d2f6c55e4637c1afd71533f8f5b22cc634dc4c8cb63dab921677f8b315d17b3c9d0b6b00a0e2f3f8da61107033e9e81bf5a64d SHA512 c263345cbb243c63985f974a61f37c577a139d6a7099d2b8c9e1a553e5ebf16de12fb711b72624081c6bf637f8084bbf71731ab99e5747d81da460388ac25791
 DIST openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz 9981169 BLAKE2B 33aac7364cdd45fec5654ab6caef84e1a829464380419c8a6bb311055c5a01c0aaff6e046a7c541a87e908fa9d26bae652f5be901461d03df36f2522f9c34b0c SHA512 db2087c04f0b428b3f4e1c8b3ac53cce69e0fd331ed2b86ba00facafd1685864d73f71c13eee48f4fe0af2bddad848f84a2b8ed2a17fabdf7fa2ed7d9eb39371

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
similarity index 97%
rename from sys-firmware/edk2-ovmf/edk2-ovmf-202105.ebuild
rename to sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
index e21a2c3a95d..11376aff5d4 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202105.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 		https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz
 		https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
 	)
-	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
+	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${PF}-bin.tar.xz )
 	https://dev.gentoo.org/~tamiko/distfiles/${P}-qemu-firmware.tar.xz
 "
 
@@ -116,6 +116,8 @@ src_compile() {
 	BUILD_FLAGS="-D TLS_ENABLE \
 		-D HTTP_BOOT_ENABLE \
 		-D NETWORK_IP6_ENABLE \
+		-D TPM_ENABLE \
+		-D TPM2_ENABLE -D TPM2_CONFIG_ENABLE \
 		-D FD_SIZE_2MB"
 
 	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2021-06-27  7:52 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2021-06-27  7:52 UTC (permalink / raw
  To: gentoo-commits

commit:     0479093a2655a6f7c2cf2feca458f7dc7b8f1866
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 27 07:46:56 2021 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jun 27 07:52:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0479093a

sys-firmware/edk2-ovmf: drop vulnerable

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sys-firmware/edk2-ovmf/Manifest                |   3 -
 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 170 -------------------------
 2 files changed, 173 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index 7f818651cef..82d355e9d92 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,7 +1,4 @@
 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
-DIST edk2-ovmf-201905-bin.tar.xz 3017256 BLAKE2B 6a106f111a363f1c2de33c4e7eba48183da6047654512939c286c6d0369e3b4c7705c271e61fa95299ba2b629022be7b5ef665ff096d41373583f5409b5c32fb SHA512 4a174dc1d64769a93de3bf5f9d787e278bfab57e2317699d722aa772e64e8867b3998b7feee58d5e4c66adc79ba9c5023dae2ce786159db7a740b86cf35d923d
-DIST edk2-ovmf-201905-bundled.tar.xz 3538508 BLAKE2B a1766180c84ee83987f50fdb6a6c9891dfb983ff78c98f7bc38635ffe484ebf29d4286ff97d7747080e28a655ff14b5939d4505d75ebe6655ecacc7f9d405469 SHA512 be3d8ef1ffb1ddce64883d9ef8dc598c7026d23d2e33c33949d28de81513b6a7f04f840ccb3d42664e918c6603487fbe594261c327921f3250c3998218572774
-DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de2691524e55c96d8a0e85aab1385a9abddc47c13ce3236b952c1299514e542ad0fa4bc9550cc4527945c05109d227a698293 SHA512 91188923f7d1ab83c0d6abf7ec6d59f357d0341a617ad6a3ae05f3d0e041dff43f62b014b0c5fc5d15e16d8f1c279c581a5cd64b31e3d52b340d7ef90adb50f1
 DIST edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560ed9f729d728f1dee3806814b1eb8d89dabc4fd70433f7f77656b65d9af7919d036074a53a95190a1aa8b65ab7d73495ffc SHA512 d0c8b249a7a2124e8bb63a4358466e86a3a837e76586565dd4762351998d8561374eabb8a1303dbf71ac269c15552d9e8cff71d65bc6fe8a3a81fb4fb032e0d8
 DIST edk2-ovmf-202008-qemu-firmware.tar.xz 680 BLAKE2B 176f8e94a3f605acc72850634cbf155619490f5998125521a392a8e9c7d2b78841b841f0cb5ea860f14645b124cf1921256bbe46960efbe3401805d89bbfbed6 SHA512 b72f248ab4d49503c3e8e686e22beb77f0e48d2c6c9523f389f20504e0c30fa11fa0fcb5607d7d5bb1ba2433894fa458864c5761335e39de4b2a40b01203f043
 DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
deleted file mode 100644
index 845ce19c2db..00000000000
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
-HOMEPAGE="https://github.com/tianocore/edk2"
-
-NON_BINARY_DEPEND="
-	app-emulation/qemu
-	>=dev-lang/nasm-2.0.7
-	>=sys-power/iasl-20160729
-	${PYTHON_DEPS}
-"
-DEPEND=""
-RDEPEND=""
-if [[ ${PV} == "999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tianocore/edk2"
-	DEPEND+="
-		${NON_BINARY_DEPEND}
-	"
-else
-	# Binary versions taken from fedora:
-	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
-	#   edk2-ovmf-20190501stable-2.fc31.noarch.rpm
-	SRC_URI="
-		!binary? (
-			https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
-			https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.xz
-		)
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
-		"
-	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-	IUSE="+binary"
-	REQUIRED_USE+="
-		!amd64? ( binary )
-	"
-	DEPEND+="
-		!binary? (
-			amd64? (
-				${NON_BINARY_DEPEND}
-			)
-		)"
-	PATCHES=(
-	)
-fi
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-
-S="${WORKDIR}/edk2-edk2-stable${PV}"
-
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
-virtual machines. The firmware is located under
-	/usr/share/edk2-ovmf/OVMF_CODE.fd
-	/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)
-or creating OVMF_VARS.secboot.fd by hand:
-	https://github.com/puiterwijk/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
-one for yourself. Firmware blobs are commonly labeled
-	OVMF{,_CODE,_VARS}-with-csm.fd
-
-In order to use the firmware you can run qemu the following way
-
-	$ qemu-system-x86_64 \
-		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
-		...
-
-You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
-	nvram = [
-		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-		\"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-	]"
-
-pkg_setup() {
-	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use binary; then
-		sed -i -r \
-			-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
-			"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
-	fi
-	if  [[ ${PV} != "999999" ]] && use binary; then
-		eapply_user
-		return
-	fi
-	default
-}
-
-src_compile() {
-	TARGET_ARCH=X64
-	TARGET_NAME=RELEASE
-	TARGET_TOOLS=GCC49
-
-	BUILD_FLAGS="-D TLS_ENABLE \
-		-D HTTP_BOOT_ENABLE \
-		-D NETWORK_IP6_ENABLE \
-		-D FD_SIZE_2MB"
-
-	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
-		-D SECURE_BOOT_ENABLE \
-		-D SMM_REQUIRE \
-		-D EXCLUDE_SHELL_FROM_FD"
-
-	[[ ${PV} != "999999" ]] && use binary && return
-
-	emake ARCH=${TARGET_ARCH} -C BaseTools
-
-	. ./edksetup.sh
-
-	# Build all EFI firmware blobs:
-
-	mkdir -p ovmf
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
-
-	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
-	rm -rf Build/OvmfX64
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
-
-	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
-	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
-	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
-
-	# Build a convenience UefiShell.img:
-
-	mkdir -p iso_image/efi/boot || die "mkdir failed"
-	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
-	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
-	qemu-img convert --image-opts \
-		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
-		ovmf/UefiShell.img || die "qemu-img failed"
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins ovmf/*
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2021-10-07  6:02 Agostino Sarubbo
  0 siblings, 0 replies; 56+ messages in thread
From: Agostino Sarubbo @ 2021-10-07  6:02 UTC (permalink / raw
  To: gentoo-commits

commit:     f41aaf20a899a634fa4caa2fd396c2f3855a3f36
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  7 06:02:09 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Oct  7 06:02:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f41aaf20

sys-firmware/edk2-ovmf: amd64 stable wrt bug #814122

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
index f2f2b9a2597..ed3ef70ba34 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
@@ -31,7 +31,7 @@ SRC_URI="
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
 
 IUSE="+binary"
 REQUIRED_USE+="


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2021-10-07 19:44 Sam James
  0 siblings, 0 replies; 56+ messages in thread
From: Sam James @ 2021-10-07 19:44 UTC (permalink / raw
  To: gentoo-commits

commit:     e08f015c758891b1efd0ffd742754e8603c11c64
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  7 19:44:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct  7 19:44:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e08f015c

sys-firmware/edk2-ovmf: Stabilize 202105-r1 arm64, #814122

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
index ed3ef70ba34..917d072a459 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
@@ -31,7 +31,7 @@ SRC_URI="
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~x86"
 
 IUSE="+binary"
 REQUIRED_USE+="


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2021-10-08  1:57 Sam James
  0 siblings, 0 replies; 56+ messages in thread
From: Sam James @ 2021-10-08  1:57 UTC (permalink / raw
  To: gentoo-commits

commit:     a4b80143c2ac2f8d99947f02454e1f0460238248
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  8 01:57:10 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct  8 01:57:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4b80143

sys-firmware/edk2-ovmf: Stabilize 202105-r1 ppc64, #814122

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
index 917d072a459..b0d84f7d324 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
@@ -31,7 +31,7 @@ SRC_URI="
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc ppc64 ~x86"
 
 IUSE="+binary"
 REQUIRED_USE+="


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2021-10-08 18:49 Agostino Sarubbo
  0 siblings, 0 replies; 56+ messages in thread
From: Agostino Sarubbo @ 2021-10-08 18:49 UTC (permalink / raw
  To: gentoo-commits

commit:     268d4db4e9103dbf00c79d0baf195d503ba184bb
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  8 18:49:42 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Oct  8 18:49:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=268d4db4

sys-firmware/edk2-ovmf: x86 stable wrt bug #814122

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
index b0d84f7d324..c316a3faf1b 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
@@ -31,7 +31,7 @@ SRC_URI="
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 
 IUSE="+binary"
 REQUIRED_USE+="


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2022-01-04  0:02 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2022-01-04  0:02 UTC (permalink / raw
  To: gentoo-commits

commit:     9e44e430b7bf879f821301b93fa5006e9d625097
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  4 00:01:49 2022 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jan  4 00:02:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e44e430

sys-firmware/edk2-ovmf: workaround: do not install broken qemu config

As a temporary workaround do not install

  /usr/share/qemu/firmware/40-edk2-ovmf-x64-sb-enrolled.json

We are currently not shipping the necessary OVMF_VARS.secboot.fd file

Bug: https://bugs.gentoo.org/830006
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --force
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild | 177 ++++++++++++++++++++++
 1 file changed, 177 insertions(+)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
new file mode 100644
index 000000000000..238999b462bb
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+BUNDLED_OPENSSL_SUBMODULE_SHA="e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72"
+BUNDLED_BROTLI_SUBMODULE_SHA="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+
+# TODO: talk with tamiko about unbundling (mva)
+
+# TODO: the binary 202105 package currently lacks the preseeded
+#       OVMF_VARS.secboot.fd file (that we typically get from fedora)
+
+SRC_URI="
+	!binary? (
+		https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz
+		https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
+	)
+	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-r1-bin.tar.xz )
+	https://dev.gentoo.org/~tamiko/distfiles/${P}-qemu-firmware.tar.xz
+"
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
+
+IUSE="+binary"
+REQUIRED_USE+="
+	!amd64? ( binary )
+"
+
+NON_BINARY_DEPEND="
+	app-emulation/qemu
+	>=dev-lang/nasm-2.0.7
+	>=sys-power/iasl-20160729
+	${PYTHON_DEPS}
+"
+
+DEPEND+="
+	!binary? (
+		amd64? (
+			${NON_BINARY_DEPEND}
+		)
+	)"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${PN}-202105-werror.patch"
+)
+
+S="${WORKDIR}/edk2-edk2-stable${PV}"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+	/usr/share/edk2-ovmf/OVMF_CODE.fd
+	/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)
+or creating OVMF_VARS.secboot.fd by hand:
+	https://github.com/puiterwijk/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
+one for yourself. Firmware blobs are commonly labeled
+	OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+	$ qemu-system-x86_64 \
+		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+		..."
+
+pkg_setup() {
+	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use binary; then
+		eapply_user
+	else
+		# Bundled submodules
+		cp -rl "${WORKDIR}/openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}"/* "CryptoPkg/Library/OpensslLib/openssl/"
+		cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "BaseTools/Source/C/BrotliCompress/brotli/"
+		cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/"
+
+		sed -i -r \
+			-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
+			"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+
+		default
+	fi
+}
+
+src_compile() {
+	TARGET_ARCH=X64
+	TARGET_NAME=RELEASE
+	TARGET_TOOLS=GCC49
+
+	BUILD_FLAGS="-D TLS_ENABLE \
+		-D HTTP_BOOT_ENABLE \
+		-D NETWORK_IP6_ENABLE \
+		-D TPM_ENABLE \
+		-D TPM2_ENABLE -D TPM2_CONFIG_ENABLE \
+		-D FD_SIZE_2MB"
+
+	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
+		-D SECURE_BOOT_ENABLE \
+		-D SMM_REQUIRE \
+		-D EXCLUDE_SHELL_FROM_FD"
+
+	[[ ${PV} != "999999" ]] && use binary && return
+
+	emake ARCH=${TARGET_ARCH} -C BaseTools
+
+	. ./edksetup.sh
+
+	# Build all EFI firmware blobs:
+
+	mkdir -p ovmf
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
+	rm -rf Build/OvmfX64
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
+	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
+	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
+
+	# Build a convenience UefiShell.img:
+
+	mkdir -p iso_image/efi/boot || die "mkdir failed"
+	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
+	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
+	qemu-img convert --image-opts \
+		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
+		ovmf/UefiShell.img || die "qemu-img failed"
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins ovmf/*
+
+	insinto /usr/share/qemu/firmware
+	doins qemu/*
+	rm "${ED}"/usr/share/qemu/firmware/40-edk2-ovmf-x64-sb-enrolled.json || die "rm failed"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2022-01-04  0:02 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2022-01-04  0:02 UTC (permalink / raw
  To: gentoo-commits

commit:     dee51fb9e273c98d521b6d7083030f89d8c13ad5
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  3 23:51:34 2022 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jan  4 00:02:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dee51fb9

sys-firmware/edk2-ovmf: clean up vulnerable

Bug: https://bugs.gentoo.org/797232
Bug: https://bugs.gentoo.org/797703
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sys-firmware/edk2-ovmf/Manifest                |   3 -
 sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild | 186 -------------------------
 2 files changed, 189 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index 82d355e9d92e..109f312f8e6e 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,7 +1,4 @@
 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
-DIST edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560ed9f729d728f1dee3806814b1eb8d89dabc4fd70433f7f77656b65d9af7919d036074a53a95190a1aa8b65ab7d73495ffc SHA512 d0c8b249a7a2124e8bb63a4358466e86a3a837e76586565dd4762351998d8561374eabb8a1303dbf71ac269c15552d9e8cff71d65bc6fe8a3a81fb4fb032e0d8
-DIST edk2-ovmf-202008-qemu-firmware.tar.xz 680 BLAKE2B 176f8e94a3f605acc72850634cbf155619490f5998125521a392a8e9c7d2b78841b841f0cb5ea860f14645b124cf1921256bbe46960efbe3401805d89bbfbed6 SHA512 b72f248ab4d49503c3e8e686e22beb77f0e48d2c6c9523f389f20504e0c30fa11fa0fcb5607d7d5bb1ba2433894fa458864c5761335e39de4b2a40b01203f043
-DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666
 DIST edk2-ovmf-202105-qemu-firmware.tar.xz 672 BLAKE2B e87845a84c83f65db836fd054c81a4f3062d5e0fcc51aa0ecf9c2d23c8741f218d38ef737d140f5935ce8d9c34508e5f3b9f54bf9c547a391fa63cdc2ecf1233 SHA512 6100502f26db26e407dacce57c96b1abfd372bcb31767a068332afa09ac435a092fd2a73db27670d27c6e927c26e88315346bbac70578571108434b9683bd00c
 DIST edk2-ovmf-202105-r1-bin.tar.xz 2633188 BLAKE2B 93b4bd1c75da69406b5d27ac32d8b7c63dc8248bcd5d54832e520a4b009be4b7f215eb7d489ecb7cb16d31e02452dfa06b8fa709f37c44e59b4ff70a550076c7 SHA512 356c2110abce43da9c0654324e222cbbab7085e3aa23d1ba4c98011e4d4992a37d61fa45394305b748d119dba12f65d7c7d630b9f8038065ba4672d758c702be
 DIST edk2-ovmf-202105.tar.gz 13702868 BLAKE2B 3ec01d467562380ca2fd3bd807d2f6c55e4637c1afd71533f8f5b22cc634dc4c8cb63dab921677f8b315d17b3c9d0b6b00a0e2f3f8da61107033e9e81bf5a64d SHA512 c263345cbb243c63985f974a61f37c577a139d6a7099d2b8c9e1a553e5ebf16de12fb711b72624081c6bf637f8084bbf71731ab99e5747d81da460388ac25791

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
deleted file mode 100644
index c02cae3b5fcf..000000000000
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
-HOMEPAGE="https://github.com/tianocore/edk2"
-
-NON_BINARY_DEPEND="
-	app-emulation/qemu
-	>=dev-lang/nasm-2.0.7
-	>=sys-power/iasl-20160729
-	${PYTHON_DEPS}
-"
-DEPEND=""
-RDEPEND=""
-if [[ ${PV} == "999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tianocore/edk2"
-	DEPEND+="
-		${NON_BINARY_DEPEND}
-	"
-else
-	BUNDLED_OPENSSL_SUBMODULE_SHA="e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72"
-	BUNDLED_BROTLI_SUBMODULE_SHA="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
-	# Binary versions taken from fedora:
-	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/e/
-	#   edk2-ovmf-20200801stable-1.fc34.noarch.rpm
-
-	# TODO: talk with tamiko about unbundling
-	SRC_URI="
-		!binary? (
-			https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
-			https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz
-			https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
-		)
-		binary? ( https://dev.gentoo.org/~mva/distfiles/${P}-bin.tar.xz )
-		https://dev.gentoo.org/~mva/distfiles/${P}-qemu-firmware.tar.xz
-	"
-	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-	IUSE="+binary"
-	REQUIRED_USE+="
-		!amd64? ( binary )
-	"
-	DEPEND+="
-		!binary? (
-			amd64? (
-				${NON_BINARY_DEPEND}
-			)
-		)"
-	PATCHES=(
-	)
-fi
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-
-S="${WORKDIR}/edk2-edk2-stable${PV}"
-
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
-virtual machines. The firmware is located under
-	/usr/share/edk2-ovmf/OVMF_CODE.fd
-	/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)
-or creating OVMF_VARS.secboot.fd by hand:
-	https://github.com/puiterwijk/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
-one for yourself. Firmware blobs are commonly labeled
-	OVMF{,_CODE,_VARS}-with-csm.fd
-
-In order to use the firmware you can run qemu the following way
-
-	$ qemu-system-x86_64 \
-		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
-		...
-
-You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
-	nvram = [
-		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-		\"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-	]"
-
-pkg_setup() {
-	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use binary; then
-		sed -i -r \
-			-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
-			"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
-	fi
-	if  [[ ${PV} != "999999" ]]; then
-		if use binary; then
-			eapply_user
-			return
-		else
-			# Bundled submodules
-			cp -rl "${WORKDIR}/openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}"/* "CryptoPkg/Library/OpensslLib/openssl/"
-			cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "BaseTools/Source/C/BrotliCompress/brotli/"
-			cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/"
-		fi
-	fi
-	default
-}
-
-src_compile() {
-	TARGET_ARCH=X64
-	TARGET_NAME=RELEASE
-	TARGET_TOOLS=GCC49
-
-	BUILD_FLAGS="-D TLS_ENABLE \
-		-D HTTP_BOOT_ENABLE \
-		-D NETWORK_IP6_ENABLE \
-		-D FD_SIZE_2MB"
-
-	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
-		-D SECURE_BOOT_ENABLE \
-		-D SMM_REQUIRE \
-		-D EXCLUDE_SHELL_FROM_FD"
-
-	[[ ${PV} != "999999" ]] && use binary && return
-
-	emake ARCH=${TARGET_ARCH} -C BaseTools
-
-	. ./edksetup.sh
-
-	# Build all EFI firmware blobs:
-
-	mkdir -p ovmf
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
-
-	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
-	rm -rf Build/OvmfX64
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
-
-	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
-	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
-	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
-
-	# Build a convenience UefiShell.img:
-
-	mkdir -p iso_image/efi/boot || die "mkdir failed"
-	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
-	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
-	qemu-img convert --image-opts \
-		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
-		ovmf/UefiShell.img || die "qemu-img failed"
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins ovmf/*
-
-	insinto /usr/share/qemu/firmware
-	doins qemu/*
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2022-01-23  8:05 Yixun Lan
  0 siblings, 0 replies; 56+ messages in thread
From: Yixun Lan @ 2022-01-23  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     067464eba6201ffe57c85ef2ccceceb77609fc41
Author:     Yongxiang Liang <tanekliang <AT> gmail <DOT> com>
AuthorDate: Sun Jan  9 11:54:50 2022 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 08:04:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=067464eb

sys-firmware/edk2-ovmf: keyword ~riscv

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yongxiang Liang <tanekliang <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
index 238999b462bb..607d4541d1ed 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
@@ -31,7 +31,7 @@ SRC_URI="
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc ppc64 ~riscv x86"
 
 IUSE="+binary"
 REQUIRED_USE+="


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2022-05-19 12:19 WANG Xuerui
  0 siblings, 0 replies; 56+ messages in thread
From: WANG Xuerui @ 2022-05-19 12:19 UTC (permalink / raw
  To: gentoo-commits

commit:     676ffd3433d9293e53b14dced8a31a19f4b2b5d1
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 11:45:53 2022 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Thu May 19 12:18:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=676ffd34

sys-firmware/edk2-ovmf: keyword 202105-r2 for ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
index 607d4541d1ed..71e566bf0065 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
@@ -31,7 +31,7 @@ SRC_URI="
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 IUSE="+binary"
 REQUIRED_USE+="


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2022-09-06 22:39 John Helmert III
  0 siblings, 0 replies; 56+ messages in thread
From: John Helmert III @ 2022-09-06 22:39 UTC (permalink / raw
  To: gentoo-commits

commit:     818d43400b786c49c3806d7d6e838afd6580b937
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  7 01:04:06 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue Sep  6 22:38:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=818d4340

sys-firmware/edk2-ovmf: add 202202

Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 sys-firmware/edk2-ovmf/Manifest                |   4 +
 sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild | 148 +++++++++++++++++++++++++
 2 files changed, 152 insertions(+)

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index 109f312f8e6e..91c1fe2e832c 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,5 +1,9 @@
 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
+DIST brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz 512229 BLAKE2B cd86cc2cc7eefad24f87cda8006409bf764922b5f23ccfb951e7a41214b12004ce532b11f94f5fb858b3bf71f9abf8ef17ba219fa96bd5be23b51873afad0fd5 SHA512 7f48e794e738b31c2005e7cef6d8c0cc0d543f1cd8c137ae8ba14602cac2873de6299a3f32ad52be869f513e7548341353ed049609daef1063975694d9a9b80b
 DIST edk2-ovmf-202105-qemu-firmware.tar.xz 672 BLAKE2B e87845a84c83f65db836fd054c81a4f3062d5e0fcc51aa0ecf9c2d23c8741f218d38ef737d140f5935ce8d9c34508e5f3b9f54bf9c547a391fa63cdc2ecf1233 SHA512 6100502f26db26e407dacce57c96b1abfd372bcb31767a068332afa09ac435a092fd2a73db27670d27c6e927c26e88315346bbac70578571108434b9683bd00c
 DIST edk2-ovmf-202105-r1-bin.tar.xz 2633188 BLAKE2B 93b4bd1c75da69406b5d27ac32d8b7c63dc8248bcd5d54832e520a4b009be4b7f215eb7d489ecb7cb16d31e02452dfa06b8fa709f37c44e59b4ff70a550076c7 SHA512 356c2110abce43da9c0654324e222cbbab7085e3aa23d1ba4c98011e4d4992a37d61fa45394305b748d119dba12f65d7c7d630b9f8038065ba4672d758c702be
 DIST edk2-ovmf-202105.tar.gz 13702868 BLAKE2B 3ec01d467562380ca2fd3bd807d2f6c55e4637c1afd71533f8f5b22cc634dc4c8cb63dab921677f8b315d17b3c9d0b6b00a0e2f3f8da61107033e9e81bf5a64d SHA512 c263345cbb243c63985f974a61f37c577a139d6a7099d2b8c9e1a553e5ebf16de12fb711b72624081c6bf637f8084bbf71731ab99e5747d81da460388ac25791
+DIST edk2-ovmf-202202-qemu-firmware.tar.xz 664 BLAKE2B 1aa4e25804ce0f3c967c80999315de24eaef6682e42dddd81c274ce4603ec3d15186de752de49e2527c6bd5517080c002a357ed6bc389b5afd6f7a4d93edeb44 SHA512 f9a29212274a99796784673d873e0eee7d3e2a5cf9e63192453841ee3a4ef4b813c7b2357fc7000f39c71ed6c66636daab772abb51d3972a2a56ade8a4c68faf
+DIST edk2-ovmf-202202.tar.gz 14208170 BLAKE2B d8411e6808b335ccd551349a10c983b9448a357e73273fa6c30a07785e27feffed0224950ee98b668712c33f6739a9b006e5043b7dfd014f48dba9fd449b3354 SHA512 200690a4867331de06e0478869b85577bc510213ebe679f2103160efb84d94c82ac8481ef1f15c3e42c1e9f22b7c5ef0d6c8f2c655bce7702ce843551cf9bb83
+DIST openssl-d82e959e621a3d597f1e0d50ff8c2d8b96915fd7.tar.gz 10034310 BLAKE2B 6996979dc12a523d565830e7b0943feb682a376f71ddb6f20cb8b9976bb7f12e39f088abaa45d514933ef79c0e4a2933dc6f1af4774fedaa16e74c0081c358e7 SHA512 a89bc652dc4318c5e8a9c594a43d890ca05dfc1acd6b15e2a8ab8b5628b5f33994143ff8024230e07b9e67556b28ea3a5e36763aa72dec20b52022ca8c6f2a7e
 DIST openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz 9981169 BLAKE2B 33aac7364cdd45fec5654ab6caef84e1a829464380419c8a6bb311055c5a01c0aaff6e046a7c541a87e908fa9d26bae652f5be901461d03df36f2522f9c34b0c SHA512 db2087c04f0b428b3f4e1c8b3ac53cce69e0fd331ed2b86ba00facafd1685864d73f71c13eee48f4fe0af2bddad848f84a2b8ed2a17fabdf7fa2ed7d9eb39371

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
new file mode 100644
index 000000000000..84319b7c4af0
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+BUNDLED_OPENSSL_SUBMODULE_SHA="d82e959e621a3d597f1e0d50ff8c2d8b96915fd7"
+BUNDLED_BROTLI_SUBMODULE_SHA="f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
+
+# TODO: talk with tamiko about unbundling (mva)
+
+# TODO: the binary 202105 package currently lacks the preseeded
+#       OVMF_VARS.secboot.fd file (that we typically get from fedora)
+
+SRC_URI="https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz
+	https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
+	https://dev.gentoo.org/~ajak/distfiles/${P}-qemu-firmware.tar.xz"
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+#KEYWORDS="~amd64"
+
+BDEPEND="app-emulation/qemu
+	>=dev-lang/nasm-2.0.7
+	>=sys-power/iasl-20160729
+	${PYTHON_DEPS}"
+RDEPEND="!sys-firmware/edk2-ovmf-bin"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-202105-werror.patch"
+)
+
+S="${WORKDIR}/edk2-edk2-stable${PV}"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+	/usr/share/edk2-ovmf/OVMF_CODE.fd
+	/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)
+or creating OVMF_VARS.secboot.fd by hand:
+	https://github.com/puiterwijk/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
+one for yourself. Firmware blobs are commonly labeled
+	OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+	$ qemu-system-x86_64 \
+		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+		..."
+
+src_prepare() {
+	# Bundled submodules
+	cp -rl "${WORKDIR}/openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}"/* "CryptoPkg/Library/OpensslLib/openssl/"
+	cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "BaseTools/Source/C/BrotliCompress/brotli/"
+	cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/"
+
+	sed -i -r \
+		-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
+		"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+
+	default
+}
+
+src_compile() {
+	TARGET_ARCH=X64
+	TARGET_NAME=RELEASE
+	TARGET_TOOLS=GCC49
+
+	BUILD_FLAGS="-D TLS_ENABLE \
+		-D HTTP_BOOT_ENABLE \
+		-D NETWORK_IP6_ENABLE \
+		-D TPM_ENABLE \
+		-D TPM2_ENABLE -D TPM2_CONFIG_ENABLE \
+		-D FD_SIZE_2MB"
+
+	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
+		-D SECURE_BOOT_ENABLE \
+		-D SMM_REQUIRE \
+		-D EXCLUDE_SHELL_FROM_FD"
+
+	emake ARCH=${TARGET_ARCH} -C BaseTools
+
+	. ./edksetup.sh
+
+	# Build all EFI firmware blobs:
+
+	mkdir -p ovmf
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
+	rm -rf Build/OvmfX64
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
+	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
+	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
+
+	# Build a convenience UefiShell.img:
+
+	mkdir -p iso_image/efi/boot || die "mkdir failed"
+	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
+	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
+	qemu-img convert --image-opts \
+		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
+		ovmf/UefiShell.img || die "qemu-img failed"
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins ovmf/*
+
+	insinto /usr/share/qemu/firmware
+	doins qemu/*
+	rm "${ED}"/usr/share/qemu/firmware/40-edk2-ovmf-x64-sb-enrolled.json || die "rm failed"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2022-09-27  3:27 John Helmert III
  0 siblings, 0 replies; 56+ messages in thread
From: John Helmert III @ 2022-09-27  3:27 UTC (permalink / raw
  To: gentoo-commits

commit:     cd6aa3263fb5ad116d2d19f6707432ba18a0e2e8
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 23:03:55 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 03:26:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd6aa326

sys-firmware/edk2-ovmf: keyword 202202 for ~amd64

Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
index 84319b7c4af0..d5a91e931180 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-#KEYWORDS="~amd64"
+KEYWORDS="~amd64"
 
 BDEPEND="app-emulation/qemu
 	>=dev-lang/nasm-2.0.7


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2022-09-27  3:27 John Helmert III
  0 siblings, 0 replies; 56+ messages in thread
From: John Helmert III @ 2022-09-27  3:27 UTC (permalink / raw
  To: gentoo-commits

commit:     4967ddc78df81a8261f213c4c8112a0a1a5389ef
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 01:44:15 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 03:26:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4967ddc7

sys-firmware/edk2-ovmf: enable py3.11

Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild | 2 +-
 sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
index 71e566bf0065..9fbaad4d5e74 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 
 inherit python-any-r1 readme.gentoo-r1
 

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
index d5a91e931180..c0510e2c0862 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 
 inherit python-any-r1 readme.gentoo-r1
 


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2022-09-27  3:27 John Helmert III
  0 siblings, 0 replies; 56+ messages in thread
From: John Helmert III @ 2022-09-27  3:27 UTC (permalink / raw
  To: gentoo-commits

commit:     87be87f70b4393527fb9f4c5f141c0dbb3f24968
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 02:45:28 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 03:26:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87be87f7

sys-firmware/edk2-ovmf: drop 202105-r1

Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild | 176 ----------------------
 1 file changed, 176 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
deleted file mode 100644
index c316a3faf1bd..000000000000
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
-HOMEPAGE="https://github.com/tianocore/edk2"
-
-BUNDLED_OPENSSL_SUBMODULE_SHA="e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72"
-BUNDLED_BROTLI_SUBMODULE_SHA="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
-
-# TODO: talk with tamiko about unbundling (mva)
-
-# TODO: the binary 202105 package currently lacks the preseeded
-#       OVMF_VARS.secboot.fd file (that we typically get from fedora)
-
-SRC_URI="
-	!binary? (
-		https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz
-		https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
-	)
-	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${PF}-bin.tar.xz )
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-qemu-firmware.tar.xz
-"
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-
-IUSE="+binary"
-REQUIRED_USE+="
-	!amd64? ( binary )
-"
-
-NON_BINARY_DEPEND="
-	app-emulation/qemu
-	>=dev-lang/nasm-2.0.7
-	>=sys-power/iasl-20160729
-	${PYTHON_DEPS}
-"
-
-DEPEND+="
-	!binary? (
-		amd64? (
-			${NON_BINARY_DEPEND}
-		)
-	)"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-202105-werror.patch"
-)
-
-S="${WORKDIR}/edk2-edk2-stable${PV}"
-
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
-virtual machines. The firmware is located under
-	/usr/share/edk2-ovmf/OVMF_CODE.fd
-	/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)
-or creating OVMF_VARS.secboot.fd by hand:
-	https://github.com/puiterwijk/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
-one for yourself. Firmware blobs are commonly labeled
-	OVMF{,_CODE,_VARS}-with-csm.fd
-
-In order to use the firmware you can run qemu the following way
-
-	$ qemu-system-x86_64 \
-		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
-		..."
-
-pkg_setup() {
-	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use binary; then
-		eapply_user
-	else
-		# Bundled submodules
-		cp -rl "${WORKDIR}/openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}"/* "CryptoPkg/Library/OpensslLib/openssl/"
-		cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "BaseTools/Source/C/BrotliCompress/brotli/"
-		cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/"
-
-		sed -i -r \
-			-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
-			"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
-
-		default
-	fi
-}
-
-src_compile() {
-	TARGET_ARCH=X64
-	TARGET_NAME=RELEASE
-	TARGET_TOOLS=GCC49
-
-	BUILD_FLAGS="-D TLS_ENABLE \
-		-D HTTP_BOOT_ENABLE \
-		-D NETWORK_IP6_ENABLE \
-		-D TPM_ENABLE \
-		-D TPM2_ENABLE -D TPM2_CONFIG_ENABLE \
-		-D FD_SIZE_2MB"
-
-	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
-		-D SECURE_BOOT_ENABLE \
-		-D SMM_REQUIRE \
-		-D EXCLUDE_SHELL_FROM_FD"
-
-	[[ ${PV} != "999999" ]] && use binary && return
-
-	emake ARCH=${TARGET_ARCH} -C BaseTools
-
-	. ./edksetup.sh
-
-	# Build all EFI firmware blobs:
-
-	mkdir -p ovmf
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
-
-	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
-	rm -rf Build/OvmfX64
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
-
-	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
-	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
-	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
-
-	# Build a convenience UefiShell.img:
-
-	mkdir -p iso_image/efi/boot || die "mkdir failed"
-	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
-	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
-	qemu-img convert --image-opts \
-		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
-		ovmf/UefiShell.img || die "qemu-img failed"
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins ovmf/*
-
-	insinto /usr/share/qemu/firmware
-	doins qemu/*
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2022-12-02 18:50 Arthur Zamarin
  0 siblings, 0 replies; 56+ messages in thread
From: Arthur Zamarin @ 2022-12-02 18:50 UTC (permalink / raw
  To: gentoo-commits

commit:     d2fa5c68f49b2702eb106b5a867d0ca8c3f31988
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 18:49:21 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 18:49:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2fa5c68

sys-firmware/edk2-ovmf: Stabilize 202202 x86, #883695

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
index c0510e2c0862..f4ccd2b6f617 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 x86"
 
 BDEPEND="app-emulation/qemu
 	>=dev-lang/nasm-2.0.7


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2022-12-02 18:50 Arthur Zamarin
  0 siblings, 0 replies; 56+ messages in thread
From: Arthur Zamarin @ 2022-12-02 18:50 UTC (permalink / raw
  To: gentoo-commits

commit:     376724a3f17fd4683f14d9de42d6905a32c56ff1
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 18:50:00 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 18:50:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=376724a3

sys-firmware/edk2-ovmf: Stabilize 202202 arm64, #883695

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
index f4ccd2b6f617..96f0fc28b12d 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 arm64 x86"
 
 BDEPEND="app-emulation/qemu
 	>=dev-lang/nasm-2.0.7


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2022-12-02 19:27 Arthur Zamarin
  0 siblings, 0 replies; 56+ messages in thread
From: Arthur Zamarin @ 2022-12-02 19:27 UTC (permalink / raw
  To: gentoo-commits

commit:     a37cc09da1c636a9a047e8d76d3cb4c6534dff44
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 19:26:58 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 19:26:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a37cc09d

sys-firmware/edk2-ovmf: Stabilize 202202 ppc64, #883695

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
index 96f0fc28b12d..8549d6ec32e2 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm64 x86"
+KEYWORDS="~amd64 arm64 ppc64 x86"
 
 BDEPEND="app-emulation/qemu
 	>=dev-lang/nasm-2.0.7


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2022-12-05 19:48 Arthur Zamarin
  0 siblings, 0 replies; 56+ messages in thread
From: Arthur Zamarin @ 2022-12-05 19:48 UTC (permalink / raw
  To: gentoo-commits

commit:     34fe5640be1c8882b247d81f5e9f3dc4174aef5a
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  5 19:47:38 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Dec  5 19:47:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34fe5640

sys-firmware/edk2-ovmf: Stabilize 202202 amd64, #883695

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
index 8549d6ec32e2..99eba155ebcd 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 BDEPEND="app-emulation/qemu
 	>=dev-lang/nasm-2.0.7


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2022-12-08 22:25 John Helmert III
  0 siblings, 0 replies; 56+ messages in thread
From: John Helmert III @ 2022-12-08 22:25 UTC (permalink / raw
  To: gentoo-commits

commit:     60ee58e8661dafcd39f3ad022920ca78cb3e33c5
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  8 22:23:48 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Thu Dec  8 22:25:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60ee58e8

sys-firmware/edk2-ovmf: unkeyword 202202 for arm64, ppc64, x86

Closes: https://bugs.gentoo.org/884877
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
index 99eba155ebcd..54276d2ef91a 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64"
 
 BDEPEND="app-emulation/qemu
 	>=dev-lang/nasm-2.0.7


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2023-08-17  7:49 Andrew Ammerlaan
  0 siblings, 0 replies; 56+ messages in thread
From: Andrew Ammerlaan @ 2023-08-17  7:49 UTC (permalink / raw
  To: gentoo-commits

commit:     39f892b24fbfb92a75f0f40dbb95736c82273b92
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 12 07:57:48 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 07:48:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39f892b2

sys-firmware/edk2-ovmf: use secureboot.eclass to sign efi exec

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild | 5 ++++-
 sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild    | 9 ++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
index 889f4431214d..e7b13c536c1f 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{9,10,11} )
 
-inherit python-any-r1 readme.gentoo-r1
+inherit python-any-r1 readme.gentoo-r1 secureboot
 
 DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
 HOMEPAGE="https://github.com/tianocore/edk2"
@@ -90,6 +90,7 @@ In order to use the firmware you can run qemu the following way
 
 pkg_setup() {
 	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
+	secureboot_pkg_setup
 }
 
 src_prepare() {
@@ -169,6 +170,8 @@ src_install() {
 	doins qemu/*
 	rm "${ED}"/usr/share/qemu/firmware/40-edk2-ovmf-x64-sb-enrolled.json || die "rm failed"
 
+	secureboot_auto_sign --in-place
+
 	readme.gentoo_create_doc
 }
 

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
index 0a1469b2cbc9..322c5a16bc5d 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{9,10,11} )
 
-inherit python-any-r1 readme.gentoo-r1
+inherit python-any-r1 readme.gentoo-r1 secureboot
 
 DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
 HOMEPAGE="https://github.com/tianocore/edk2"
@@ -69,6 +69,11 @@ In order to use the firmware you can run qemu the following way
 		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
 		..."
 
+pkg_setup() {
+	python-any-r1_pkg_setup
+	secureboot_pkg_setup
+}
+
 src_prepare() {
 	# Bundled submodules
 	cp -rl "${WORKDIR}/openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}"/* "CryptoPkg/Library/OpensslLib/openssl/"
@@ -140,6 +145,8 @@ src_install() {
 	doins qemu/*
 	rm "${ED}"/usr/share/qemu/firmware/40-edk2-ovmf-x64-sb-enrolled.json || die "rm failed"
 
+	secureboot_auto_sign --in-place
+
 	readme.gentoo_create_doc
 }
 


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2023-08-28 19:10 Sam James
  0 siblings, 0 replies; 56+ messages in thread
From: Sam James @ 2023-08-28 19:10 UTC (permalink / raw
  To: gentoo-commits

commit:     af0b66dd67b550770ea828bb359631ab7b880dc8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 19:09:47 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 19:09:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af0b66dd

sys-firmware/edk2-ovmf: add github upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-firmware/edk2-ovmf/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-firmware/edk2-ovmf/metadata.xml b/sys-firmware/edk2-ovmf/metadata.xml
index 26afde23af57..eda06b3e2ed0 100644
--- a/sys-firmware/edk2-ovmf/metadata.xml
+++ b/sys-firmware/edk2-ovmf/metadata.xml
@@ -12,4 +12,7 @@
 <use>
 	<flag name="binary">Use pre-built binaries</flag>
 </use>
+<upstream>
+	<remote-id type="github">tianocore/edk2</remote-id>
+</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2023-08-28 19:32 Sam James
  0 siblings, 0 replies; 56+ messages in thread
From: Sam James @ 2023-08-28 19:32 UTC (permalink / raw
  To: gentoo-commits

commit:     de0ff7e01c68e74ac7ebfbde6f17059c20864c97
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 19:10:33 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 19:32:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0ff7e0

sys-firmware/edk2-ovmf: disable py3.9

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild | 2 +-
 sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
index e7b13c536c1f..77b264824aeb 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit python-any-r1 readme.gentoo-r1 secureboot
 

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
index 04de01f008bb..43332ccb0057 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit python-any-r1 readme.gentoo-r1 secureboot
 


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2024-07-03 21:08 Matthias Maier
  0 siblings, 0 replies; 56+ messages in thread
From: Matthias Maier @ 2024-07-03 21:08 UTC (permalink / raw
  To: gentoo-commits

commit:     756da03e804cbdc05c126debacd9c0a94fa43821
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  3 21:06:08 2024 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed Jul  3 21:06:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=756da03e

sys-firmware/edk2-ovmf: drop myself as a maintainer

Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sys-firmware/edk2-ovmf/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/metadata.xml b/sys-firmware/edk2-ovmf/metadata.xml
index eeff4b6986d3..e592a464117a 100644
--- a/sys-firmware/edk2-ovmf/metadata.xml
+++ b/sys-firmware/edk2-ovmf/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>tamiko@gentoo.org</email>
-	<name>Matthias Maier</name>
-</maintainer>
 <maintainer type="project">
 	<email>virtualization@gentoo.org</email>
 	<name>Gentoo Virtualization Project</name>


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2024-08-04  7:44 Joonas Niilola
  0 siblings, 0 replies; 56+ messages in thread
From: Joonas Niilola @ 2024-08-04  7:44 UTC (permalink / raw
  To: gentoo-commits

commit:     cda2fe4a323784b9be9b5a5d22469aa921ca97a1
Author:     Takaki Suzuki <takaki-s <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Jul 24 13:59:43 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 07:44:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cda2fe4a

sys-firmware/edk2-ovmf: add 202405

Signed-off-by: Takaki Suzuki <takaki-s <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/37704
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sys-firmware/edk2-ovmf/Manifest                |   5 +
 sys-firmware/edk2-ovmf/edk2-ovmf-202405.ebuild | 169 +++++++++++++++++++++++++
 2 files changed, 174 insertions(+)

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index 91c1fe2e832c..ee6f263902a0 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -5,5 +5,10 @@ DIST edk2-ovmf-202105-r1-bin.tar.xz 2633188 BLAKE2B 93b4bd1c75da69406b5d27ac32d8
 DIST edk2-ovmf-202105.tar.gz 13702868 BLAKE2B 3ec01d467562380ca2fd3bd807d2f6c55e4637c1afd71533f8f5b22cc634dc4c8cb63dab921677f8b315d17b3c9d0b6b00a0e2f3f8da61107033e9e81bf5a64d SHA512 c263345cbb243c63985f974a61f37c577a139d6a7099d2b8c9e1a553e5ebf16de12fb711b72624081c6bf637f8084bbf71731ab99e5747d81da460388ac25791
 DIST edk2-ovmf-202202-qemu-firmware.tar.xz 664 BLAKE2B 1aa4e25804ce0f3c967c80999315de24eaef6682e42dddd81c274ce4603ec3d15186de752de49e2527c6bd5517080c002a357ed6bc389b5afd6f7a4d93edeb44 SHA512 f9a29212274a99796784673d873e0eee7d3e2a5cf9e63192453841ee3a4ef4b813c7b2357fc7000f39c71ed6c66636daab772abb51d3972a2a56ade8a4c68faf
 DIST edk2-ovmf-202202.tar.gz 14208170 BLAKE2B d8411e6808b335ccd551349a10c983b9448a357e73273fa6c30a07785e27feffed0224950ee98b668712c33f6739a9b006e5043b7dfd014f48dba9fd449b3354 SHA512 200690a4867331de06e0478869b85577bc510213ebe679f2103160efb84d94c82ac8481ef1f15c3e42c1e9f22b7c5ef0d6c8f2c655bce7702ce843551cf9bb83
+DIST edk2-ovmf-202405.tar.gz 17091190 BLAKE2B ee2f4c8674ecd7a17e4ee1b067cf1caffb46c3345f39ab15b715964b8e114d01538ae4d4152ab6a3eeebdae602128604d57c02fc0da83f46c291559fe39f49d2 SHA512 3bad4c8417b0c9b68fc6b6b85a4b15c5be8daf672177ce66d7b224b1da7a90f643021adbdd6bc96f95417fc8654c4c6b191cd39f6c1be955946360bfa8e2cb5f
+DIST libspdm-370b5944c046bab043dd8b133727b2135af7747a.tar.gz 1962880 BLAKE2B 89606315fadcf00b2909f264a6edcb2b900dfe248357ea45c37c5a9c947a4d684866627d85132cc51d44d90853d63814eaf9d2b4acdd1a9621b1d6600ca4a0a4 SHA512 07b2b376a84e86647d7a831ee6686d1cf647033ac339afb7c4ea7846cf4e9f7f529a2866bc68ea172d44f1f1efadc8bf1646c3d7fe7e6b6175286ef9c743b206
+DIST mbedtls-370b5944c046bab043dd8b133727b2135af7747a.tar.gz 4587796 BLAKE2B c28df5c52ac3ed5ef6a2b9eba29f3894d3f5f11083869e8b137cd66d4f72b2a0971c91636ce4626869bd06eeb5e661d90160021f92564b9449fb13001b8e379f SHA512 a421c03c740867210f9e30457bc951928cafec3622e1e304f8c18ce5c5e27c5c8e6c7715180ecb74c6a997e4b91ee160e52b357e1bb65ff76ce8414a87ec4889
+DIST mipi-sys-t-370b5944c046bab043dd8b133727b2135af7747a.tar.gz 378522 BLAKE2B d3f1033e78ad814ebb991e66d8c1437aa3583e91481af9785b97b6021c7c45fb9dcb8d2d58d0a0fe84fbd9f108d24a27234df298eb8a2ba2340e5c9c85c89c40 SHA512 de6888577ceab7ab6915d792f3c48248cfa53357ccd310fc7f7eae4d25a932de8c7c23e5b898c9ebf61cf86cb538277273f2eb131a628b3bf0d46c9a3b9b6686
 DIST openssl-d82e959e621a3d597f1e0d50ff8c2d8b96915fd7.tar.gz 10034310 BLAKE2B 6996979dc12a523d565830e7b0943feb682a376f71ddb6f20cb8b9976bb7f12e39f088abaa45d514933ef79c0e4a2933dc6f1af4774fedaa16e74c0081c358e7 SHA512 a89bc652dc4318c5e8a9c594a43d890ca05dfc1acd6b15e2a8ab8b5628b5f33994143ff8024230e07b9e67556b28ea3a5e36763aa72dec20b52022ca8c6f2a7e
+DIST openssl-de90e54bbe82e5be4fb9608b6f5c308bb837d355.tar.gz 15337569 BLAKE2B bb0b2f4ee7838178e8e23317b6c63048611d805e20c81d6c875d9b515e6dbcf981cda38f031965c9ec45bcab3ac4725cfa793718b0212e92bf53b4c7fc3f4e32 SHA512 4bba15075dacc8c1772a95759cfe8620ff3a9d535e5d3d29bb15e4790cc543555ab45f0b239195361e534eca26249ae1b491b63cbf6b7ecda6f0840c7f6253ac
 DIST openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz 9981169 BLAKE2B 33aac7364cdd45fec5654ab6caef84e1a829464380419c8a6bb311055c5a01c0aaff6e046a7c541a87e908fa9d26bae652f5be901461d03df36f2522f9c34b0c SHA512 db2087c04f0b428b3f4e1c8b3ac53cce69e0fd331ed2b86ba00facafd1685864d73f71c13eee48f4fe0af2bddad848f84a2b8ed2a17fabdf7fa2ed7d9eb39371

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202405.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202405.ebuild
new file mode 100644
index 000000000000..19628bba00c5
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202405.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_12 )
+
+inherit python-any-r1 readme.gentoo-r1 secureboot
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+BUNDLED_OPENSSL_SUBMODULE_SHA="de90e54bbe82e5be4fb9608b6f5c308bb837d355"
+BUNDLED_BROTLI_SUBMODULE_SHA="f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
+BUNDLED_MIPI_SYS_T_SUBMODULE_SHA="370b5944c046bab043dd8b133727b2135af7747a"
+BUNDLED_MBEDTLS_SUBMODULE_SHA="8c89224991adff88d53cd380f42a2baa36f91454"
+BUNDLED_LIBSPDM_SUBMODULE_SHA="828ef62524bcaeca4e90d0c021221e714872e2b5"
+
+# TODO: talk with tamiko about unbundling (mva)
+
+# TODO: the binary 202105 package currently lacks the preseeded
+#       OVMF_VARS.secboot.fd file (that we typically get from fedora)
+SRC_URI="https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz
+	https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
+	https://github.com/MIPI-Alliance/public-mipi-sys-t/archive/${BUNDLED_MIPI_SYS_T_SUBMODULE_SHA}.tar.gz -> mipi-sys-t-${BUNDLED_MIPI_SYS_T_SUBMODULE_SHA}.tar.gz
+	https://github.com/Mbed-TLS/mbedtls/archive/${BUNDLED_MBEDTLS_SUBMODULE_SHA}.tar.gz -> mbedtls-${BUNDLED_MIPI_SYS_T_SUBMODULE_SHA}.tar.gz
+	https://github.com/DMTF/libspdm/archive/${BUNDLED_LIBSPDM_SUBMODULE_SHA}.tar.gz -> libspdm-${BUNDLED_MIPI_SYS_T_SUBMODULE_SHA}.tar.gz
+	https://dev.gentoo.org/~ajak/distfiles/${PN}-202202-qemu-firmware.tar.xz"
+
+S="${WORKDIR}/edk2-edk2-stable${PV}"
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+BDEPEND="app-emulation/qemu
+	>=dev-lang/nasm-2.0.7
+	>=sys-power/iasl-20160729
+	${PYTHON_DEPS}"
+RDEPEND="!sys-firmware/edk2-ovmf-bin"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+	/usr/share/edk2-ovmf/OVMF_CODE.fd
+	/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)
+or creating OVMF_VARS.secboot.fd by hand:
+	https://github.com/puiterwijk/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
+one for yourself. Firmware blobs are commonly labeled
+	OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+	$ qemu-system-x86_64 \
+		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+		..."
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	secureboot_pkg_setup
+}
+
+src_prepare() {
+	# Bundled submodules
+	cp -rl "${WORKDIR}/openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}"/* "CryptoPkg/Library/OpensslLib/openssl/" \
+		|| die "copying openssl failed"
+	cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "BaseTools/Source/C/BrotliCompress/brotli/" \
+		|| die "copying brotli failed"
+	cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* \
+		"MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/" || die "copying brotli failed"
+	cp -rl "${WORKDIR}/public-mipi-sys-t-${BUNDLED_MIPI_SYS_T_SUBMODULE_SHA}"/* "MdePkg/Library/MipiSysTLib/mipisyst/" \
+		|| die "copying mipi-sys-t failed"
+	cp -rl "${WORKDIR}/mbedtls-${BUNDLED_MBEDTLS_SUBMODULE_SHA}"/* "CryptoPkg/Library/MbedTlsLib/mbedtls/" \
+		|| die "copying mbedtls failed"
+	cp -rl "${WORKDIR}/libspdm-${BUNDLED_LIBSPDM_SUBMODULE_SHA}"/* "SecurityPkg/DeviceSecurity/SpdmLib/libspdm" \
+		|| die "copying libspdm failed"
+
+	sed -i -r \
+		-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
+		"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+
+	default
+}
+
+src_compile() {
+	TARGET_ARCH=X64
+	TARGET_NAME=RELEASE
+	TARGET_TOOLS=GCC5
+
+	BUILD_FLAGS="-D TLS_ENABLE \
+		-D HTTP_BOOT_ENABLE \
+		-D NETWORK_IP6_ENABLE \
+		-D TPM_ENABLE \
+		-D TPM2_ENABLE -D TPM2_CONFIG_ENABLE \
+		-D FD_SIZE_2MB"
+
+	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
+		-D SECURE_BOOT_ENABLE \
+		-D SMM_REQUIRE \
+		-D EXCLUDE_SHELL_FROM_FD"
+
+	export LDFLAGS="-z notext"
+	export EXTRA_LDFLAGS="-z notext"
+	export DLINK_FLAGS="-z notext"
+
+	emake ARCH=${TARGET_ARCH} -C BaseTools
+
+	. ./edksetup.sh
+
+	# Build all EFI firmware blobs:
+
+	mkdir -p ovmf
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
+	rm -rf Build/OvmfX64
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
+	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
+	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
+
+	# Build a convenience UefiShell.img:
+
+	mkdir -p iso_image/efi/boot || die "mkdir failed"
+	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
+	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
+	qemu-img convert --image-opts \
+		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
+		ovmf/UefiShell.img || die "qemu-img failed"
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins ovmf/*
+
+	insinto /usr/share/qemu/firmware
+	doins "${S}"/../edk2-edk2-stable202202/qemu/*
+	rm "${ED}"/usr/share/qemu/firmware/40-edk2-ovmf-x64-sb-enrolled.json || die "rm failed"
+
+	secureboot_auto_sign --in-place
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 56+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/
@ 2024-08-13 12:41 Joonas Niilola
  0 siblings, 0 replies; 56+ messages in thread
From: Joonas Niilola @ 2024-08-13 12:41 UTC (permalink / raw
  To: gentoo-commits

commit:     99fc18002631dc9ffa1fe95fc972cd14ec34e4b3
Author:     Takaki Suzuki <takaki-s <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Mon Aug  5 15:24:50 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 13 12:35:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99fc1800

sys-firmware/edk2-ovmf: Clean up ebuild file.

Reflected review comments from https://github.com/gentoo/gentoo/pull/37704

Signed-off-by: Takaki Suzuki <takaki-s <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/37981
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202405.ebuild | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202405.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202405.ebuild
index 19628bba00c5..252893dab349 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202405.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202405.ebuild
@@ -17,10 +17,6 @@ BUNDLED_MIPI_SYS_T_SUBMODULE_SHA="370b5944c046bab043dd8b133727b2135af7747a"
 BUNDLED_MBEDTLS_SUBMODULE_SHA="8c89224991adff88d53cd380f42a2baa36f91454"
 BUNDLED_LIBSPDM_SUBMODULE_SHA="828ef62524bcaeca4e90d0c021221e714872e2b5"
 
-# TODO: talk with tamiko about unbundling (mva)
-
-# TODO: the binary 202105 package currently lacks the preseeded
-#       OVMF_VARS.secboot.fd file (that we typically get from fedora)
 SRC_URI="https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz
 	https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
@@ -90,10 +86,6 @@ src_prepare() {
 	cp -rl "${WORKDIR}/libspdm-${BUNDLED_LIBSPDM_SUBMODULE_SHA}"/* "SecurityPkg/DeviceSecurity/SpdmLib/libspdm" \
 		|| die "copying libspdm failed"
 
-	sed -i -r \
-		-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
-		"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
-
 	default
 }
 
@@ -124,14 +116,14 @@ src_compile() {
 
 	# Build all EFI firmware blobs:
 
-	mkdir -p ovmf
+	mkdir -p ovmf || die
 
 	./OvmfPkg/build.sh \
 		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
 		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
 
 	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
-	rm -rf Build/OvmfX64
+	rm -r Build/OvmfX64 || die
 
 	./OvmfPkg/build.sh \
 		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \


^ permalink raw reply related	[flat|nested] 56+ messages in thread

end of thread, other threads:[~2024-08-13 12:42 UTC | newest]

Thread overview: 56+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-07 19:44 [gentoo-commits] repo/gentoo:master commit in: sys-firmware/edk2-ovmf/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-08-13 12:41 Joonas Niilola
2024-08-04  7:44 Joonas Niilola
2024-07-03 21:08 Matthias Maier
2023-08-28 19:32 Sam James
2023-08-28 19:10 Sam James
2023-08-17  7:49 Andrew Ammerlaan
2022-12-08 22:25 John Helmert III
2022-12-05 19:48 Arthur Zamarin
2022-12-02 19:27 Arthur Zamarin
2022-12-02 18:50 Arthur Zamarin
2022-12-02 18:50 Arthur Zamarin
2022-09-27  3:27 John Helmert III
2022-09-27  3:27 John Helmert III
2022-09-27  3:27 John Helmert III
2022-09-06 22:39 John Helmert III
2022-05-19 12:19 WANG Xuerui
2022-01-23  8:05 Yixun Lan
2022-01-04  0:02 Matthias Maier
2022-01-04  0:02 Matthias Maier
2021-10-08 18:49 Agostino Sarubbo
2021-10-08  1:57 Sam James
2021-10-07  6:02 Agostino Sarubbo
2021-06-27  7:52 Matthias Maier
2021-06-27  7:52 Matthias Maier
2021-06-26 22:23 Matthias Maier
2021-05-31 20:18 Michał Górny
2021-04-04 23:09 Matthias Maier
2021-04-04 23:07 Matthias Maier
2021-03-11 17:03 Ben Kohler
2020-12-23  1:30 Thomas Deutschmann
2020-12-23  1:28 Thomas Deutschmann
2020-11-07  3:49 Georgy Yakovlev
2020-10-13 10:01 Agostino Sarubbo
2020-10-13  9:26 Agostino Sarubbo
2020-10-11 23:44 Sam James
2020-10-02 13:56 Vadim Misbakh-Soloviov
2020-10-02 11:06 Vadim Misbakh-Soloviov
2020-10-02 10:53 Vadim Misbakh-Soloviov
2020-10-02 10:38 Vadim Misbakh-Soloviov
2020-08-19 22:40 Sam James
2020-02-10 13:26 Michał Górny
2019-08-19 11:37 Agostino Sarubbo
2019-08-18 21:51 Agostino Sarubbo
2019-07-28 23:17 Matthias Maier
2019-07-28 23:17 Matthias Maier
2019-07-28 23:17 Matthias Maier
2019-07-28 23:17 Matthias Maier
2019-07-22  9:28 Michał Górny
2018-03-30 16:51 Aaron Bauman
2018-02-12  0:42 Matthias Maier
2018-02-12  0:42 Matthias Maier
2017-12-12 18:01 Matthias Maier
2017-09-01  1:09 Matthias Maier
2017-08-13 12:36 David Seifert
2017-05-06  6:09 Matthias Maier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox