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

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

2024-07-03 Thread Matthias Maier

commit: 756da03e804cbdc05c126debacd9c0a94fa43821
Author: Matthias Maier  gentoo  org>
AuthorDate: Wed Jul  3 21:06:08 2024 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Wed Jul  3 21:06:08 2024 +
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  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 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   tam...@gentoo.org
-   Matthias Maier
-
 
virtualizat...@gentoo.org
Gentoo Virtualization Project

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

2023-08-28 Thread Sam James

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

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

Signed-off-by: Sam James  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

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

2023-08-28 Thread Sam James

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

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

Signed-off-by: Sam James  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 pre-built binaries
 
+
+   tianocore/edk2
+

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

2023-08-28 Thread Sam James

commit: 08271e9f6435f27dbb65567926c68bb012cf4c74
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 28 19:09:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 28 19:09:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08271e9f

sys-firmware/edk2-ovmf: fix build w/ binutils-2.41[hardened]

Closes: https://bugs.gentoo.org/913110
Signed-off-by: Sam James  gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild |  6 +++
 .../edk2-ovmf-202202-binutils-2.41-textrels.patch  | 21 +++
 .../files/edk2-ovmf-202202-lld-textrels.patch  | 43 ++
 3 files changed, 70 insertions(+)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild 
b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
index 322c5a16bc5d..04de01f008bb 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
@@ -36,6 +36,8 @@ RDEPEND="!sys-firmware/edk2-ovmf-bin"
 
 PATCHES=(
"${FILESDIR}/${PN}-202105-werror.patch"
+   "${FILESDIR}/${PN}-202202-lld-textrels.patch"
+   "${FILESDIR}/${PN}-202202-binutils-2.41-textrels.patch"
 )
 
 S="${WORKDIR}/edk2-edk2-stable${PV}"
@@ -104,6 +106,10 @@ src_compile() {
-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

diff --git 
a/sys-firmware/edk2-ovmf/files/edk2-ovmf-202202-binutils-2.41-textrels.patch 
b/sys-firmware/edk2-ovmf/files/edk2-ovmf-202202-binutils-2.41-textrels.patch
new file mode 100644
index ..22d33c9097aa
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/files/edk2-ovmf-202202-binutils-2.41-textrels.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/913110
+--- a/BaseTools/Conf/tools_def.template
 b/BaseTools/Conf/tools_def.template
+@@ -1906,7 +1906,7 @@ DEFINE GCC48_IA32_X64_DLINK_COMMON   = -nostdlib 
-Wl,-n,-q,--gc-sections -z comm
+ DEFINE GCC48_IA32_CC_FLAGS   = DEF(GCC48_ALL_CC_FLAGS) -m32 
-march=i586 -malign-double -fno-stack-protector -D EFI32 
-fno-asynchronous-unwind-tables -Wno-address
+ DEFINE GCC48_X64_CC_FLAGS= DEF(GCC48_ALL_CC_FLAGS) -m64 
-fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" 
-maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie 
-fno-asynchronous-unwind-tables -Wno-address
+ DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) 
-Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable
+-DEFINE GCC48_IA32_X64_DLINK_FLAGS= DEF(GCC48_IA32_X64_DLINK_COMMON) 
-Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) 
-Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive
++DEFINE GCC48_IA32_X64_DLINK_FLAGS= DEF(GCC48_IA32_X64_DLINK_COMMON) 
-Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) 
-Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive -Wl,-z,notext
+ DEFINE GCC48_IA32_DLINK2_FLAGS   = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 
DEF(GCC_DLINK2_FLAGS_COMMON)
+ DEFINE GCC48_X64_DLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_FLAGS) 
-Wl,-melf_x86_64,--oformat=elf64-x86-64,-pie
+ DEFINE GCC48_X64_DLINK2_FLAGS= -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 
DEF(GCC_DLINK2_FLAGS_COMMON)
+@@ -1929,7 +1929,7 @@ DEFINE GCC49_IA32_CC_FLAGS   = 
DEF(GCC48_IA32_CC_FLAGS) -fno-pic -fno-pi
+ DEFINE GCC49_X64_CC_FLAGS= DEF(GCC48_X64_CC_FLAGS)
+ DEFINE GCC49_IA32_X64_DLINK_COMMON   = -nostdlib -Wl,-n,-q,--gc-sections -z 
common-page-size=0x40
+ DEFINE GCC49_IA32_X64_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_DLINK_COMMON) 
-Wl,--defsym=PECOFF_HEADER_SIZE=0 DEF(GCC_DLINK2_FLAGS_COMMON) 
-Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable
+-DEFINE GCC49_IA32_X64_DLINK_FLAGS= DEF(GCC49_IA32_X64_DLINK_COMMON) 
-Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) 
-Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive
++DEFINE GCC49_IA32_X64_DLINK_FLAGS= DEF(GCC49_IA32_X64_DLINK_COMMON) 
-Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) 
-Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive -Wl,-z,notext
+ DEFINE GCC49_IA32_DLINK2_FLAGS   = DEF(GCC48_IA32_DLINK2_FLAGS)
+ DEFINE GCC49_X64_DLINK_FLAGS = DEF(GCC49_IA32_X64_DLINK_FLAGS) 
-Wl,-melf_x86_64,--oformat=elf64-x86-64,-pie
+ DEFINE GCC49_X64_DLINK2_FLAGS= DEF(GCC48_X64_DLINK2_FLAGS)

diff --git a/sys-firmware/edk2-ovmf/files/edk2-ovmf-202202-lld-textrels.patch 
b/sys-firmware/edk2-ovmf/files/edk2-ovmf-202202-lld-textrels.patch
new file mode 100644
index ..eb8b6296fcff
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/files/edk2-ovmf-202202-lld-textrels.patch
@@ -0,0 +1,43 @@
+https://bugs.gentoo.org/913110
+https://github.com/tianocore/edk2/commit/a257988f590ba90dd8394dd6bc7014ae9d814a08
+
+From a257988f590ba90dd8394dd6bc7014ae9d814a08 Mon Sep 17 00:00:00 2001
+From: Ard Biesheuvel 
+Date: Mon,

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

