diff --git a/sdk_container/src/third_party/portage-stable/acct-group/kvm/kvm-0.ebuild b/sdk_container/src/third_party/portage-stable/acct-group/kvm/kvm-0.ebuild
new file mode 100644
index 0000000000..3a7f134539
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/acct-group/kvm/kvm-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=78
diff --git a/sdk_container/src/third_party/portage-stable/acct-group/kvm/metadata.xml b/sdk_container/src/third_party/portage-stable/acct-group/kvm/metadata.xml
new file mode 100644
index 0000000000..98159ee2f4
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/acct-group/kvm/metadata.xml
@@ -0,0 +1,10 @@
+
+
+
+
+ virtualization@gentoo.org
+
+
+ systemd@gentoo.org
+
+
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/unzip/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/unzip/Manifest
index 8586a6f84c..dce593202f 100644
--- a/sdk_container/src/third_party/portage-stable/app-arch/unzip/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-arch/unzip/Manifest
@@ -1,8 +1,2 @@
-AUX unzip-6.0-natspec.patch 14304 SHA256 cf7b6146b034e5687e77c328a9e55efc68ddb75636fdcce84853995ab60082dd SHA512 189ce2045430d2d04e27049672a3cfb205319edab1ac1522700a7f89344e5718235d8a15238390f6b4317af493796a65cac6a83f7dceb402bc736628d7a89cda WHIRLPOOL db49d3f17313f37b87dc0a597ff703474c7607ceae0b0fe456b3407bf915806557d3bcfa1de8df37a6d3f1d9c74a516f88ef1f05606fbe97b085f07c17d79337
-AUX unzip-6.0-no-exec-stack.patch 381 SHA256 ae62249dcf8bbc3c30468b07944df6c8777b565927d9ed6d1fdf7395899ea7c7 SHA512 a00ba3c805aa64bebeb3194cd75093c1e7c951366d40bba4852837dcb355eedf1ca6a6e648ea007fcb71124e778e54b5168a7b38a7b7268bc3983d87594633a5 WHIRLPOOL e838b3835e9cdcbbe5f47bb1ab92b2ce0fffff1ce77e69ee460a9ff9d5ed4a3c16311d65b0a16f14a3b4e22b2c09db1f3d88b35fa978d40e67ad5307e5a29a39
-DIST unzip60.tar.gz 1376845 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d WHIRLPOOL eab32d6d0ab100d302b608658a3ae290d3dad4beddccebaf6cb6527102bb238f751ec6482dea68ae62474005de89f11f9e0cf1b1e12bee2ca5a2336a3c0c9808
-DIST unzip_6.0-20.debian.tar.xz 16680 SHA256 7ddfafb1a771ae8d6b4e25c5e31f22c717e0fe606b1bafadcdd574c01f671490 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe WHIRLPOOL ea5ebd5d95638ff8cd2e91eb77f5be544e33ac6fd478aa00c04da193cd3fad980c5ac1975dfedb2c242192cee6c4eee8bbaf3581299f6c3fa45faa639f0169fd
-EBUILD unzip-6.0_p20.ebuild 2557 SHA256 28da56bf99abfba333e7df31e9c0288123aeb09d5ea1630f19fedd505fb5adf5 SHA512 72014935da1e7acec784f189568fbec2756968811d348594d98e5a4f440579471b9e6348aa57877a18e0e34b6434aa144cd7015a88c5b999805428d4192dd212 WHIRLPOOL 16d6d5c7612bb25877162d572ac88731d313f1d632eadb1f72063063e544d08bde57fd5e87b792adc77adbaf58ada2e3aece28770c583243e7efa2e068f69ce4
-MISC ChangeLog 5049 SHA256 b0c10cf3ce667fc7eb0921a97209fe4337d83375f69510c99a95d4f3f32accbc SHA512 e42d5c5b1e5ccf47f1a1b1a13296d68bf2563f7ec90d67bd0dba798215f1313b14f1671d61f70a4ca77cdde1023b404f72b981655e9f776e2cd3bf2f3fe62aa2 WHIRLPOOL f020fc753e8f5f9def179c888699b879bfd130b73d1768b45c24c30e908a08f870aed8ef851efd8482fb9af1126bf8f436e32002a8ea676391ec7986f7b96680
-MISC ChangeLog-2015 10492 SHA256 d02b2f95413294e2ac375d98127e9465a60c9132166c0d62918d48474992f966 SHA512 06717ced072fc605e067c9018e74e811c3c47c07ae7ec39a7260955b0ba3168ab710a5c76ace3e365c5a90e9ed9976172e2e77a8e985cd4e1154e398244ff200 WHIRLPOOL 3fb404c5672c5977c242380415b7e505eb76af9b7f0028ead8d52f988399fa03f5f3d023aca7e4be95e39133fd49b8a587f3fa6674bc5e97cae8534ab5fbca37
-MISC metadata.xml 476 SHA256 91ce6b527006713ac4c8b533935adac492ace0235b21f7ab4678d75052d78ff3 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653 WHIRLPOOL 039f215da0822c5bf526b0c1a4483af67c0423326b7a149b39f8a216dc18d1c0ff205dee0e872f5ab8a1ae78e0346eddfdbc42922c7f70d9030fde66746cbc96
+DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
+DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/unzip/files/unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch b/sdk_container/src/third_party/portage-stable/app-arch/unzip/files/unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch
new file mode 100644
index 0000000000..ad6a157c56
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/app-arch/unzip/files/unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch
@@ -0,0 +1,50 @@
+From 13f0260beae851f7d5dd96e9ef757d8d6d7daac1 Mon Sep 17 00:00:00 2001
+From: Mark Adler
+Date: Sun, 9 Feb 2020 07:20:13 -0800
+Subject: [PATCH] Fix false overlapped components detection on 32-bit systems.
+
+32-bit systems with ZIP64_SUPPORT enabled could have different
+size types for zoff_t and zusz_t. That resulted in bad parameter
+passing to the bound tracking functions, itself due to the lack of
+use of C function prototypes in unzip. This commit assures that
+parameters are cast properly for those calls.
+
+This problem occurred only for ill-chosen make options, which give
+a 32-bit zoff_t. A proper build will result in a zoff_t of 64 bits,
+even on 32-bit systems.
+---
+ extract.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/extract.c b/extract.c
+index 1b73cb0..d9866f9 100644
+--- a/extract.c
++++ b/extract.c
+@@ -329,7 +329,7 @@ static ZCONST char Far OverlappedComponents[] =
+
+
+ /* A growable list of spans. */
+-typedef zoff_t bound_t;
++typedef zusz_t bound_t;
+ typedef struct {
+ bound_t beg; /* start of the span */
+ bound_t end; /* one past the end of the span */
+@@ -518,7 +518,8 @@ int extract_or_test_files(__G) /* return PK-type error code */
+ return PK_MEM;
+ }
+ if ((G.extra_bytes != 0 &&
+- cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
++ cover_add((cover_t *)G.cover,
++ (bound_t)0, (bound_t)G.extra_bytes) != 0) ||
+ (G.ecrec.have_ecr64 &&
+ cover_add((cover_t *)G.cover, G.ecrec.ec64_start,
+ G.ecrec.ec64_end) != 0) ||
+@@ -1216,7 +1217,7 @@ static int extract_or_test_entrylist(__G__ numchunk,
+
+ /* seek_zipf(__G__ pInfo->offset); */
+ request = G.pInfo->offset + G.extra_bytes;
+- if (cover_within((cover_t *)G.cover, request)) {
++ if (cover_within((cover_t *)G.cover, (bound_t)request)) {
+ Info(slide, 0x401, ((char *)slide,
+ LoadFarString(OverlappedComponents)));
+ return PK_BOMB;
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/unzip/files/unzip-6.0-format-security.patch b/sdk_container/src/third_party/portage-stable/app-arch/unzip/files/unzip-6.0-format-security.patch
new file mode 100644
index 0000000000..c61c135963
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/app-arch/unzip/files/unzip-6.0-format-security.patch
@@ -0,0 +1,91 @@
+Fix build with -Werror=format-security
+
+Origin: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=master-next&id=f7d80257afcfefdc85b6745328f2d12b957a848b
+Author: Edwin Plauchu
+
+diff --git a/extract.c b/extract.c
+index 7cd9123..25c5a62 100644
+--- a/extract.c
++++ b/extract.c
+@@ -475,7 +475,7 @@ int extract_or_test_files(__G) /* return PK-type error code */
+ Info(slide, 0x401, ((char *)slide,
+ LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1));
+ Info(slide, 0x401, ((char *)slide,
+- LoadFarString(ReportMsg)));
++ "%s",LoadFarString(ReportMsg)));
+ error_in_archive = PK_BADERR;
+ }
+ reached_end = TRUE; /* ...so no more left to do */
+@@ -754,8 +754,8 @@ int extract_or_test_files(__G) /* return PK-type error code */
+
+ #ifndef SFX
+ if (no_endsig_found) { /* just to make sure */
+- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
+- Info(slide, 0x401, ((char *)slide, LoadFarString(ReportMsg)));
++ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
++ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(ReportMsg)));
+ if (!error_in_archive) /* don't overwrite stronger error */
+ error_in_archive = PK_WARN;
+ }
+diff --git a/list.c b/list.c
+index 15e0011..0b484f6 100644
+--- a/list.c
++++ b/list.c
+@@ -181,7 +181,7 @@ int list_files(__G) /* return PK-type error code */
+ Info(slide, 0x401,
+ ((char *)slide, LoadFarString(CentSigMsg), j));
+ Info(slide, 0x401,
+- ((char *)slide, LoadFarString(ReportMsg)));
++ ((char *)slide, "%s", LoadFarString(ReportMsg)));
+ return PK_BADERR; /* sig not found */
+ }
+ }
+@@ -507,7 +507,7 @@ int list_files(__G) /* return PK-type error code */
+ && (!G.ecrec.is_zip64_archive)
+ && (memcmp(G.sig, end_central_sig, 4) != 0)
+ ) { /* just to make sure again */
+- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
++ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
+ error_in_archive = PK_WARN; /* didn't find sig */
+ }
+
+@@ -591,7 +591,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */
+ Info(slide, 0x401,
+ ((char *)slide, LoadFarString(CentSigMsg), j));
+ Info(slide, 0x401,
+- ((char *)slide, LoadFarString(ReportMsg)));
++ ((char *)slide, "%s", LoadFarString(ReportMsg)));
+ return PK_BADERR; /* sig not found */
+ }
+ }
+@@ -674,7 +674,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */
+ ---------------------------------------------------------------------------*/
+
+ if (memcmp(G.sig, end_central_sig, 4)) { /* just to make sure again */
+- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
++ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
+ error_in_archive = PK_WARN;
+ }
+ if (*nmember == 0L && error_in_archive <= PK_WARN)
+diff --git a/zipinfo.c b/zipinfo.c
+index 0ac75b3..1e7fa82 100644
+--- a/zipinfo.c
++++ b/zipinfo.c
+@@ -833,7 +833,7 @@ int zipinfo(__G) /* return PK-type error code */
+ Info(slide, 0x401,
+ ((char *)slide, LoadFarString(CentSigMsg), j));
+ Info(slide, 0x401,
+- ((char *)slide, LoadFarString(ReportMsg)));
++ ((char *)slide, "%s", LoadFarString(ReportMsg)));
+ error_in_archive = PK_BADERR; /* sig not found */
+ break;
+ }
+@@ -1022,7 +1022,7 @@ int zipinfo(__G) /* return PK-type error code */
+ && (!G.ecrec.is_zip64_archive)
+ && (memcmp(G.sig, end_central_sig, 4) != 0)
+ ) { /* just to make sure again */
+- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
++ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
+ error_in_archive = PK_WARN; /* didn't find sig */
+ }
+
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/unzip/metadata.xml b/sdk_container/src/third_party/portage-stable/app-arch/unzip/metadata.xml
index 564fd76677..ed43f8ee64 100644
--- a/sdk_container/src/third_party/portage-stable/app-arch/unzip/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/app-arch/unzip/metadata.xml
@@ -9,6 +9,7 @@
Use dev-libs/libnatspec to correctly decode non-ascii file names archived in Windows.
+ cpe:/a:info-zip:unzip
infozip
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p20.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p25-r1.ebuild
similarity index 63%
rename from sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p20.ebuild
rename to sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p25-r1.ebuild
index e97847b095..312b392782 100644
--- a/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p20.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p25-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
-inherit eutils toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic
MY_PV="${PV//.}"
MY_PV="${MY_PV%_p*}"
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
LICENSE="Info-ZIP"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
IUSE="bzip2 natspec unicode"
DEPEND="bzip2? ( app-arch/bzip2 )
@@ -27,14 +27,13 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
local deb="${WORKDIR}"/debian/patches
- rm \
- "${deb}"/series \
- "${deb}"/02-branding-patch-this-is-debian-unzip \
- || die
- epatch "${deb}"/*
+ rm "${deb}"/02-this-is-debian-unzip.patch || die
+ eapply "${deb}"/*.patch
- epatch "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
- use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
+ eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
+ eapply "${FILESDIR}"/${PN}-6.0-format-security.patch
+ eapply "${FILESDIR}"/${PN}-6.0-fix-false-overlap-detection-on-32bit-systems.patch
+ use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
sed -i -r \
-e '/^CFLAGS/d' \
-e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
@@ -54,30 +53,30 @@ src_prepare() {
# Delete bundled code to make sure we don't use it.
rm -r bzip2 || die
- epatch_user
+ eapply_user
}
src_configure() {
case ${CHOST} in
- i?86*-*linux*) TARGET="linux_asm" ;;
- *linux*) TARGET="linux_noasm" ;;
- i?86*-*bsd* | \
- i?86*-dragonfly*) TARGET="freebsd" ;; # mislabelled bsd with x86 asm
- *bsd* | *dragonfly*) TARGET="bsd" ;;
- *-darwin*) TARGET="macosx" ;;
- *-cygwin*) TARGET="cygwin" ;;
- *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;;
+ i?86*-*linux*) TARGET="linux_asm" ;;
+ *linux*) TARGET="linux_noasm" ;;
+ i?86*-*bsd* | \
+ i?86*-dragonfly*) TARGET="freebsd" ;; # mislabelled bsd with x86 asm
+ *bsd* | *dragonfly*) TARGET="bsd" ;;
+ *-darwin*) TARGET="macosx" ;;
+ *-cygwin*) TARGET="cygwin" ;;
+ *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;;
esac
[[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
use bzip2 && append-cppflags -DUSE_BZIP2
- use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
+ use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING
append-cppflags -DLARGE_FILE_SUPPORT #281473
}
src_compile() {
ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \
- emake -f unix/Makefile ${TARGET}
+ emake -f unix/Makefile ${TARGET}
}
src_install() {
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/unzip-6.0_p20 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/unzip-6.0_p20
deleted file mode 100644
index c1c530a468..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/unzip-6.0_p20
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
-DESCRIPTION=unzipper for pkzip-compressed files
-EAPI=5
-HOMEPAGE=http://www.info-zip.org/
-IUSE=bzip2 natspec unicode
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=Info-ZIP
-RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
-SLOT=0
-SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz mirror://debian/pool/main/u/unzip/unzip_6.0-20.debian.tar.xz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c4cb8e1105df8a892a2fdf16331040ed
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/unzip-6.0_p25-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/unzip-6.0_p25-r1
new file mode 100644
index 0000000000..dc33383709
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/unzip-6.0_p25-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
+DESCRIPTION=unzipper for pkzip-compressed files
+EAPI=7
+HOMEPAGE=http://www.info-zip.org/
+IUSE=bzip2 natspec unicode
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux
+LICENSE=Info-ZIP
+RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
+SLOT=0
+SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz mirror://debian/pool/main/u/unzip/unzip_6.0-25.debian.tar.xz
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529
+_md5_=5e8010bbeeed80d84f20d50c19c6e463
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/libidn2-2.1.1a-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/libidn2-2.3.0
similarity index 76%
rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/libidn2-2.1.1a-r1
rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/libidn2-2.3.0
index a578641c6e..a684af7aaa 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/libidn2-2.1.1a-r1
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/libidn2-2.3.0
@@ -5,10 +5,10 @@ DESCRIPTION=An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5
EAPI=7
HOMEPAGE=https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2
IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2+ LGPL-3+
RDEPEND=dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0/2
-SRC_URI=mirror://gnu/libidn/libidn2-2.1.1a.tar.gz
+SRC_URI=mirror://gnu/libidn/libidn2-2.3.0.tar.gz
_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529
-_md5_=78dd35a2c38e174ebbf4a629dde2ddb3
+_md5_=ee961a5d1c78afac9035d9c27815ff51
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/libidn2-99999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/libidn2-99999
index cf8e77190e..8b739f9865 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/libidn2-99999
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/libidn2-99999
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_
SLOT=0/2
SRC_URI=mirror://gnu/libunistring/libunistring-0.9.10.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 git-r3 0d4635eeb5a96cd5315597a47eba25c9 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529
-_md5_=74288d292ae7d301f19897fceb600f7f
+_md5_=a7904084a41629420b1bed44f521b6fa
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_p20180211 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_p20180211
deleted file mode 100644
index de560b3ef8..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_p20180211
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=!binary? ( amd64? ( >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) )
-DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
-EAPI=6
-HOMEPAGE=https://github.com/tianocore/edk2
-IUSE=+binary
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd
-LICENSE=BSD-2 MIT
-REQUIRED_USE=!amd64? ( binary )
-SLOT=0
-SRC_URI=binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-2017_p20180211-bin.tar.xz ) !binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-2017_p20180211.tar.xz )
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0a741e74eb539b44eeaa8afa027eb874
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_pre20170505-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_pre20170505-r1
deleted file mode 100644
index 68c07fb873..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_pre20170505-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=!binary? ( amd64? ( >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) )
-DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
-EAPI=6
-HOMEPAGE=https://github.com/tianocore/edk2
-IUSE=+binary
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd
-LICENSE=BSD-2 MIT
-REQUIRED_USE=!amd64? ( binary )
-SLOT=0
-SRC_URI=binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-2017_pre20170505-bin.tar.xz ) !binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-2017_pre20170505.tar.xz )
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=efa6a9467bbabf95085c5bcf8652b118
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/edk2-ovmf-201905 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/edk2-ovmf-201905
new file mode 100644
index 0000000000..6ed1cca2e9
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/edk2-ovmf-201905
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=!binary? ( amd64? ( app-emulation/qemu >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( dev-lang/python:3.7[sqlite] dev-lang/python:3.6[sqlite] ) ) )
+DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
+EAPI=7
+HOMEPAGE=https://github.com/tianocore/edk2
+IUSE=+binary
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
+LICENSE=BSD-2 MIT
+REQUIRED_USE=!amd64? ( binary )
+SLOT=0
+SRC_URI=!binary? ( https://github.com/tianocore/edk2/archive/edk2-stable201905.tar.gz -> edk2-ovmf-201905.tar.gz https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-201905-bundled.tar.xz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-201905-bin.tar.xz )
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529
+_md5_=eea5a2cfea6d246a2aab5992d39d1fe4
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/edk2-ovmf-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/edk2-ovmf-9999
deleted file mode 100644
index a7e7116e00..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/edk2-ovmf-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=>=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
-EAPI=6
-HOMEPAGE=https://github.com/tianocore/edk2
-LICENSE=BSD-2 MIT
-SLOT=0
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-r3 0d4635eeb5a96cd5315597a47eba25c9 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=692329e3c4a299152da515b5749240d1
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/edk2-ovmf-999999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/edk2-ovmf-999999
new file mode 100644
index 0000000000..acd372a29d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/edk2-ovmf-999999
@@ -0,0 +1,10 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=app-emulation/qemu >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( dev-lang/python:3.7[sqlite] dev-lang/python:3.6[sqlite] )
+DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
+EAPI=7
+HOMEPAGE=https://github.com/tianocore/edk2
+LICENSE=BSD-2 MIT
+SLOT=0
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-r3 0d4635eeb5a96cd5315597a47eba25c9 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529
+_md5_=1b4d9267e81e3b131d3692cd08dedb16
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20130925 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20130925
deleted file mode 100644
index 91e84a4d62..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20130925
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux virtual/cdrtools )
-DESCRIPTION=Open source network boot (PXE) firmware
-EAPI=5
-HOMEPAGE=http://ipxe.org
-IUSE=efi ipv6 iso lkrn +qemu undi usb vmware savedconfig
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://git.ipxe.org/ipxe.git/snapshot/cba22d36b77da53890bd65fdadd0e63925687af0.tar.bz2 -> ipxe-1.0.0_p20130925-cba22d3.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=61f16e8018169fcda5612e2428dddf6a
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20160620 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20160620
deleted file mode 100644
index 700b7b086b..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20160620
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux virtual/cdrtools )
-DESCRIPTION=Open source network boot (PXE) firmware
-EAPI=5
-HOMEPAGE=http://ipxe.org/
-IUSE=efi ipv6 iso lkrn +qemu undi usb vmware savedconfig
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://git.ipxe.org/ipxe.git/snapshot/694c18addc0dfdf51369f6d598dd0c8ca4bf2861.tar.bz2 -> ipxe-1.0.0_p20160620-694c18a.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f062dc79cce1e58b040b98498992f45f
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
index 006f2f0c3e..914a138c19 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
@@ -4,10 +4,10 @@ DESCRIPTION=Open source network boot (PXE) firmware
EAPI=6
HOMEPAGE=http://ipxe.org/
IUSE=+binary efi ipv6 iso lkrn +qemu undi usb vmware savedconfig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86
LICENSE=GPL-2
REQUIRED_USE=!amd64? ( !x86? ( binary ) )
SLOT=0
SRC_URI=!binary? ( https://git.ipxe.org/ipxe.git/snapshot/546dd51de8459d4d09958891f426fa2c73ff090d.tar.bz2 -> ipxe-1.0.0_p20180211-546dd51.tar.bz2 ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.0.0_p20180211-546dd51-bin.tar.xz )
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7cc33431b5d522a470cc2e171208c664
+_md5_=c83860e1337dc159ca5df79d3bc78fc2
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
new file mode 100644
index 0000000000..71f299cd9c
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst
+DEPEND=!binary? ( amd64? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux virtual/cdrtools ) ) x86? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux virtual/cdrtools ) ) )
+DESCRIPTION=Open source network boot (PXE) firmware
+EAPI=6
+HOMEPAGE=http://ipxe.org/
+IUSE=+binary efi ipv6 iso lkrn +qemu undi usb vmware savedconfig
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86
+LICENSE=GPL-2
+REQUIRED_USE=!amd64? ( !x86? ( binary ) )
+SLOT=0
+SRC_URI=!binary? ( https://git.ipxe.org/ipxe.git/snapshot/a4f8c6e31f6c62522cfc633bbbffa81b22f9d6f3.tar.bz2 -> ipxe-1.0.0_p20190728-a4f8c6e.tar.bz2 ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.0.0_p20190728-a4f8c6e-bin.tar.xz )
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=434109d277ea576b9a5c1ea2ba8d73ff
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/seabios-1.10.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/seabios-1.10.2
index 63a17d7a9c..bbbc445678 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/seabios-1.10.2
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/seabios-1.10.2
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install pretend setup unpack
-DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) ) x86? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) ) )
+DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 ) ) x86? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 ) ) )
DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
EAPI=6
HOMEPAGE=https://www.seabios.org/
IUSE=+binary debug +seavgabios
-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 ~sparc x86
LICENSE=LGPL-3 GPL-3
REQUIRED_USE=debug? ( !binary ) !amd64? ( !x86? ( binary ) )
SLOT=0
SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.2.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.10.2-bin.tar.xz )
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fcadd2aefc816c02906cc4a13cc472a5
+_md5_=5347d234ff052692d8cdfb436b2d8eaa
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/seabios-1.11.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/seabios-1.11.0
index 56d20bdf96..f41da9fe88 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/seabios-1.11.0
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/seabios-1.11.0
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install pretend setup unpack
-DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) ) x86? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) ) )
+DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 ) ) x86? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 ) ) )
DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
EAPI=6
HOMEPAGE=https://www.seabios.org/
IUSE=+binary debug +seavgabios
-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 ~sparc x86
LICENSE=LGPL-3 GPL-3
REQUIRED_USE=debug? ( !binary ) !amd64? ( !x86? ( binary ) )
SLOT=0
SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.11.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.11.0-bin.tar.xz )
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a0cf7a6fc06b550bf09c5058bfde572e
+_md5_=8e0a7808510cfa8b180aba7eef8d37fe
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/seabios-1.11.0-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/seabios-1.11.0-r1
new file mode 100644
index 0000000000..2ce431e0fb
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/seabios-1.11.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend setup unpack
+DEPEND=!binary? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 ) )
+DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
+EAPI=6
+HOMEPAGE=https://www.seabios.org/
+IUSE=+binary debug +seavgabios
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-3 GPL-3
+REQUIRED_USE=debug? ( !binary )
+SLOT=0
+SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.11.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.11.0-bin.tar.xz )
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6aa46c0ebde184650dedee246ca2d996
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/seabios-1.12.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/seabios-1.12.0
new file mode 100644
index 0000000000..bf6c1435ab
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/seabios-1.12.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend setup unpack
+DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 ) ) x86? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 ) ) )
+DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
+EAPI=7
+HOMEPAGE=https://www.seabios.org/
+IUSE=+binary debug +seavgabios
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+LICENSE=LGPL-3 GPL-3
+REQUIRED_USE=debug? ( !binary ) !amd64? ( !x86? ( binary ) )
+SLOT=0
+SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.12.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.12.0-bin.tar.xz )
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529
+_md5_=d51d6a10923d80d9aba9d86218dd214f
diff --git a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/Manifest b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/Manifest
index 6d7914c3be..312cdf2cbb 100644
--- a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/Manifest
+++ b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/Manifest
@@ -1,2 +1,2 @@
-DIST libidn2-2.1.1a.tar.gz 2122867 BLAKE2B 616bdf4c2c5095a29511db293fa908d4cac23f77e17bb6c60f8aa8c8a8a10f1b4e8b84b82406599fe0cc7122fd89c50ec252f1716198f72496800a19924fa09c SHA512 404a739e33d324f700ac8e8119de3feef0de778bbb11be09049cb64eab447cd101883f6d489cca1e88c230f58bcaf9758fe102e571b6501450aa750ec2a4a9c6
+DIST libidn2-2.3.0.tar.gz 2164993 BLAKE2B 3c103831c39fa3fd0340c9c45f3f683483207ade9cadc8d85b046a698f75bbe5ce6829de69a5cb238404d243b7a39ef44d69ea4ea80c22b813eafbacae615a8b SHA512 a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187
DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
diff --git a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.0.ebuild
similarity index 74%
rename from sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild
rename to sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.0.ebuild
index c6f5d34895..b9f268e6d5 100644
--- a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="
LICENSE="GPL-2+ LGPL-3+"
SLOT="0/2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="
@@ -43,8 +43,7 @@ multilib_src_configure() {
$(use_enable static-libs static) \
--disable-doc \
--disable-gcc-warnings \
- --disable-gtk-doc \
- --disable-silent-rules
+ --disable-gtk-doc
}
multilib_src_install() {
diff --git a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-99999.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-99999.ebuild
index 408ce3cd2a..c678e41668 100644
--- a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-99999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-99999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,8 +33,9 @@ src_unpack() {
src_prepare() {
mv "${WORKDIR}"/libunistring-0.9.10 unistring || die
- einfo "./bootstrap"
- ./bootstrap --gnulib-srcdir=gnulib --no-bootstrap-sync --no-git --skip-po || die
+ AUTORECONF=: sh bootstrap \
+ --gnulib-srcdir=gnulib --no-bootstrap-sync --no-git --skip-po \
+ || die
default
@@ -55,8 +56,7 @@ multilib_src_configure() {
$(use_enable static-libs static) \
--disable-doc \
--disable-gcc-warnings \
- --disable-gtk-doc \
- --disable-silent-rules
+ --disable-gtk-doc
}
multilib_src_install() {
diff --git a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/metadata.xml b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/metadata.xml
index 5ba62861f1..87360eddc9 100644
--- a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/metadata.xml
@@ -4,4 +4,7 @@
jer@gentoo.org
+
+cpe:/a:libidn2_project:libidn2
+
diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/Manifest b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/Manifest
index a061a11c71..fa1a6639d9 100644
--- a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/Manifest
@@ -1,4 +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-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/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
deleted file mode 100644
index ba74bacb77..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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} == "9999" ]] ; 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} != "9999" ]] && use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
- if [[ ${PV} != "9999" ]] && use binary; then
- eapply_user
- return
- fi
- default
-}
-
-src_compile() {
- TARGET_ARCH=X64
- TARGET_NAME=RELEASE
- TARGET_TOOLS=GCC49
-
- [[ ${PV} != "9999" ]] && use binary && return
-
- emake ARCH=${TARGET_ARCH} -C BaseTools -j1
-
- . ./edksetup.sh
-
- ./OvmfPkg/build.sh \
- -a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
- -D FD_SIZE_2MB \
- || die "OvmfPkg/build.sh failed"
-}
-
-src_install() {
- local builddir="Build/OvmfX64/${TARGET_NAME}_${TARGET_TOOLS}/FV"
-
- insinto /usr/share/${PN}
- doins "${builddir}"/OVMF{,_CODE,_VARS}.fd
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild
deleted file mode 100644
index 502a513b8b..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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}
-"
-NON_BINARY_DEPEND="
- >=dev-lang/nasm-2.0.7
- >=sys-power/iasl-20160729
- ${PYTHON_DEPS}
-"
-DEPEND=""
-RDEPEND=""
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/tianocore/edk2"
- DEPEND+="
- ${NON_BINARY_DEPEND}
- "
-else
- SRC_URI="
- binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
- !binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz )"
- KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
- IUSE="+binary"
- REQUIRED_USE+="
- !amd64? ( binary )
- "
- DEPEND+="
- !binary? (
- amd64? (
- ${NON_BINARY_DEPEND}
- )
- )"
- PATCHES=(
- "${FILESDIR}"/${P}-build_system_fixes.patch
- )
-fi
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
-virtual machines. The firmware is located under
- /usr/share/edk2-ovmf/OVMF.fd
- /usr/share/edk2-ovmf/OVMF_CODE.fd
- /usr/share/edk2-ovmf/OVMF_VARS.fd
-
-The firmware does not support csm (due to no free csm implementation
-available). If you need a firmware with csm support you have to download
-one for yourself. Firmware blobs are commonly labeled
- OVMF{,_CODE,_VARS}-with-csm.fd
-
-In order to use the firmware you can run qemu the following way
-
- $ qemu-system-x86_64 \
- -drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
- ...
-
-You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
- nvram = [
- \"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
- ]"
-
-pkg_setup() {
- [[ ${PV} != "9999" ]] && use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
- if [[ ${PV} != "9999" ]] && use binary; then
- eapply_user
- return
- fi
- default
-}
-
-src_compile() {
- TARGET_ARCH=X64
- TARGET_NAME=RELEASE
- TARGET_TOOLS=GCC49
-
- [[ ${PV} != "9999" ]] && use binary && return
-
- emake ARCH=${TARGET_ARCH} -C BaseTools -j1
-
- . ./edksetup.sh
-
- ./OvmfPkg/build.sh \
- -a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
- -D FD_SIZE_2MB \
- || die "OvmfPkg/build.sh failed"
-}
-
-src_install() {
- local builddir="Build/OvmfX64/${TARGET_NAME}_${TARGET_TOOLS}/FV"
-
- insinto /usr/share/${PN}
- doins "${builddir}"/OVMF{,_CODE,_VARS}.fd
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
new file mode 100644
index 0000000000..1abe540a07
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit eutils python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+NON_BINARY_DEPEND="
+ app-emulation/qemu
+ >=dev-lang/nasm-2.0.7
+ >=sys-power/iasl-20160729
+ ${PYTHON_DEPS}
+"
+DEPEND=""
+RDEPEND=""
+if [[ ${PV} == "999999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/tianocore/edk2"
+ DEPEND+="
+ ${NON_BINARY_DEPEND}
+ "
+else
+ # Binary versions taken from fedora:
+ # http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
+ # edk2-ovmf-20190501stable-2.fc31.noarch.rpm
+ SRC_URI="
+ !binary? (
+ https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.xz
+ )
+ binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
+ "
+ KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+ IUSE="+binary"
+ REQUIRED_USE+="
+ !amd64? ( binary )
+ "
+ DEPEND+="
+ !binary? (
+ amd64? (
+ ${NON_BINARY_DEPEND}
+ )
+ )"
+ PATCHES=(
+ )
+fi
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+
+S="${WORKDIR}/edk2-edk2-stable${PV}"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+ /usr/share/edk2-ovmf/OVMF_CODE.fd
+ /usr/share/edk2-ovmf/OVMF_VARS.fd
+ /usr/share/edk2-ovmf/OVMF_CODE.secboot.fd
+
+If USE=binary is enabled, we also install an OVMF variables file (coming from
+fedora) that contains secureboot default keys
+
+ /usr/share/edk2-ovmf/OVMF_VARS.secboot.fd
+
+If you have compiled this package by hand, you need to either populate all
+necessary EFI variables by hand by booting
+ /usr/share/edk2-ovmf/UefiShell.(iso|img)
+or creating OVMF_VARS.secboot.fd by hand:
+ https://github.com/puiterwijk/qemu-ovmf-secureboot
+
+The firmware does not support csm (due to no free csm implementation
+available). If you need a firmware with csm support you have to download
+one for yourself. Firmware blobs are commonly labeled
+ OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+ $ qemu-system-x86_64 \
+ -drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+ ...
+
+You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
+ nvram = [
+ \"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+ \"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+ ]"
+
+pkg_setup() {
+ [[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ if [[ ${PV} != "999999" ]] && use binary; then
+ eapply_user
+ return
+ fi
+ default
+}
+
+src_compile() {
+ TARGET_ARCH=X64
+ TARGET_NAME=RELEASE
+ TARGET_TOOLS=GCC49
+
+ BUILD_FLAGS="-D TLS_ENABLE \
+ -D HTTP_BOOT_ENABLE \
+ -D NETWORK_IP6_ENABLE \
+ -D FD_SIZE_2MB"
+
+ SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
+ -D SECURE_BOOT_ENABLE \
+ -D SMM_REQUIRE \
+ -D EXCLUDE_SHELL_FROM_FD"
+
+ [[ ${PV} != "999999" ]] && use binary && return
+
+ emake ARCH=${TARGET_ARCH} -C BaseTools
+
+ . ./edksetup.sh
+
+ # Build all EFI firmware blobs:
+
+ mkdir -p ovmf
+
+ ./OvmfPkg/build.sh \
+ -a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+ ${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+ cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
+ rm -rf Build/OvmfX64
+
+ ./OvmfPkg/build.sh \
+ -a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+ ${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+ cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
+ cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
+ cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
+
+ # Build a convenience UefiShell.img:
+
+ mkdir -p iso_image/efi/boot || die "mkdir failed"
+ cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
+ cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
+ qemu-img convert --image-opts \
+ driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
+ ovmf/UefiShell.img || die "qemu-img failed"
+}
+
+src_install() {
+ insinto /usr/share/${PN}
+ doins ovmf/*
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild
deleted file mode 100644
index 9fc2de7937..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
-HOMEPAGE="https://github.com/tianocore/edk2"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
-"
-NON_BINARY_DEPEND="
- >=dev-lang/nasm-2.0.7
- >=sys-power/iasl-20160729
- ${PYTHON_DEPS}
-"
-DEPEND=""
-RDEPEND=""
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/tianocore/edk2"
- DEPEND+="
- ${NON_BINARY_DEPEND}
- "
-else
- SRC_URI="
- binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
- !binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz )"
- KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
- IUSE="+binary"
- REQUIRED_USE+="
- !amd64? ( binary )
- "
- DEPEND+="
- !binary? (
- amd64? (
- ${NON_BINARY_DEPEND}
- )
- )"
- PATCHES=(
- "${FILESDIR}"/${P}-build_system_fixes.patch
- )
-fi
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
-virtual machines. The firmware is located under
- /usr/share/edk2-ovmf/OVMF.fd
- /usr/share/edk2-ovmf/OVMF_CODE.fd
- /usr/share/edk2-ovmf/OVMF_VARS.fd
-
-The firmware does not support csm (due to no free csm implementation
-available). If you need a firmware with csm support you have to download
-one for yourself. Firmware blobs are commonly labeled
- OVMF{,_CODE,_VARS}-with-csm.fd
-
-In order to use the firmware you can run qemu the following way
-
- $ qemu-system-x86_64 \
- -drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
- ...
-
-You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
- nvram = [
- \"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
- ]"
-
-pkg_setup() {
- [[ ${PV} != "9999" ]] && use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
- if [[ ${PV} != "9999" ]] && use binary; then
- eapply_user
- return
- fi
- default
-}
-
-src_compile() {
- TARGET_ARCH=X64
- TARGET_NAME=RELEASE
- TARGET_TOOLS=GCC49
-
- [[ ${PV} != "9999" ]] && use binary && return
-
- emake ARCH=${TARGET_ARCH} -C BaseTools
-
- . ./edksetup.sh
-
- ./OvmfPkg/build.sh \
- -a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
- -D FD_SIZE_2MB \
- || die "OvmfPkg/build.sh failed"
-}
-
-src_install() {
- local builddir="Build/OvmfX64/${TARGET_NAME}_${TARGET_TOOLS}/FV"
-
- insinto /usr/share/${PN}
- doins "${builddir}"/OVMF{,_CODE,_VARS}.fd
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
new file mode 100644
index 0000000000..e8acffa9d2
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit eutils python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+NON_BINARY_DEPEND="
+ app-emulation/qemu
+ >=dev-lang/nasm-2.0.7
+ >=sys-power/iasl-20160729
+ ${PYTHON_DEPS}
+"
+DEPEND=""
+RDEPEND=""
+if [[ ${PV} == "999999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/tianocore/edk2"
+ DEPEND+="
+ ${NON_BINARY_DEPEND}
+ "
+else
+ SRC_URI=""
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+ IUSE="+binary"
+ REQUIRED_USE+="
+ !amd64? ( binary )
+ "
+ DEPEND+="
+ !binary? (
+ amd64? (
+ ${NON_BINARY_DEPEND}
+ )
+ )"
+ PATCHES=(
+ )
+fi
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+ /usr/share/edk2-ovmf/OVMF_CODE.fd
+ /usr/share/edk2-ovmf/OVMF_VARS.fd
+ /usr/share/edk2-ovmf/OVMF_CODE.secboot.fd
+
+If USE=binary is enabled, we also install an OVMF variables file (coming from
+fedora) that contains secureboot default keys
+
+ /usr/share/edk2-ovmf/OVMF_VARS.secboot.fd
+
+If you have compiled this package by hand, you need to either populate all
+necessary EFI variables by hand by booting
+ /usr/share/edk2-ovmf/UefiShell.(iso|img)
+or creating OVMF_VARS.secboot.fd by hand:
+ https://github.com/puiterwijk/qemu-ovmf-secureboot
+
+The firmware does not support csm (due to no free csm implementation
+available). If you need a firmware with csm support you have to download
+one for yourself. Firmware blobs are commonly labeled
+ OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+ $ qemu-system-x86_64 \
+ -drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+ ...
+
+You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
+ nvram = [
+ \"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+ \"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+ ]"
+
+pkg_setup() {
+ [[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ if [[ ${PV} != "999999" ]] && use binary; then
+ eapply_user
+ return
+ fi
+ default
+}
+
+src_compile() {
+ TARGET_ARCH=X64
+ TARGET_NAME=RELEASE
+ TARGET_TOOLS=GCC49
+
+ BUILD_FLAGS="-D TLS_ENABLE \
+ -D HTTP_BOOT_ENABLE \
+ -D NETWORK_IP6_ENABLE \
+ -D FD_SIZE_2MB"
+
+ SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
+ -D SECURE_BOOT_ENABLE \
+ -D SMM_REQUIRE \
+ -D EXCLUDE_SHELL_FROM_FD"
+
+ [[ ${PV} != "999999" ]] && use binary && return
+
+ emake ARCH=${TARGET_ARCH} -C BaseTools
+
+ . ./edksetup.sh
+
+ # Build all EFI firmware blobs:
+
+ mkdir -p ovmf
+
+ ./OvmfPkg/build.sh \
+ -a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+ ${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+ cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
+ rm -rf Build/OvmfX64
+
+ ./OvmfPkg/build.sh \
+ -a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+ ${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+ cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
+ cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
+ cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
+
+ # Build a convenience UefiShell.img:
+
+ mkdir -p iso_image/efi/boot || die "mkdir failed"
+ cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
+ cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
+ qemu-img convert --image-opts \
+ driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
+ ovmf/UefiShell.img || die "qemu-img failed"
+}
+
+src_install() {
+ insinto /usr/share/${PN}
+ doins ovmf/*
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_p20180211-build_system_fixes.patch b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_p20180211-build_system_fixes.patch
deleted file mode 100644
index cdb465336e..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_p20180211-build_system_fixes.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-index 427ad60..c2b6d83 100755
---- a/BaseTools/Conf/tools_def.template
-+++ b/BaseTools/Conf/tools_def.template
-@@ -4500,7 +4500,7 @@ RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG =
- NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug
- *_*_*_DTC_FLAGS = -H epapr
-
--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
-@@ -4535,7 +4535,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
-@@ -6139,7 +6139,7 @@ RELEASE_CLANG38_AARCH64_DLINK_FLAGS = DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl
- *_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
-@@ -6162,7 +6162,7 @@ RELEASE_CLANG38_AARCH64_DLINK_FLAGS = DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl
- *_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
-@@ -7553,7 +7553,7 @@ NOOPT_MYTOOLS_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
- ##################
- # ASL definitions
- ##################
--*_XCODE5_*_ASLCC_FLAGS = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h
-+*_XCODE5_*_ASLCC_FLAGS = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -c -include AutoGen.h
- *_XCODE5_*_ASLDLINK_FLAGS = -e _ReferenceAcpiTable -preload -segalign 0x20 -pie -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
- *_XCODE5_*_ASLPP_FLAGS = -x c -E -include AutoGen.h
- *_XCODE5_*_ASL_FLAGS =
-@@ -7581,9 +7581,9 @@ RELEASE_XCODE5_IA32_ASM_FLAGS = -arch i386
- *_XCODE5_IA32_NASM_FLAGS = -f macho32
-
-
-- DEBUG_XCODE5_IA32_CC_FLAGS = -arch i386 -c -g -Os -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
--RELEASE_XCODE5_IA32_CC_FLAGS = -arch i386 -c -Os -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -Wno-unused-const-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
-- NOOPT_XCODE5_IA32_CC_FLAGS = -arch i386 -c -g -O0 -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
-+ DEBUG_XCODE5_IA32_CC_FLAGS = -arch i386 -c -g -Os -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
-+RELEASE_XCODE5_IA32_CC_FLAGS = -arch i386 -c -Os -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -Wno-unused-const-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
-+ NOOPT_XCODE5_IA32_CC_FLAGS = -arch i386 -c -g -O0 -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
-
- ##################
- # X64 definitions
-@@ -7600,9 +7600,9 @@ RELEASE_XCODE5_X64_ASM_FLAGS = -arch x86_64
- *_XCODE5_*_PP_FLAGS = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
- *_XCODE5_*_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
-
-- DEBUG_XCODE5_X64_CC_FLAGS = -target x86_64-pc-win32-macho -c -g -Os -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)
-- NOOPT_XCODE5_X64_CC_FLAGS = -target x86_64-pc-win32-macho -c -g -O0 -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)
--RELEASE_XCODE5_X64_CC_FLAGS = -target x86_64-pc-win32-macho -c -Os -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -Wno-unused-const-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)
-+ DEBUG_XCODE5_X64_CC_FLAGS = -target x86_64-pc-win32-macho -c -g -Os -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)
-+ NOOPT_XCODE5_X64_CC_FLAGS = -target x86_64-pc-win32-macho -c -g -O0 -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)
-+RELEASE_XCODE5_X64_CC_FLAGS = -target x86_64-pc-win32-macho -c -Os -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -Wno-unused-const-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)
-
- ####################################################################################
- #
-diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
-index 0976973..d9ee70e 100644
---- a/BaseTools/Source/C/Makefiles/header.makefile
-+++ b/BaseTools/Source/C/Makefiles/header.makefile
-@@ -71,9 +71,9 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKE
- BUILD_CPPFLAGS = $(INCLUDE) -O2
- ifeq ($(DARWIN),Darwin)
- # assume clang or clang compatible flags on OS X
--BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g
-+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g
- else
--BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g
-+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g
- endif
- BUILD_LFLAGS =
- BUILD_CXXFLAGS = -Wno-unused-result
diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_pre20170505-build_system_fixes.patch b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_pre20170505-build_system_fixes.patch
deleted file mode 100644
index 68b14e36fd..0000000000
--- a/sdk_container/src/third_party/portage-stable/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 $(DEST_DIR_DEBUG)/AutoGen.h
- *_XCODE32_IA32_VFRPP_FLAGS = -arch i386 -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
-- DEBUG_XCODE32_IA32_CC_FLAGS = -arch i386 -save-temps -g -O0 -combine -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector
--RELEASE_XCODE32_IA32_CC_FLAGS = -arch i386 -Oz -combine -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector
-+ DEBUG_XCODE32_IA32_CC_FLAGS = -arch i386 -save-temps -g -O0 -combine -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector
-+RELEASE_XCODE32_IA32_CC_FLAGS = -arch i386 -Oz -combine -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector
-
--*_XCODE32_IA32_ASLCC_FLAGS = -arch i386 -x c -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic
-+*_XCODE32_IA32_ASLCC_FLAGS = -arch i386 -x c -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic
- *_XCODE32_IA32_ASLDLINK_FLAGS = -arch i386 -e _main -preload -segalign 0x20 -pie -seg1addr 0x220 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
- *_XCODE32_IA32_ASLPP_FLAGS = -arch i386 -x c -E -include AutoGen.h
- *_XCODE32_IA32_ASL_FLAGS =
-@@ -7328,8 +7328,8 @@ RELEASE_XCODE32_X64_ASM_FLAGS = -arch x86_64
- *_XCODE32_X64_PP_FLAGS = -arch x86_64 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
- *_XCODE32_X64_VFRPP_FLAGS = -arch x86_64 -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
-
-- DEBUG_XCODE32_X64_CC_FLAGS = -arch x86_64 -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-address -fomit-frame-pointer -static -c -include AutoGen.h -fno-stack-protector
--RELEASE_XCODE32_X64_CC_FLAGS = -arch x86_64 -Oz -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-address -fomit-frame-pointer -static -c -include AutoGen.h -fno-stack-protector
-+ DEBUG_XCODE32_X64_CC_FLAGS = -arch x86_64 -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -Wno-address -fomit-frame-pointer -static -c -include AutoGen.h -fno-stack-protector
-+RELEASE_XCODE32_X64_CC_FLAGS = -arch x86_64 -Oz -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -Wno-address -fomit-frame-pointer -static -c -include AutoGen.h -fno-stack-protector
-
- ##################
- # ARM definitions - (Assumes iPhone SDK installed on Snow Leopard)
-@@ -7357,8 +7357,8 @@ RELEASE_XCODE32_ARM_ASM_FLAGS = $(ARCHASM_FLAGS)
- *_XCODE32_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
- *_XCODE32_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
-
-- DEBUG_XCODE32_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -g -Oz -mabi=aapcs -mapcs -fno-short-enums -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h
--RELEASE_XCODE32_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -Oz -mabi=aapcs -mapcs -fno-short-enums -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h
-+ DEBUG_XCODE32_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -g -Oz -mabi=aapcs -mapcs -fno-short-enums -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h
-+RELEASE_XCODE32_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -Oz -mabi=aapcs -mapcs -fno-short-enums -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h
-
-
- ####################################################################################
-@@ -7403,8 +7403,8 @@ RELEASE_XCLANG_IA32_DLINK_FLAGS = -arch i386 -u _$(IMAGE_ENTRY_POINT) -e _$
- RELEASE_XCLANG_IA32_ASM_FLAGS = -arch i386
- *_XCLANG_IA32_NASM_FLAGS = -f macho32
-
-- DEBUG_XCLANG_IA32_CC_FLAGS = -arch i386 -c -g -O0 -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -mno-sse -mno-mmx -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -fasm-blocks -mms-bitfields -msoft-float -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
--RELEASE_XCLANG_IA32_CC_FLAGS = -arch i386 -c -Os -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -mno-sse -mno-mmx -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -fasm-blocks -mms-bitfields -msoft-float -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
-+ DEBUG_XCLANG_IA32_CC_FLAGS = -arch i386 -c -g -O0 -Wall -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -mno-sse -mno-mmx -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -fasm-blocks -mms-bitfields -msoft-float -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
-+RELEASE_XCLANG_IA32_CC_FLAGS = -arch i386 -c -Os -Wall -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -mno-sse -mno-mmx -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -fasm-blocks -mms-bitfields -msoft-float -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
-
-
- ##################
-@@ -7420,9 +7420,9 @@ RELEASE_XCLANG_X64_ASM_FLAGS = -arch x86_64
- *_XCLANG_*_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
-
-
-- DEBUG_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -g -O0 -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
--RELEASE_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -Os -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
--*_XCLANG_*_ASLCC_FLAGS = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic
-+ DEBUG_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -g -O0 -Wall -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
-+RELEASE_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -Os -Wall -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
-+*_XCLANG_*_ASLCC_FLAGS = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic
- *_XCLANG_*_ASLDLINK_FLAGS = -e _main -preload -segalign 0x20 -pie -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
- *_XCLANG_*_ASLPP_FLAGS = -x c -E -include AutoGen.h
- *_XCLANG_*_ASL_FLAGS =
-@@ -7472,9 +7472,9 @@ RELEASE_XCODE5_IA32_ASM_FLAGS = -arch i386
- *_XCODE5_IA32_NASM_FLAGS = -f macho32
-
-
-- DEBUG_XCODE5_IA32_CC_FLAGS = -arch i386 -c -g -Os -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
--RELEASE_XCODE5_IA32_CC_FLAGS = -arch i386 -c -Os -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
-- NOOPT_XCODE5_IA32_CC_FLAGS = -arch i386 -c -g -O0 -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
-+ DEBUG_XCODE5_IA32_CC_FLAGS = -arch i386 -c -g -Os -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
-+RELEASE_XCODE5_IA32_CC_FLAGS = -arch i386 -c -Os -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
-+ NOOPT_XCODE5_IA32_CC_FLAGS = -arch i386 -c -g -O0 -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
-
-
-
-@@ -7494,11 +7494,11 @@ RELEASE_XCODE5_X64_ASM_FLAGS = -arch x86_64
- *_XCODE5_*_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
-
-
-- DEBUG_XCODE5_X64_CC_FLAGS = -target x86_64-pc-win32-macho -c -g -Os -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
-- NOOPT_XCODE5_X64_CC_FLAGS = -target x86_64-pc-win32-macho -c -g -O0 -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
--RELEASE_XCODE5_X64_CC_FLAGS = -target x86_64-pc-win32-macho -c -Os -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
-+ DEBUG_XCODE5_X64_CC_FLAGS = -target x86_64-pc-win32-macho -c -g -Os -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
-+ NOOPT_XCODE5_X64_CC_FLAGS = -target x86_64-pc-win32-macho -c -g -O0 -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
-+RELEASE_XCODE5_X64_CC_FLAGS = -target x86_64-pc-win32-macho -c -Os -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
-
--*_XCODE5_*_ASLCC_FLAGS = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h
-+*_XCODE5_*_ASLCC_FLAGS = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -c -include AutoGen.h
- *_XCODE5_*_ASLDLINK_FLAGS = -e _ReferenceAcpiTable -preload -segalign 0x20 -pie -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
- *_XCODE5_*_ASLPP_FLAGS = -x c -E -include AutoGen.h
- *_XCODE5_*_ASL_FLAGS =
-diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
-index 063982b..0316f56 100644
---- a/BaseTools/Source/C/Makefiles/header.makefile
-+++ b/BaseTools/Source/C/Makefiles/header.makefile
-@@ -47,9 +47,9 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKE
- BUILD_CPPFLAGS = $(INCLUDE) -O2
- ifeq ($(DARWIN),Darwin)
- # assume clang or clang compatible flags on OS X
--BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g
-+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g
- else
--BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g
-+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g
- endif
- BUILD_LFLAGS =
- BUILD_CXXFLAGS = -Wno-unused-result
diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/Manifest b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/Manifest
index da4bd1fddb..5267976c1f 100644
--- a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/Manifest
@@ -1,4 +1,4 @@
-DIST ipxe-1.0.0_p20130925-cba22d3.tar.bz2 2240189 BLAKE2B 58717ca43ece4ffbe8f68cae2f409c4cd8f1d3c2149521c28db017d4fcd31b6122fa35b9a476d3dc865baba0d2768744f4977420fb6410f1b09dad9170c32497 SHA512 a098d3fc0f68067be281b9c3654bb1b0be1b9d397327b55b36b17e69faf03ce6117d0278552c06990a5020e4ece7acac168d975b3c7bfce3b6865dea1fd1d8dd
-DIST ipxe-1.0.0_p20160620-694c18a.tar.bz2 2839663 BLAKE2B ec6999f3bcaf198f4b73464ee34456b923d0be26f11980e3020dd66012ddbf1b721aebb1c74c4289a0012e2ffae96a54a25821a4c7c621f727e090d13de58213 SHA512 67657dabe09f497c270cca16391669c89032112c1496b54009e2f1e8a477904d758476d4e465973aa0b6fc764be48ed6421607189aaea76e23fa0da6e9c8add5
DIST ipxe-1.0.0_p20180211-546dd51-bin.tar.xz 1748228 BLAKE2B 5ed2ce71c7dbc41d5cbef6e263abd230b9831c945a8edb33a29d408bd4262e370a2f73c8d2eb3cb20e08c61ece83af1fb1bb4c5694098cb29c44628dbd18def8 SHA512 af2778c925a6e4c374ddae85f3db983c83e7a4e5bb2cf35e356d277b87d4c89bf63cc2c061ec31d608ff2160c13297232fa131da2b9dd0b580d93e1b0efd6532
DIST ipxe-1.0.0_p20180211-546dd51.tar.bz2 2954305 BLAKE2B 8232b1afe017ff5d0389534e4efea3209ea0330d66e4d3d429abf81da66639b19488911d85bf2da200ff8cb0d49c5dda438074c4538303335419ea080ef80a16 SHA512 45d7f80f15a1c5ff1daa31b132065d38013a51127795ad81308b468940a455edcb40cde7601475039a7c977d732817203bbc627c642d3d10146a480da603f1dd
+DIST ipxe-1.0.0_p20190728-a4f8c6e-bin.tar.xz 1839688 BLAKE2B b28772b928690646e1b0cb1c27ef56e2cb1c0637a43c6174dea7c8ca401d8c8819938fa358a0bed5d57b8cf992b8c2060b52e32a970ef813f1cf705fb0805beb SHA512 1e5838b8c530257dc544f6e25f80e6e223480917db393ca3ff8c577f07e60180e18f2eed4e71f7b1965157d6e7001f65e224d3c8b56a98f84739e2504ca38985
+DIST ipxe-1.0.0_p20190728-a4f8c6e.tar.bz2 2985776 BLAKE2B 5a85505404978d51f80e30332f6eb0417d6d97eb9b3bc05eec5ad649c446c7d17dc841f8cd34a1b29c31dc6f5cf08baa69191de9c8dd4bcdb098c5d7f13a7824 SHA512 3af0da9058b39966bfd8f9d7dfe518ae7b26e18f58d1a3fa2cba8922ec3c50775b82dd9f23bf51be3ca3f69b705f92bcf80988a1817b30f7ab1826a4b159c5a6
diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch
deleted file mode 100644
index a981abdd89..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6153c09c41034250408f3596555fcaae715da46c Mon Sep 17 00:00:00 2001
-From: Florian Schmaus
-Date: Mon, 28 Jul 2014 16:47:48 +0100
-Subject: [PATCH] [build] Set GITVERSION only if there is a git repository
-
-The $(BIN)/version.%.o target will fail if iPXE is built within a
-non-git repository, e.g. when the user downloaded and extracted an
-archive containing iPXE sources, *and* if any parent directory of the
-iPXE sources is a git repository (or even contains a directory named
-".git"). This is because git will by default ascend the directory
-tree and look for ".git".
-
-The problem typically manifests on source based distributions, see for
-example https://bugs.gentoo.org/show_bug.cgi?id=482804
-
-Modified-by: Michael Brown
-Signed-off-by: Michael Brown
----
- src/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 22a7335..c6760ee 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -190,8 +190,8 @@ VERSION_PATCH = 0
- EXTRAVERSION = +
- MM_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR)
- VERSION = $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)
-+ifneq ($(wildcard ../.git),)
- GITVERSION := $(shell git describe --always --abbrev=1 --match "" 2>/dev/null)
--ifneq ($(GITVERSION),)
- VERSION += ($(GITVERSION))
- endif
- version :
---
-2.3.2
-
diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch
deleted file mode 100644
index 3156f3d117..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/585752
-
-From cea213034635e4d765b2f362057b696febbe509f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger
-Date: Tue, 21 Jun 2016 00:47:32 -0400
-Subject: [PATCH] [build] fix PIE disable flag
-
-The flag is "-no-pie", not "-nopie".
-
-Signed-off-by: Mike Frysinger
----
- src/arch/i386/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
-index fe3adc9ce436..59ad25b6e0af 100644
---- a/src/Makefile.housekeeping
-+++ b/src/Makefile.housekeeping
-@@ -75,8 +75,8 @@ CFLAGS += -Ui386
- # output on stderr instead of checking the exit status.
- #
- ifeq ($(CCTYPE),gcc)
--PIE_TEST = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ]
--PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie')
-+PIE_TEST = for f in -nopie -no-pie; do [ -z "`$(CC) -fno-PIE $$f -x c -c /dev/null -o /dev/null 2>&1`" ] && $(ECHO) -fno-PIE $$f; done
-+PIE_FLAGS := $(shell $(PIE_TEST))
- WORKAROUND_CFLAGS += $(PIE_FLAGS)
- endif
-
---
-2.8.2
-
diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch
deleted file mode 100644
index a0501d1879..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/585752
-
-From cea213034635e4d765b2f362057b696febbe509f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger
-Date: Tue, 21 Jun 2016 00:47:32 -0400
-Subject: [PATCH] [build] fix PIE disable flag
-
-The flag is "-no-pie", not "-nopie".
-
-Signed-off-by: Mike Frysinger
----
- src/arch/i386/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
-index fe3adc9ce436..59ad25b6e0af 100644
---- a/src/arch/i386/Makefile
-+++ b/src/arch/i386/Makefile
-@@ -75,8 +75,8 @@ CFLAGS += -Ui386
- # output on stderr instead of checking the exit status.
- #
- ifeq ($(CCTYPE),gcc)
--PIE_TEST = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ]
--PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie')
-+PIE_TEST = for f in -nopie -no-pie; do [ -z "`$(CC) -fno-PIE $$f -x c -c /dev/null -o /dev/null 2>&1`" ] && $(ECHO) -fno-PIE $$f; done
-+PIE_FLAGS := $(shell $(PIE_TEST))
- WORKAROUND_CFLAGS += $(PIE_FLAGS)
- endif
-
---
-2.8.2
-
diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild
deleted file mode 100644
index 574ffdf198..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs eutils savedconfig
-
-GIT_REV="cba22d36b77da53890bd65fdadd0e63925687af0"
-GIT_SHORT="cba22d3"
-
-DESCRIPTION="Open source network boot (PXE) firmware"
-HOMEPAGE="http://ipxe.org"
-SRC_URI="https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="efi ipv6 iso lkrn +qemu undi usb vmware"
-
-DEPEND="dev-lang/perl
- sys-libs/zlib
- iso? (
- sys-boot/syslinux
- virtual/cdrtools
- )"
-RDEPEND=""
-
-S="${WORKDIR}/ipxe-${GIT_SHORT}/src"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-git-version.patch #482804
- epatch "${FILESDIR}"/${P}-no-pie.patch #585752
-}
-
-src_configure() {
- cat <<-EOF > "${S}"/config/local/general.h
-#undef BANNER_TIMEOUT
-#define BANNER_TIMEOUT 0
-EOF
-
- use ipv6 && echo "#define NET_PROTO_IPV6" >> "${S}"/config/local/general.h
-
- if use vmware; then
- cat <<-EOF >> "${S}"/config/local/general.h
-#define VMWARE_SETTINGS
-#define CONSOLE_VMWARE
-EOF
- fi
-
- restore_config config/local/general.h
-
- tc-ld-disable-gold
-}
-
-src_compile() {
- ipxemake() {
- # Q='' makes the build verbose since that's what everyone loves now
- emake Q='' \
- CC="$(tc-getCC)" \
- LD="$(tc-getLD)" \
- AR="$(tc-getAR)" \
- OBJCOPY="$(tc-getOBJCOPY)" \
- RANLIB="$(tc-getRANLIB)" \
- OBJDUMP="$(tc-getOBJDUMP)" \
- HOST_CC="$(tc-getBUILD_CC)" \
- "$@"
- }
-
- export NO_WERROR=1
- if use qemu; then
- ipxemake bin/808610de.rom # pxe-e1000.rom (old)
- ipxemake bin/8086100e.rom # pxe-e1000.rom
- ipxemake bin/80861209.rom # pxe-eepro100.rom
- ipxemake bin/10500940.rom # pxe-ne2k_pci.rom
- ipxemake bin/10222000.rom # pxe-pcnet.rom
- ipxemake bin/10ec8139.rom # pxe-rtl8139.rom
- ipxemake bin/1af41000.rom # pxe-virtio.rom
- fi
-
- if use vmware; then
- ipxemake bin/8086100f.mrom # e1000
- ipxemake bin/808610d3.mrom # e1000e
- ipxemake bin/10222000.mrom # vlance
- ipxemake bin/15ad07b0.rom # vmxnet3
- fi
-
- use efi && ipxemake PLATFORM=efi BIN=bin-efi bin-efi/ipxe.efi
- use iso && ipxemake bin/ipxe.iso
- use undi && ipxemake bin/undionly.kpxe
- use usb && ipxemake bin/ipxe.usb
- use lkrn && ipxemake bin/ipxe.lkrn
-}
-
-src_install() {
- insinto /usr/share/ipxe/
-
- if use qemu || use vmware; then
- doins bin/*.rom
- fi
- use vmware && doins bin/*.mrom
- use efi && doins bin-efi/*.efi
- use iso && doins bin/*.iso
- use undi && doins bin/*.kpxe
- use usb && doins bin/*.usb
- use lkrn && doins bin/*.lkrn
-
- save_config config/local/general.h
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
index 1794162081..21b512890b 100644
--- a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86"
IUSE="+binary efi ipv6 iso lkrn +qemu undi usb vmware"
REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20160620.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
similarity index 77%
rename from sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20160620.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
index 8e0a5495f0..cb5cc15b84 100644
--- a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20160620.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
@@ -1,40 +1,45 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="6"
inherit toolchain-funcs eutils savedconfig
-GIT_REV="694c18addc0dfdf51369f6d598dd0c8ca4bf2861"
+GIT_REV="a4f8c6e31f6c62522cfc633bbbffa81b22f9d6f3"
GIT_SHORT=${GIT_REV:0:7}
DESCRIPTION="Open source network boot (PXE) firmware"
HOMEPAGE="http://ipxe.org/"
-SRC_URI="https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2"
+SRC_URI="
+ !binary? ( https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2 )
+ binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-${GIT_SHORT}-bin.tar.xz )"
LICENSE="GPL-2"
SLOT="0"
-# TODO: Add arm/arm64 once figure out how to build w/out including
-# all the x86-specific drivers (that use I/O insns).
-KEYWORDS="-* amd64 x86"
-IUSE="efi ipv6 iso lkrn +qemu undi usb vmware"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86"
+IUSE="+binary efi ipv6 iso lkrn +qemu undi usb vmware"
-DEPEND="app-arch/xz-utils
+REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
+
+SOURCE_DEPEND="app-arch/xz-utils
dev-lang/perl
sys-libs/zlib
iso? (
sys-boot/syslinux
virtual/cdrtools
)"
+DEPEND="
+ !binary? (
+ amd64? ( ${SOURCE_DEPEND} )
+ x86? ( ${SOURCE_DEPEND} )
+ )"
RDEPEND=""
S="${WORKDIR}/ipxe-${GIT_SHORT}/src"
-src_prepare() {
- epatch "${FILESDIR}"/${P}-no-pie.patch #585752
-}
-
src_configure() {
+ use binary && return
+
cat <<-EOF > "${S}"/config/local/general.h
#undef BANNER_TIMEOUT
#define BANNER_TIMEOUT 0
@@ -70,6 +75,8 @@ ipxemake() {
}
src_compile() {
+ use binary && return
+
export NO_WERROR=1
if use qemu; then
ipxemake bin/808610de.rom # pxe-e1000.rom (old)
diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/metadata.xml
index 2dad71b85b..8dc86ea7a3 100644
--- a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/metadata.xml
@@ -1,8 +1,13 @@
+
+ tamiko@gentoo.org
+ Matthias Maier
+
- qemu@gentoo.org
+ virtualization@gentoo.org
+ Gentoo Virtualization Project