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/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 Use pre-built binaries