2023-08-17 Thread Andrew Ammerlaan

commit: fdb0612aa55f5c0fc321c3195ad07eae939e697e
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Jul 12 07:40:30 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Aug 17 07:48:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb0612a

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

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild 
b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
index de6d9fb8ae2d..2a1a7048cbce 100644
--- a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
+++ b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit readme.gentoo-r1
+inherit readme.gentoo-r1 secureboot
 
 BINPKG="${P/-bin/}-1"
 
@@ -61,6 +61,8 @@ src_install() {
rm "usr/share/doc/${PF}/README.gentoo.bz2"
mv usr "${ED}" || die
 
+   secureboot_auto_sign --in-place
+
readme.gentoo_create_doc
 }

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

2023-08-17 Thread Andrew Ammerlaan

commit: 39f892b24fbfb92a75f0f40dbb95736c82273b92
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Jul 12 07:57:48 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Aug 17 07:48:42 2023 +
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  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} != "99" ]] && 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
 }

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

2022-12-14 Thread Ionen Wolkens

commit: f171d54b255e3434b040af42aaca725cfbaa0788
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Dec 14 09:06:12 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Dec 14 09:07:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f171d54b

sys-firmware/edk2-ovmf-bin: fix unpack with TAPE set

Was done for seabios-bin, doing here too to match (imagine this
will likely migrate to gpkg.tar and unpacker.eclass in the future).

Bug: https://bugs.gentoo.org/885719
Signed-off-by: Ionen Wolkens  gentoo.org>

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

diff --git a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild 
b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
index aa5a8d70f834..de6d9fb8ae2d 100644
--- a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
+++ b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
@@ -51,7 +51,7 @@ In order to use the firmware you can run qemu the following 
way
..."
 
 src_unpack() {
-   tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.xpak") || die 
"unpacking binpkg failed"
+   tar -xf - < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.xpak") || 
die "unpacking binpkg failed"
 }
 
 src_install() {

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

2022-12-08 Thread John Helmert III

commit: 60ee58e8661dafcd39f3ad022920ca78cb3e33c5
Author: John Helmert III  gentoo  org>
AuthorDate: Thu Dec  8 22:23:48 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Thu Dec  8 22:25:29 2022 +
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  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

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

2022-12-05 Thread Arthur Zamarin

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

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

Signed-off-by: Arthur Zamarin  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

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

2022-12-05 Thread Arthur Zamarin

commit: 22741c60e63622dab2dccd9246d885fc9a344431
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Dec  5 19:47:36 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Dec  5 19:47:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22741c60

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

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild 
b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
index ae0db01d4e8e..aa5a8d70f834 100644
--- a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
+++ b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~loong ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 RDEPEND="!sys-firmware/edk2-ovmf"

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

2022-12-02 Thread Arthur Zamarin

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

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

Signed-off-by: Arthur Zamarin  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

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

2022-12-02 Thread Arthur Zamarin

commit: b8cf342c219f23edb02ed0698afe26d88a5b2d3a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  2 19:26:56 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  2 19:26:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8cf342c

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

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild 
b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
index 305178592b8f..ae0db01d4e8e 100644
--- a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
+++ b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 RDEPEND="!sys-firmware/edk2-ovmf"

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

2022-12-02 Thread Arthur Zamarin

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

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

Signed-off-by: Arthur Zamarin  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

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

2022-12-02 Thread Arthur Zamarin

commit: 827c68dd4eaa5080d157ad09201bb9d91df4cd55
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  2 18:49:57 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  2 18:49:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=827c68dd

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

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild 
b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
index 298290be080c..305178592b8f 100644
--- a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
+++ b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="!sys-firmware/edk2-ovmf"

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

2022-12-02 Thread Arthur Zamarin

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

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

Signed-off-by: Arthur Zamarin  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

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

2022-12-02 Thread Arthur Zamarin

commit: 7ed104f45376528c07bd7e27dc83776b4ead93d8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  2 18:49:19 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  2 18:49:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ed104f4

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

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild 
b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
index fac69443f73b..298290be080c 100644
--- a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
+++ b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="!sys-firmware/edk2-ovmf"

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

2022-09-26 Thread John Helmert III

commit: cd6aa3263fb5ad116d2d19f6707432ba18a0e2e8
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Sep 26 23:03:55 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Tue Sep 27 03:26:23 2022 +
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  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

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

2022-09-26 Thread John Helmert III

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

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

Signed-off-by: John Helmert III  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..
--- 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} != "99" ]] && 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"
-
-

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

2022-09-26 Thread John Helmert III

commit: f23c0d69230efd77ac852e83ead463b29f303ea5
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Sep 26 23:03:43 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Tue Sep 27 03:26:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23c0d69

sys-firmware/edk2-ovmf-bin: keyword 202202

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

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

diff --git a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild 
b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
index 7b35ffe6dc9e..fac69443f73b 100644
--- a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
+++ b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-#KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="!sys-firmware/edk2-ovmf"

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

2022-09-26 Thread John Helmert III

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

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

Signed-off-by: John Helmert III  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

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

2022-09-06 Thread John Helmert III

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

sys-firmware/edk2-ovmf: add 202202

Signed-off-by: John Helmert III  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 
1aa4e25804ce0f3c967c80999315de24eaef6682e4281c274ce4603ec3d15186de752de49e2527c6bd5517080c002a357ed6bc389b5afd6f7a4d93edeb44
 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 ..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 
->

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

2022-09-06 Thread John Helmert III

commit: 3bb54ffa0e7e41b2bfba21d8b7dc77db2c30a1fe
Author: John Helmert III  gentoo  org>
AuthorDate: Sun Aug  7 01:04:51 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Tue Sep  6 22:38:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bb54ffa

sys-firmware/edk2-ovmf-bin: new package, add 202202

The source package only supports building on amd64, so add the keywords
from the last edk2-ovmf with USE=binary to this package.

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

 sys-firmware/edk2-ovmf-bin/Manifest|  1 +
 .../edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild  | 69 ++
 sys-firmware/edk2-ovmf-bin/metadata.xml|  8 +++
 3 files changed, 78 insertions(+)

diff --git a/sys-firmware/edk2-ovmf-bin/Manifest 
b/sys-firmware/edk2-ovmf-bin/Manifest
new file mode 100644
index ..3acdd51ad6e6
--- /dev/null
+++ b/sys-firmware/edk2-ovmf-bin/Manifest
@@ -0,0 +1 @@
+DIST edk2-ovmf-202202-1.xpak 2672386 BLAKE2B 
75c15d4379610ab2af85b78166e350d52f4f1bc1fff5b2eb693ad0d7b1f6648e65d8ae3e2c5467f93f1557ad3b4fa664ab2d76ff10794667de22c2ea8cca6b2d
 SHA512 
06783b89c96bada0fd025ff39eaee501a027abcb03c0bdcf3ff497d52be22927ab03013d90f145ee94a8662cfffe4f8c154dcd06db1bb1acef8a85ae43de14a3

diff --git a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild 
b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
new file mode 100644
index ..7b35ffe6dc9e
--- /dev/null
+++ b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1
+
+BINPKG="${P/-bin/}-1"
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2;
+SRC_URI="https://dev.gentoo.org/~ajak/distfiles/${BINPKG}.xpak;
+S="${WORKDIR}"
+
+# TODO: the binary 202105 package currently lacks the preseeded
+#   OVMF_VARS.secboot.fd file (that we typically get from fedora)
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+#KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="!sys-firmware/edk2-ovmf"
+
+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_unpack() {
+   tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.xpak") || die 
"unpacking binpkg failed"
+}
+
+src_install() {
+   mv "usr/share/doc/${P/-bin/}" "usr/share/doc/${PF}" || die
+
+   # Don't want to try to install the readme from the source package
+   rm "usr/share/doc/${PF}/README.gentoo.bz2"
+   mv usr "${ED}" || die
+
+   readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+   readme.gentoo_print_elog
+}

diff --git a/sys-firmware/edk2-ovmf-bin/metadata.xml 
b/sys-firmware/edk2-ovmf-bin/metadata.xml
new file mode 100644
index ..cfac6f8ac4ff
--- /dev/null
+++ b/sys-firmware/edk2-ovmf-bin/metadata.xml
@@ -0,0 +1,8 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   virtualizat...@gentoo.org
+   Gentoo Virtualization Project
+   
+

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

2022-05-19 Thread WANG Xuerui

commit: 676ffd3433d9293e53b14dced8a31a19f4b2b5d1
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu May 19 11:45:53 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu May 19 12:18:11 2022 +
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  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+="

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

2022-01-23 Thread Yixun Lan

commit: 067464eba6201ffe57c85ef2ccceceb77609fc41
Author: Yongxiang Liang  gmail  com>
AuthorDate: Sun Jan  9 11:54:50 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sun Jan 23 08:04:33 2022 +
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  gmail.com>
Signed-off-by: Yixun Lan  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+="

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

2022-01-03 Thread Matthias Maier

commit: dee51fb9e273c98d521b6d7083030f89d8c13ad5
Author: Matthias Maier  gentoo  org>
AuthorDate: Mon Jan  3 23:51:34 2022 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Tue Jan  4 00:02:11 2022 +
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  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..
--- 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} == "99" ]] ; 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
-   )
-

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

2022-01-03 Thread Matthias Maier

commit: 9e44e430b7bf879f821301b93fa5006e9d625097
Author: Matthias Maier  gentoo  org>
AuthorDate: Tue Jan  4 00:01:49 2022 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Tue Jan  4 00:02:11 2022 +
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  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 ..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} != "99" ]] && 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
+

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

2021-10-08 Thread Agostino Sarubbo

commit: 268d4db4e9103dbf00c79d0baf195d503ba184bb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Oct  8 18:49:42 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Oct  8 18:49:42 2021 +
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  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+="

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

2021-10-07 Thread Sam James

commit: a4b80143c2ac2f8d99947f02454e1f0460238248
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  8 01:57:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  8 01:57:10 2021 +
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  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+="

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

2021-10-07 Thread Sam James

commit: e08f015c758891b1efd0ffd742754e8603c11c64
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct  7 19:44:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct  7 19:44:27 2021 +
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  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+="

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

2021-10-07 Thread Agostino Sarubbo

commit: f41aaf20a899a634fa4caa2fd396c2f3855a3f36
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Oct  7 06:02:09 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Oct  7 06:02:09 2021 +
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  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+="

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

2021-09-08 Thread John Helmert III

commit: 9c3662f5ee8b460227b2e5fc1ec46aa88f03e982
Author: John Helmert III  gentoo  org>
AuthorDate: Sun Aug 29 05:12:27 2021 +
Commit: John Helmert III  gentoo  org>
CommitDate: Wed Sep  8 19:31:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c3662f5

sys-firmware/edk2-ovmf: don't build with -Werror, python bump

Closes: https://bugs.gentoo.org/801925
Acked-By: Matthias Maier  gentoo.org>
Signed-off-by: John Helmert III  gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild  |  3 +-
 .../edk2-ovmf/files/edk2-ovmf-202105-werror.patch  | 38 ++
 2 files changed, 40 insertions(+), 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 11376aff5d4..f2f2b9a2597 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit python-any-r1 readme.gentoo-r1
 
@@ -54,6 +54,7 @@ DEPEND+="
 RDEPEND=""
 
 PATCHES=(
+   "${FILESDIR}/${PN}-202105-werror.patch"
 )
 
 S="${WORKDIR}/edk2-edk2-stable${PV}"

diff --git a/sys-firmware/edk2-ovmf/files/edk2-ovmf-202105-werror.patch 
b/sys-firmware/edk2-ovmf/files/edk2-ovmf-202105-werror.patch
new file mode 100644
index 000..db71faed772
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/files/edk2-ovmf-202105-werror.patch
@@ -0,0 +1,38 @@
+diff --git a/BaseTools/Conf/tools_def.template 
b/BaseTools/Conf/tools_def.template
+index 498696e..8a360f4 100755
+--- a/BaseTools/Conf/tools_def.template
 b/BaseTools/Conf/tools_def.template
+@@ -1863,7 +1863,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = 
--add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_N
+ *_*_*_DTCPP_PATH   = DEF(DTCPP_BIN)
+ *_*_*_DTC_PATH = DEF(DTC_BIN)
+ 
+-DEFINE GCC_ALL_CC_FLAGS= -g -Os -fshort-wchar -fno-builtin 
-fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h 
-fno-common
++DEFINE GCC_ALL_CC_FLAGS= -g -Os -fshort-wchar -fno-builtin 
-fno-strict-aliasing -Wall  -Wno-array-bounds -include AutoGen.h -fno-common
+ DEFINE GCC_IA32_CC_FLAGS   = DEF(GCC_ALL_CC_FLAGS) -m32 
-malign-double -freorder-blocks -freorder-blocks-and-partition -O2 
-mno-stack-arg-probe
+ DEFINE GCC_X64_CC_FLAGS= DEF(GCC_ALL_CC_FLAGS) -mno-red-zone 
-Wno-address -mno-stack-arg-probe
+ DEFINE GCC_ARM_CC_FLAGS= DEF(GCC_ALL_CC_FLAGS) -mlittle-endian 
-mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections 
-fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft 
-fno-pic -fno-pie
+diff --git a/BaseTools/Source/C/Makefiles/header.makefile 
b/BaseTools/Source/C/Makefiles/header.makefile
+index 0df728f..49f9706 100644
+--- a/BaseTools/Source/C/Makefiles/header.makefile
 b/BaseTools/Source/C/Makefiles/header.makefile
+@@ -82,17 +82,17 @@ BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS)
+ 
+ ifeq ($(DARWIN),Darwin)
+ # assume clang or clang compatible flags on OS X
+-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \
++BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall  \
+ -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g
+ else
+ ifeq ($(CXX), llvm)
+ BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
+--fno-delete-null-pointer-checks -Wall -Werror \
++-fno-delete-null-pointer-checks -Wall  \
+ -Wno-deprecated-declarations -Wno-self-assign \
+ -Wno-unused-result -nostdlib -g
+ else
+ BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
+--fno-delete-null-pointer-checks -Wall -Werror \
++-fno-delete-null-pointer-checks -Wall  \
+ -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \
+ -Wno-unused-result -nostdlib -g
+ endif

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

2021-06-27 Thread Matthias Maier

commit: 0479093a2655a6f7c2cf2feca458f7dc7b8f1866
Author: Matthias Maier  gentoo  org>
AuthorDate: Sun Jun 27 07:46:56 2021 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sun Jun 27 07:52:07 2021 +
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  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..000
--- 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} == "99" ]] ; 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}"
-

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

2021-06-27 Thread Matthias Maier

commit: 7ece9892529e7690a1c763a4ab7f33046bc069ae
Author: Matthias Maier  gentoo  org>
AuthorDate: Sun Jun 27 07:10:30 2021 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sun Jun 27 07:52:06 2021 +
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  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} \

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

2021-06-26 Thread Matthias Maier

commit: 944a1bda9e2a0614e3a176588bb57477813e43dd
Author: Matthias Maier  gentoo  org>
AuthorDate: Sat Jun 26 22:16:40 2021 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sat Jun 26 22:23:52 2021 +
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  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 000..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
+

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

2021-05-31 Thread Michał Górny

commit: 885f56e2bafb42122129f4c249e6959d4eeb6216
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May 31 20:15:23 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May 31 20:18:26 2021 +
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  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

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

2021-04-04 Thread Matthias Maier

commit: e520cd98a6bcf365a6f9718ff152b24537bac630
Author: Matthias Maier  gentoo  org>
AuthorDate: Sun Apr  4 23:08:27 2021 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sun Apr  4 23:08:59 2021 +
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  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 000..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} == "99" ]] ; 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"
+

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

2021-04-04 Thread Matthias Maier

commit: 98ee06b614dad0f70fa11493723e63b4d84679bf
Author: Matthias Maier  gentoo  org>
AuthorDate: Sun Apr  4 23:05:58 2021 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sun Apr  4 23:06:37 2021 +
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  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..000
--- 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} == "99" ]] ; 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}"
-

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

2021-03-11 Thread Ben Kohler

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

sys-firmware/edk2-ovmf: remove unmaintained 99

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

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

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-99.ebuild 
b/sys-firmware/edk2-ovmf/edk2-ovmf-99.ebuild
deleted file mode 100644
index 75427b608e2..000
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-99.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} == "99" ]] ; 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} != "99" ]] && use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   if  [[ ${PV} != "99" ]] && 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} != "99" ]] && 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

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

2020-12-22 Thread Thomas Deutschmann

commit: 48493c5055195f3a1c1cacabdaf4368b7eaeba14
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Dec 23 01:30:02 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Dec 23 01:30:31 2020 +
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  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 000..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} == "99" ]] ; 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=(

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

2020-12-22 Thread Thomas Deutschmann

commit: ffcb1841612a0f3edf1d057e1ef0c862a7cb8270
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Dec 23 01:28:16 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Dec 23 01:28:16 2020 +
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  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..000
--- 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} == "99" ]] ; 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"
-

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

2020-11-06 Thread Georgy Yakovlev

commit: e029777591310932d3c3cb904ed426822e43f118
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Nov  7 01:46:05 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Nov  7 02:09:06 2020 +
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  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 )

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

2020-10-13 Thread Agostino Sarubbo

commit: c827aa8e819372bb2e9fb2d12a2fcf6eb5bd0802
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 13 10:01:14 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 13 10:01:39 2020 +
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  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 )

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

2020-10-13 Thread Agostino Sarubbo

commit: 9cda1d0a8cbfa54f631fc403e4b9c5a04d3d26b4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 13 09:26:21 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 13 09:26:21 2020 +
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  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 )

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

2020-10-11 Thread Sam James

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

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

Signed-off-by: Sam James  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 )

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

2020-10-02 Thread Vadim Misbakh-Soloviov

commit: 9b533dbf89d17e25421e07a2854be7f9b137b14e
Author: Vadim Misbakh-Soloviov  gentoo  org>
AuthorDate: Fri Oct  2 13:56:11 2020 +
Commit: Vadim Misbakh-Soloviov  gentoo  org>
CommitDate: Fri Oct  2 13:56:11 2020 +
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  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"

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

2020-10-02 Thread Vadim Misbakh-Soloviov

commit: c8e9de88098d4e56b80e93733ddca0661075134f
Author: Vadim Misbakh-Soloviov  gentoo  org>
AuthorDate: Fri Oct  2 11:06:17 2020 +
Commit: Vadim Misbakh-Soloviov  gentoo  org>
CommitDate: Fri Oct  2 11:06:17 2020 +
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  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} != "99" ]] && 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} != "99" ]]; then
if use binary; then
eapply_user

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

2020-10-02 Thread Vadim Misbakh-Soloviov

commit: 6ac65a2f8d96632d610823b56df21d0c624a718a
Author: Vadim Misbakh-Soloviov  gentoo  org>
AuthorDate: Fri Oct  2 10:53:29 2020 +
Commit: Vadim Misbakh-Soloviov  gentoo  org>
CommitDate: Fri Oct  2 10:53:29 2020 +
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  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

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

2020-10-02 Thread Vadim Misbakh-Soloviov

commit: 4342ef6d64286089e4a4b25dca5b15a5edb53dca
Author: Vadim Misbakh-Soloviov  gentoo  org>
AuthorDate: Fri Oct  2 10:37:58 2020 +
Commit: Vadim Misbakh-Soloviov  gentoo  org>
CommitDate: Fri Oct  2 10:37:58 2020 +
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  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} != "99" ]] && 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} == "99" ]] ; then
${NON_BINARY_DEPEND}
"
 else
+   BUNDLED_OPENSSL_SUBMODULE_SHA="e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72"
+

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

2020-08-19 Thread Sam James

commit: 923df930f71fbb7e65fee543c2bba529d3255814
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 19 22:37:46 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 19 22:37:46 2020 +
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  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 )

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

2020-02-10 Thread Michał Górny

commit: 29a2b20c966b08299e6ecc4695680f1e47c0d03c
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Feb 10 13:06:07 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Feb 10 13:26:38 2020 +
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  gentoo.org>

 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 2 +-
 sys-firmware/edk2-ovmf/edk2-ovmf-99.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-99.ebuild 
b/sys-firmware/edk2-ovmf/edk2-ovmf-99.ebuild
index 4e5483b25b7..e8acffa9d29 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-99.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-99.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

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

2019-10-11 Thread Michał Górny

commit: 59d0ee2452f1150edacdebb858ba810e5ddab6d2
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Oct 11 15:37:50 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct 11 15:37:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d0ee24

sys-firmware: Remove *-fbsd KEYWORDS

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

 sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild | 2 +-
 sys-firmware/edk2-ovmf/edk2-ovmf-99.ebuild | 2 +-
 sys-firmware/seabios/seabios-1.10.2.ebuild | 2 +-
 sys-firmware/seabios/seabios-1.11.0-r1.ebuild  | 2 +-
 sys-firmware/seabios/seabios-1.11.0.ebuild | 2 +-
 sys-firmware/seabios/seabios-1.12.0.ebuild | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild 
b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
index 45682bed9bf..de9d7211424 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"
IUSE="+binary"
REQUIRED_USE+="
!amd64? ( binary )

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-99.ebuild 
b/sys-firmware/edk2-ovmf/edk2-ovmf-99.ebuild
index 8bd303ef2cb..f62f598a587 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-99.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-99.ebuild
@@ -27,7 +27,7 @@ if [[ ${PV} == "99" ]] ; then
"
 else
SRC_URI=""
-   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
IUSE="+binary"
REQUIRED_USE+="
!amd64? ( binary )

diff --git a/sys-firmware/seabios/seabios-1.10.2.ebuild 
b/sys-firmware/seabios/seabios-1.10.2.ebuild
index 90971a2d03b..c409f0a06da 100644
--- a/sys-firmware/seabios/seabios-1.10.2.ebuild
+++ b/sys-firmware/seabios/seabios-1.10.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == ** || -n "${EGIT_COMMIT}" ]] ; then
EGIT_REPO_URI="git://git.seabios.org/seabios.git"
inherit git-r3
 else
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc x86"
 
# Binary versions taken from fedora:
# 
http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/

diff --git a/sys-firmware/seabios/seabios-1.11.0-r1.ebuild 
b/sys-firmware/seabios/seabios-1.11.0-r1.ebuild
index b57f37fb268..c44dfc9822f 100644
--- a/sys-firmware/seabios/seabios-1.11.0-r1.ebuild
+++ b/sys-firmware/seabios/seabios-1.11.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == ** || -n "${EGIT_COMMIT}" ]] ; then
EGIT_REPO_URI="git://git.seabios.org/seabios.git"
inherit git-r3
 else
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86"
 
# Binary versions taken from fedora:
# 
http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/

diff --git a/sys-firmware/seabios/seabios-1.11.0.ebuild 
b/sys-firmware/seabios/seabios-1.11.0.ebuild
index 3e6181feb18..df1de83a138 100644
--- a/sys-firmware/seabios/seabios-1.11.0.ebuild
+++ b/sys-firmware/seabios/seabios-1.11.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == ** || -n "${EGIT_COMMIT}" ]] ; then
EGIT_REPO_URI="git://git.seabios.org/seabios.git"
inherit git-r3
 else
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc x86"
 
# Binary versions taken from fedora:
# 
http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/

diff --git a/sys-firmware/seabios/seabios-1.12.0.ebuild 
b/sys-firmware/seabios/seabios-1.12.0.ebuild
index 39fcf77d807..adfdc5ace53 100644
--- a/sys-firmware/seabios/seabios-1.12.0.ebuild
+++ b/sys-firmware/seabios/seabios-1.12.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == ** || -n "${EGIT_COMMIT}" ]] ; then
EGIT_REPO_URI="git://git.seabios.org/seabios.git"
inherit git-r3
 else
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc x86"
 
# Binary versions taken from fedora:
#

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

2019-08-19 Thread Matthias Maier

commit: c682b9fdcbf9977e0da01970c2d162461765b7d4
Author: Matthias Maier  gentoo  org>
AuthorDate: Tue Aug 20 04:24:06 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Tue Aug 20 04:24:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c682b9fd

sys-firmware/edk2-ovmf: drop vulnerable

Bug: https://bugs.gentoo.org/678906
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Matthias Maier  gentoo.org>

 sys-firmware/edk2-ovmf/Manifest|   2 -
 .../edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild  | 110 -
 ...k2-ovmf-2017_p20180211-build_system_fixes.patch |  91 -
 3 files changed, 203 deletions(-)

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index 579051780e0..fa1a6639d99 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,5 +1,3 @@
-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-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-2017_p20180211.ebuild 
b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
deleted file mode 100644
index 380bbdaac45..000
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
+++ /dev/null
@@ -1,110 +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;
-
-SOURCE_DEPEND="
-   >=dev-lang/nasm-2.0.7
-   >=sys-power/iasl-20160729
-   ${PYTHON_DEPS}
-"
-DEPEND=""
-RDEPEND=""
-
-if [[ ${PV} == "" ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/tianocore/edk2;
-   DEPEND+="
-   ${SOURCE_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? ( ${SOURCE_DEPEND} ) )"
-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\"
-   ]"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-build_system_fixes.patch
-)
-
-pkg_setup() {
-[[ ${PV} != "" ]] && use binary ||

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

2019-08-19 Thread Agostino Sarubbo

commit: 7faadadedf0816e2bee285f66589183cc1fdb725
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 19 11:36:56 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 19 11:36:56 2019 +
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  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 )

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

2019-08-18 Thread Agostino Sarubbo

commit: 4515e0d63a7ce72d5b090ed426a597c575f74410
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Aug 18 21:49:02 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Aug 18 21:49:02 2019 +
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  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 )

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

2019-07-28 Thread Matthias Maier

commit: 2e035219b706d89b1725512cccd2679a9fcf3368
Author: Matthias Maier  gentoo  org>
AuthorDate: Sun Jul 28 22:23:37 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sun Jul 28 23:17:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e035219

sys-firmware/edk2-ovmf: drop obsolete patch

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

 ...-ovmf-2017_pre20170505-build_system_fixes.patch | 145 -
 1 file changed, 145 deletions(-)

diff --git 
a/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_pre20170505-build_system_fixes.patch
 
b/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_pre20170505-build_system_fixes.patch
deleted file mode 100644
index 68b14e36fdc..000
--- 
a/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_pre20170505-build_system_fixes.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff --git a/BaseTools/Conf/tools_def.template 
b/BaseTools/Conf/tools_def.template
-index 427ef1b..936f79d 100755
 a/BaseTools/Conf/tools_def.template
-+++ b/BaseTools/Conf/tools_def.template
-@@ -4335,7 +4335,7 @@ DEBUG_*_*_OBJCOPY_ADDDEBUGFLAG = 
--add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_N
- RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG   =
- NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = 
--add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug
- 
--DEFINE GCC_ALL_CC_FLAGS= -g -Os -fshort-wchar -fno-builtin 
-fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h 
-fno-common
-+DEFINE GCC_ALL_CC_FLAGS= -g -Os -fshort-wchar -fno-builtin 
-fno-strict-aliasing -Wall -Wno-array-bounds -include AutoGen.h -fno-common
- DEFINE GCC_IA32_CC_FLAGS   = DEF(GCC_ALL_CC_FLAGS) -m32 
-malign-double -freorder-blocks -freorder-blocks-and-partition -O2 
-mno-stack-arg-probe
- DEFINE GCC_X64_CC_FLAGS= DEF(GCC_ALL_CC_FLAGS) -mno-red-zone 
-Wno-address -mno-stack-arg-probe
- DEFINE GCC_IPF_CC_FLAGS= DEF(GCC_ALL_CC_FLAGS) 
-minline-int-divide-min-latency
-@@ -4368,7 +4368,7 @@ DEFINE GCC_IPF_RC_FLAGS= -I binary -O 
elf64-ia64-little   -B ia64
- DEFINE GCC_ARM_RC_FLAGS= -I binary -O elf32-littlearm -B arm  
   --rename-section .data=.hii
- DEFINE GCC_AARCH64_RC_FLAGS= -I binary -O elf64-littleaarch64 -B 
aarch64 --rename-section .data=.hii
- 
--DEFINE GCC44_ALL_CC_FLAGS= -g -fshort-wchar -fno-builtin 
-fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections 
-fdata-sections -include AutoGen.h -fno-common 
-DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
-+DEFINE GCC44_ALL_CC_FLAGS= -g -fshort-wchar -fno-builtin 
-fno-strict-aliasing -Wall -Wno-array-bounds -ffunction-sections 
-fdata-sections -include AutoGen.h -fno-common 
-DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
- DEFINE GCC44_IA32_CC_FLAGS   = DEF(GCC44_ALL_CC_FLAGS) -m32 
-march=i586 -malign-double -fno-stack-protector -D EFI32 
-fno-asynchronous-unwind-tables
- DEFINE GCC44_X64_CC_FLAGS= DEF(GCC44_ALL_CC_FLAGS) -m64 
-fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" 
-maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie 
-fno-asynchronous-unwind-tables
- DEFINE GCC44_IA32_X64_DLINK_COMMON   = -nostdlib -Wl,-n,-q,--gc-sections -z 
common-page-size=0x20
-@@ -5864,7 +5864,7 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS = 
DEF(GCC5_X64_DLINK2_FLAGS) -O0
- *_ELFGCC_X64_VFRPP_PATH= DEF(ELFGCC_BIN)/gcc
- *_ELFGCC_X64_RC_PATH   = DEF(ELFGCC_BIN)/objcopy
- 
--*_ELFGCC_X64_CC_FLAGS  = -Os -fshort-wchar -fno-strict-aliasing 
-Wall -Werror -Wno-address -Wno-array-bounds -include AutoGen.h -D_EFI_P64
-+*_ELFGCC_X64_CC_FLAGS  = -Os -fshort-wchar -fno-strict-aliasing 
-Wall -Wno-address -Wno-array-bounds -include AutoGen.h -D_EFI_P64
- *_ELFGCC_X64_DLINK_FLAGS   = -nostdlib --shared --entry 
$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map 
$(DEST_DIR_DEBUG)/$(BASE_NAME).map
- *_ELFGCC_X64_SLINK_FLAGS   =
- *_ELFGCC_X64_ASM_FLAGS = -c -x assembler -imacros 
$(DEST_DIR_DEBUG)/AutoGen.h
-@@ -5887,7 +5887,7 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS = 
DEF(GCC5_X64_DLINK2_FLAGS) -O0
- *_ELFGCC_IPF_VFRPP_PATH   = DEF(ELFGCC_BIN)/gcc
- *_ELFGCC_IPF_RC_PATH  = DEF(ELFGCC_BIN)/objcopy
- 
--*_ELFGCC_IPF_CC_FLAGS = -Os -fshort-wchar -Wall -Werror -include 
AutoGen.h -D_EFI_P64
-+*_ELFGCC_IPF_CC_FLAGS = -Os -fshort-wchar -Wall -include 
AutoGen.h -D_EFI_P64
- *_ELFGCC_IPF_DLINK_FLAGS  = -nostdlib --shared --entry 
$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map 
$(DEST_DIR_DEBUG)/$(BASE_NAME).map
- *_ELFGCC_IPF_SLINK_FLAGS  =
- *_ELFGCC_IPF_ASM_FLAGS= -c -x assembler -imacros 
$(DEST_DIR_DEBUG)/AutoGen.h
-@@ -7296,10 +7296,10 @@ RELEASE_XCODE32_IA32_ASM_FLAGS  = -arch i386
- *_XCODE32_IA32_NASM_FLAGS   = -f macho32
- *_XCODE32_IA32_PP_FLAGS = -arch i386 -E -x assembler-with-cpp 
-include

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

2019-07-28 Thread Matthias Maier

commit: 6137d4c59ea47d77517e925d8bfd46b8b3b1f669
Author: Matthias Maier  gentoo  org>
AuthorDate: Sun Jul 28 21:00:39 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sun Jul 28 23:17:16 2019 +
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  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 000..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} == "99" ]] ; 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+="
+

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

2019-07-28 Thread Matthias Maier

commit: aed5cfd1b2ec95c1b90d2a07ebaa6182a07ea95d
Author: Matthias Maier  gentoo  org>
AuthorDate: Sun Jul 28 21:08:35 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sun Jul 28 23:17:19 2019 +
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  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..000
--- 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} == "" ]] ; 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} != "" ]] && use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   if  [[ ${PV} != "" ]] && use binary; then
-   eapply_user
-   return
-   fi
-   default
-}
-
-src_compile() {
-   TARGET_ARCH=X64
-   TARGET_NAME=RELEASE
-   TARGET_TOOLS=GCC49
-
-   [[ ${PV} != "" ]] && 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
-}

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

2019-07-28 Thread Matthias Maier

commit: fff18dae2f07b0bf7b885912abfdc49fa283055e
Author: Matthias Maier  gentoo  org>
AuthorDate: Sun Jul 28 21:11:51 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sun Jul 28 23:17:26 2019 +
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  gentoo.org>

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

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-.ebuild 
b/sys-firmware/edk2-ovmf/edk2-ovmf-99.ebuild
similarity index 50%
rename from sys-firmware/edk2-ovmf/edk2-ovmf-.ebuild
rename to sys-firmware/edk2-ovmf/edk2-ovmf-99.ebuild
index a3779c68d3d..8bd303ef2cb 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-99.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} == "" ]] ; then
+if [[ ${PV} == "99" ]] ; 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} != "" ]] && use binary || python-any-r1_pkg_setup
+   [[ ${PV} != "99" ]] && use binary || python-any-r1_pkg_setup
 }
 
 src_prepare() {
-   if  [[ ${PV} != "" ]] && use binary; then
+   if  [[ ${PV} != "99" ]] && use binary; then
eapply_user
return
fi
@@ -87,23 +97,54 @@ src_compile() {
TARGET_NAME=RELEASE
TARGET_TOOLS=GCC49
 
-   [[ ${PV} != "" ]] && 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} != "99" ]] && 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

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

2019-07-28 Thread Matthias Maier

commit: 1bf61089297e21d870768a00e5103e23b0c611b6
Author: Matthias Maier  gentoo  org>
AuthorDate: Sun Jul 28 22:44:15 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sun Jul 28 23:17:33 2019 +
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  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() {

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

2019-07-22 Thread Michał Górny

commit: 95056d1601a99f0a74bc4dca553a3122f52cb144
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jul 21 15:46:13 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jul 22 09:28:13 2019 +
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  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-.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-.ebuild 
b/sys-firmware/edk2-ovmf/edk2-ovmf-.ebuild
index 9fc2de7937d..a3779c68d3d 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-.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

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

2018-03-30 Thread Aaron Bauman

commit: 179c742b06eb57c51e7df4a6ae948684f3b5dab8
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri Mar 30 16:18:09 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Mar 30 16:50:54 2018 +
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 )

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

2018-02-11 Thread Matthias Maier

commit: 43e07df10c13de3a56d3356da669d6cd62ef354c
Author: Matthias Maier  gentoo  org>
AuthorDate: Mon Feb 12 00:09:30 2018 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Feb 12 00:42:48 2018 +
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 )

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

2018-02-11 Thread Matthias Maier

commit: 151b7c4e15ef366da00ac8350c35484b0fd582c9
Author: Matthias Maier  gentoo  org>
AuthorDate: Mon Feb 12 00:41:59 2018 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Feb 12 00:42:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=151b7c4e

sys-firmware/edk2-ovmf: version bump to 2017_p20180211

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-firmware/edk2-ovmf/Manifest|   2 +
 .../edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild  | 113 +
 ...k2-ovmf-2017_p20180211-build_system_fixes.patch |  91 +
 3 files changed, 206 insertions(+)

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index c941b85849e..a061a11c712 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,2 +1,4 @@
+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

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild 
b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
new file mode 100644
index 000..ff5c5d8fabd
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 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}
+"
+SOURCE_DEPEND="
+   >=dev-lang/nasm-2.0.7
+   >=sys-power/iasl-20160729
+   ${PYTHON_DEPS}
+"
+DEPEND=""
+RDEPEND=""
+
+if [[ ${PV} == "" ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/tianocore/edk2;
+   DEPEND+="
+   ${SOURCE_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? ( ${SOURCE_DEPEND} ) )"
+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\"
+   ]"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-build_system_fixes.patch
+)
+
+pkg_setup() {
+[[ ${PV} != "" ]] && use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+   if  [[ ${PV} != "" ]] && use binary; then
+   eapply_user
+   return
+   fi
+   default
+}
+
+src_compile() {
+   TARGET_ARCH=X64
+   TARGET_NAME=RELEASE
+   TARGET_TOOLS=GCC49
+
+   [[ ${PV} != "" ]] && use binary && return

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

2018-02-11 Thread Matthias Maier

commit: 390fecf137f86fd8f86c50fb52106a0cceeeb974
Author: Matthias Maier  gentoo  org>
AuthorDate: Mon Feb 12 00:10:10 2018 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Feb 12 00:42:48 2018 +
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..000
--- 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
-}

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

2017-12-12 Thread Matthias Maier

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

sys-firmware/edk2-ovmf: Depends on dev-lang/python[sqlite], add - 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  gentoo.org>

 .../edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild | 116 +
 sys-firmware/edk2-ovmf/edk2-ovmf-.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 000..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} == "" ]] ; 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} != "" ]] && use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+   if  [[ ${PV} != "" ]] && use binary; then
+   eapply_user
+   return
+   fi
+   default
+}
+
+src_compile() {
+   TARGET_ARCH=X64
+   TARGET_NAME=RELEASE
+   TARGET_TOOLS=GCC49
+
+   [[ ${PV} != "" ]] && 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-.ebuild 
b/sys-firmware/edk2-ovmf/edk2-ovmf-.ebuild
new file mode 100644
index 000..9fc2de7937d
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-.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
+

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

2017-08-31 Thread Matthias Maier

commit: edfe027b092f6558fa96ff761c91547fd2d5a7a9
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Sep  1 01:04:00 2017 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Fri Sep  1 01:04:00 2017 +
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="

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

2017-08-13 Thread David Seifert

commit: fb56716f5836403ae4df67ac2dd5c2dc5f4f0cda
Author: charIes17  arcor  de>
AuthorDate: Sun Aug 13 11:08:52 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Aug 13 11:38:00 2017 +
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;

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

2017-05-06 Thread Matthias Maier

commit: e5625a98fde19c6d754043d3dc468f88982aeaa9
Author: Matthias Maier  gentoo  org>
AuthorDate: Sat May  6 06:04:59 2017 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sat May  6 06:07:51 2017 +
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() {

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

2017-05-06 Thread Matthias Maier

commit: cba60e1f979c784a109dc64182941b000f69c923
Author: Matthias Maier  gentoo  org>
AuthorDate: Sat May  6 05:51:39 2017 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sat May  6 06:01:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba60e1f

sys-firmware/edk2-ovmf: initial commit, version 2017_pre20170505

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-firmware/edk2-ovmf/Manifest|   2 +
 .../edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild| 108 +++
 ...-ovmf-2017_pre20170505-build_system_fixes.patch | 145 +
 sys-firmware/edk2-ovmf/metadata.xml|  15 +++
 4 files changed, 270 insertions(+)

diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
new file mode 100644
index 000..17a4db06c92
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -0,0 +1,2 @@
+DIST edk2-ovmf-2017_pre20170505-bin.tar.xz 874904 SHA256 
81d3f405c6a3387f93d6a82a1662eaef3b15ce4e486e41020d97b46b95c1499a SHA512 
c7a7d83758214b6ab63c6cefe827a601aaa7656b7f01e03413c84d913078a2b0d8037f70de34d42d8e1614aee794e0ffd7d9e62314eb4e04c21256b70338af5c
 WHIRLPOOL 
686e0b190c34c4d349cbd68f8c0451852b3e2fb3de3cdd75f34c30fba3e7d009c69a27761bf9d698d797cc86d7e7c142e4f38f0156cf6bf87bab92feaa81af6f
+DIST edk2-ovmf-2017_pre20170505.tar.xz 22952060 SHA256 
5fb227595bde9da7bb4c452be0b3f7867984637b1caa40165c86ed31bf591218 SHA512 
6da859360448fd6d04d1492c88a7e935f7108c524f7ccfe6aa4c13bf9af9695dbc4a5b8efa274adc86d3105946aaa1ba80bcd9713facdca153f1a3d873797b63
 WHIRLPOOL 
9916544a2d8fec2fc489f10e5cfd283d3d448dcf008b9dabc75712469b7a8913b021d9321d670295a040cd382f13927fc5bcc865ca148a0a5a66968eff6ea49a

diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild 
b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
new file mode 100644
index 000..46896bd2aea
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
@@ -0,0 +1,108 @@
+# 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
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="http://www.tianocore.org/edk2 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
+)
+
+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
+}

diff --git

69 matches

Mail list logo