From abd0e43e9145e4a1f5c7a0e0964c7dff677dc445 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 4 Jan 2018 17:03:12 -0500 Subject: [PATCH] bump(sys-firmware/ipxe): sync with upstream --- .../sys-firmware/ipxe-1.0.0_p20120905 | 11 --- .../sys-firmware/ipxe-1.0.0_p20130225 | 11 --- .../sys-firmware/ipxe-1.0.0_p20130624 | 12 --- .../sys-firmware/ipxe-1.0.0_p20130925 | 10 +-- .../sys-firmware/ipxe-1.0.0_p20160620 | 12 +++ .../sys-firmware/ipxe/ChangeLog | 69 ---------------- .../portage-stable/sys-firmware/ipxe/Manifest | 32 +------- .../ipxe-1.0.0_p20130925-git-version.patch | 38 +++++++++ .../files/ipxe-1.0.0_p20130925-no-pie.patch | 32 ++++++++ .../files/ipxe-1.0.0_p20160620-no-pie.patch | 32 ++++++++ .../ipxe/ipxe-1.0.0_p20120905.ebuild | 72 ----------------- .../ipxe/ipxe-1.0.0_p20130225.ebuild | 80 ------------------- .../ipxe/ipxe-1.0.0_p20130925.ebuild | 48 ++++++----- ...624.ebuild => ipxe-1.0.0_p20160620.ebuild} | 72 ++++++++++------- .../sys-firmware/ipxe/metadata.xml | 17 ++-- 15 files changed, 200 insertions(+), 348 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20120905 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20130225 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20130624 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20160620 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ChangeLog create mode 100644 sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20120905.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20130225.ebuild rename sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/{ipxe-1.0.0_p20130624.ebuild => ipxe-1.0.0_p20160620.ebuild} (56%) diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20120905 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20120905 deleted file mode 100644 index 957d2c7c00..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20120905 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile configure install -DEPEND=sys-devel/make dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux virtual/cdrtools ) -DESCRIPTION=Open source network boot (PXE) firmware -EAPI=4 -HOMEPAGE=http://ipxe.org -IUSE=iso +qemu undi usb vmware -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -SLOT=0 -SRC_URI=https://git.ipxe.org/ipxe.git/snapshot/e6427b7ee117ea4af0812bb13b57999bccd8e058.tar.bz2 -_md5_=7e0402b1b3483e3f7509371afc2e9103 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20130225 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20130225 deleted file mode 100644 index 147a87c429..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20130225 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=sys-devel/make 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=iso +qemu undi usb vmware -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -SLOT=0 -SRC_URI=https://git.ipxe.org/ipxe.git/snapshot/09c5109b8585178172c7608de8d52e9d9af0b680.tar.bz2 -> ipxe-1.0.0_p20130225-09c5109.tar.bz2 -_md5_=f8b8222337998c16c82ccafe18b65a60 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20130624 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20130624 deleted file mode 100644 index 5a9fa73fb3..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20130624 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install prepare setup -DEPEND=sys-devel/make 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=iso +qemu undi usb vmware -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -SLOT=0 -SRC_URI=https://git.ipxe.org/ipxe.git/snapshot/936134ed460618e18cc05d677a442d43d5e739a1.tar.bz2 -> ipxe-1.0.0_p20130624-936134e.tar.bz2 -_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=bcb7858055c1906c33f465d341e8b6c9 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 index 9d1af6a318..1dc2611347 100644 --- 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 @@ -1,12 +1,12 @@ -DEFINED_PHASES=compile install prepare setup -DEPEND=sys-devel/make dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux virtual/cdrtools ) +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=iso +qemu undi usb vmware +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_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=572acf94ba74fe1edc5e680d39951f89 +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 185a06792159ca143528e7010368e8af +_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 new file mode 100644 index 0000000000..e4a0ce51c6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20160620 @@ -0,0 +1,12 @@ +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_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=f062dc79cce1e58b040b98498992f45f diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ChangeLog deleted file mode 100644 index 3dc8dbd224..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ChangeLog +++ /dev/null @@ -1,69 +0,0 @@ -# ChangeLog for sys-firmware/ipxe -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-firmware/ipxe/ChangeLog,v 1.17 2014/10/20 07:02:24 ago Exp $ - - 20 Oct 2014; Agostino Sarubbo ipxe-1.0.0_p20130925.ebuild: - Stable for x86, wrt bug #523788 - - 12 Oct 2014; Agostino Sarubbo ipxe-1.0.0_p20130925.ebuild: - Stable for amd64, wrt bug #523788 - -*ipxe-1.0.0_p20130925 (07 Nov 2013) - - 07 Nov 2013; Doug Goldstein +ipxe-1.0.0_p20130925.ebuild: - Fix issue with register clobbering and gcc 4.8. bug #487254 - - 06 Sep 2013; Agostino Sarubbo ipxe-1.0.0_p20130624.ebuild: - Stable for x86, wrt bug #483770 - - 06 Sep 2013; Agostino Sarubbo ipxe-1.0.0_p20130624.ebuild: - Stable for amd64, wrt bug #483770 - - 04 Jul 2013; Agostino Sarubbo ipxe-1.0.0_p20130225.ebuild: - Stable for x86, wrt bug #475110 - - 30 Jun 2013; Doug Goldstein ipxe-1.0.0_p20130624.ebuild: - Updates from Jeroen Roovers and Michael Weber - to handle users using the gold linker instead of the default - bfd linker more gracefully. - - 28 Jun 2013; Agostino Sarubbo ipxe-1.0.0_p20130225.ebuild: - Stable for amd64, wrt bug #475110 - - 27 Jun 2013; Doug Goldstein ipxe-1.0.0_p20130225.ebuild, - ipxe-1.0.0_p20130624.ebuild: - Use filename pointers to give a meaningful name to the tarball. - - 27 Jun 2013; Doug Goldstein ipxe-1.0.0_p20130624.ebuild: - Simplify generating our configs for VMWare. - - 27 Jun 2013; Doug Goldstein ipxe-1.0.0_p20120905.ebuild, - ipxe-1.0.0_p20130225.ebuild, ipxe-1.0.0_p20130624.ebuild: - Generally disable -Werror. - -*ipxe-1.0.0_p20130225 (27 Jun 2013) -*ipxe-1.0.0_p20130624 (27 Jun 2013) - - 27 Jun 2013; Doug Goldstein +ipxe-1.0.0_p20130225.ebuild, - +ipxe-1.0.0_p20130624.ebuild: - Add latest iPXE and add the current version that QEMU uses as well. bug - #462898 - - 26 Jan 2013; Doug Goldstein ipxe-1.0.0_p20120905.ebuild: - USE=iso needs virtual/cdrtools to successfully build as discovered by Homer - Parker bug #454190 - - 24 Jan 2013; Agostino Sarubbo ipxe-1.0.0_p20120905.ebuild: - Stable for x86, wrt bug #453762 - - 24 Jan 2013; Agostino Sarubbo ipxe-1.0.0_p20120905.ebuild: - Stable for amd64, wrt bug #453762 - - 14 Jan 2013; Patrick Lauer ipxe-1.0.0_p20120905.ebuild: - Re-keywording for x86, #438780 - -*ipxe-1.0.0_p20120905 (10 Sep 2012) - - 10 Sep 2012; Doug Goldstein +ipxe-1.0.0_p20120905.ebuild, - +metadata.xml: - Add initial version of iPXE 1.0.0+ 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 8543ba58c4..2e1d274b82 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,30 +1,2 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -DIST e6427b7ee117ea4af0812bb13b57999bccd8e058.tar.bz2 2198003 SHA256 008a80b80a8b19ef6963581b5599880d51171aad13f96690589cbc0fa895eaf3 SHA512 8456ef3c27f3f4de827ae4c744cbe2eaacb96cf703a5525f490c53ac26ed597635acb744a50607d733d7bd5014dcbbb333f74da8fe68fddca19e11d047377d73 WHIRLPOOL 814cda89fa52afec2b1a8811407ce3b361c1d7548e40255fdffda2bd0fbb8485352575f19b6935de50582a97c31758cd9bcc2194cb2b222b89313868a032a828 -DIST ipxe-1.0.0_p20130225-09c5109.tar.bz2 2208235 SHA256 58fd3470c4807c7206550badbc709c9a48af201b4bfa629379143b21426189fa SHA512 74b72a336ee4874ee134fe2bfa8540a864ddd169e09a7d6dfa688624f674962ea33f01bb287b90fda0cdfe5bf4d38e49362934c22a2da932dd3e4c702ebd56dc WHIRLPOOL fad62b8d15bb67ab194954671ae9e1cfa0df06c2d237b9312994ecaf440f0bb22b72ba28824ee8a13c19fe90f8bd3b2847a80d93da5f10368b096cdfa8230a06 -DIST ipxe-1.0.0_p20130624-936134e.tar.bz2 2230605 SHA256 bbf9435515a481ab4e5bfc4e49d5eeb005b60169bad3db269e31228fafbb7bbc SHA512 8a1332794acd0db7bf485bfc2c1c52b4e7e5545e5cc1e4e39bbe6f190a684682613b063cc5c31c94d7715fa07555a851f04abb45e604325c0bb4ab73526df0c9 WHIRLPOOL 1338fc4f8bf69a98713d72ad0a8749bc53e42d99c8088e5536b78001d0f738dcc8aaa537cce7dcb5f4f66818880b936c964fc6bed8ff00e674cf400da9521f5b -DIST ipxe-1.0.0_p20130925-cba22d3.tar.bz2 2240189 SHA256 c9c819bac8a925aad30ac88a23a86dd5591a9c31846058e77465d05551fc6189 SHA512 a098d3fc0f68067be281b9c3654bb1b0be1b9d397327b55b36b17e69faf03ce6117d0278552c06990a5020e4ece7acac168d975b3c7bfce3b6865dea1fd1d8dd WHIRLPOOL 11442ea81032b4c9c00d3c1346761163cbcf2db2bc957bfbaba74c7f9109136bf5334e26752f9d10a8ed0f093ae39fd28e4152d522aa4dd86e4d1c05695d7d3a -EBUILD ipxe-1.0.0_p20120905.ebuild 1736 SHA256 6f5fa565d43bee60cc94023f93e21cb5e5d2247d2740d477014ca70d13434429 SHA512 7ee3a59899941bb80cfbad7b0c09301bcd2b0fdc070382a77fa46972451b4abdd0a9085ff09231b18c69ffff6a94806845e149e7b1512bd52a91ebffd5f8fe6b WHIRLPOOL 3449f9f7a0e0c58de80adf05a02bdc1d4151a353e561c000b0ca4ba2c78bb51b3b447995db62cc82a67492712a13c2f68560c96da1ea558c0eac6a63e930ee3f -EBUILD ipxe-1.0.0_p20130225.ebuild 1923 SHA256 c6f6e5928b38f5848b101d4bf1135abdd628cf5c9c30fee567d3bde595917c2a SHA512 20b13e4750ef7a79cde0751225b8286e3498cf69799d7553e02d94ab40ec745ca355813424cc7dce24862fdc8c2a188a1a0671676953911d3917656c0330396c WHIRLPOOL 6e6a26b99522ea58144cf8a4ab3ce6389138866b692daabd6735e90ee5d0b7f69772de22874421771bf57eb55899509598843722ca3923f06cce7f3d47d2e6c4 -EBUILD ipxe-1.0.0_p20130624.ebuild 2335 SHA256 9476a77b583cddea480c042a09a0c0bb4f598ad7be371f57dc536fd82c8fe15d SHA512 d3731dd9f31e8782d95d3b2279699f31cb8d0f6ce0c9694f970d9b0db9d86023346840c5a3b2b58e1d58c635cffcf108cb7d9d8ce7d5dbf21a522ccb88e1219f WHIRLPOOL 2a82f85e809e7866ad2368760c96b624a02f08e0e6ad8de207dd7f5ec047f544b825949e749b63146258aff545aa442a916aa88d997edfdc80a03ce33ff05674 -EBUILD ipxe-1.0.0_p20130925.ebuild 2335 SHA256 424962b173fb8e4b773d999e170e15c3cbf36aafef06f9e60a5179332b4c2b5c SHA512 e42c40250c76213a202c640f2efbd5dbf3302ca7f47c40cc9203e91122b10a7bdfc9eec4aa6e9c0ae4249db47e7688bd41a82fc670425f75b596979681ad1143 WHIRLPOOL 0290b7d4005ee6ac25d803646a01fa50fff01ddd95e1002c1a23f21361ce0573772aa465ba985b998140aabb55c3e5fdd2b080d5138553318f77f5c33cb64e08 -MISC ChangeLog 2778 SHA256 d1717d538dfc1404d17898815a50c226f5e38a92b39819a8a45ab9736057b96f SHA512 6c6462b8d6032a64cde9eba8988465ac9fdb6051c74cfa31fe91f72d395f8a77d88ea5aee3e9aedd94c5242dad0340ff54239e8451ee28290569ceec198d4045 WHIRLPOOL 611cc2fca9b6e33dee7c146d5e936843aca229462695b9a5e1ed8333be752535461dab5347cc04735ed00942e0e7f38312dcfd190114d116c7b7f97c9b30cc5b -MISC metadata.xml 691 SHA256 f0f4dc35384ae2bbc0e938812ae3ec259c490e101fe978e2a7cc8ce8eb3d6a7b SHA512 1e1063f205a4a284224e229fa675f6eb83f03ee80c3874198740da15744961664c3f6fe0ec6c1211dcabfe1204bc92ec355b98075c5d626c3493bfbc7de08ae7 WHIRLPOOL 435dfad45383449b30a12b1caf484f05b39102d5132c9dd5573fddb84cfa2c987e6db700b0bc656e821cbc7fde5b04af5504fd367d665027b7eeef06853ff413 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJURLOBAAoJELp701BxlEWfw9sQAJkqkUr1lC34g1xGZxGPQWGf -nU5rFG00fxEOGgj0wwzYffcd8dFIzGCT9j0LHlzCfyAJlBk7dPX2dlMsxDH/dyHl -lKqpSbCZiE47JCczeSXyVFe3oNn3zpDARijI4jQS/wa7IkX7josviPPlaIGcFpt/ -b4x9Pv/hKHszkc2rWOcM3NbusTUl5CE+RuQyQal9GoEn8dn9qLJF6b4/u9AXG9M/ -HrTaSntpa2ER1fkL3DSlcq6xcOAk/l75UHtvea5D4aRuD0O9BppRqcPJTvZ7fNMl -tnSbodZ8jnf9WTeaBPNWtOwW4SJ7NqihKG47SqCXoLGZN4ISuLwYc6zxCJIKT5xx -TiDMkMro/X1F7mPFpkPPm7z2yvIZ2DaiZ2Nfr58QQHjn6NBhV6r92XodoU8STTIG -dpAU8tFYi329NJW6UN6hdpN13lllsMrIEpkW/9aQxTrhBjINmZDFFJobzlZdSSRU -LLuRB3/Uh1JvJR/hJeNDTLuw2QcFZHidske2DK2rtO+5irxqTexS/ycb1gu0wLBZ -yX6+F0O1oRYujhmq+nWQ78ut5ZbioLGeMmj7t0Ojk/Jz2D4iPjoz55Z0kthcO+Rv -Ezk24NXqR5fg94ZrHEkp7n/QWo31+CNRzPcrkbWSJxGE6Neq6zxOhoOGxuf1GOck -ALR3R/Kmh/Rap2b3QEbh -=gvFU ------END PGP SIGNATURE----- +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 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 new file mode 100644 index 0000000000..a981abdd89 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch @@ -0,0 +1,38 @@ +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 new file mode 100644 index 0000000000..3156f3d117 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch @@ -0,0 +1,32 @@ +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 new file mode 100644 index 0000000000..a0501d1879 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch @@ -0,0 +1,32 @@ +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_p20120905.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20120905.ebuild deleted file mode 100644 index fc21134cd3..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20120905.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-firmware/ipxe/ipxe-1.0.0_p20120905.ebuild,v 1.6 2013/06/27 22:10:51 cardoe Exp $ - -EAPI=4 - -GIT_REV="e6427b7ee117ea4af0812bb13b57999bccd8e058" -GIT_SHORT="e6427b7" - -DESCRIPTION="Open source network boot (PXE) firmware" -HOMEPAGE="http://ipxe.org" -SRC_URI="https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="iso +qemu undi usb vmware" - -DEPEND="sys-devel/make - dev-lang/perl - sys-libs/zlib - iso? ( - sys-boot/syslinux - virtual/cdrtools - )" -RDEPEND="" - -S="${WORKDIR}/ipxe-${GIT_SHORT}/src" - -src_configure() { - if use vmware; then - sed -i config/sideband.h \ - -e 's|//#define[[:space:]]VMWARE_SETTINGS|#define VMWARE_SETTINGS|' - sed -i config/console.h \ - -e 's|//#define[[:space:]]CONSOLE_VMWARE|#define CONSOLE_VMWARE|' - fi -} - -src_compile() { - export NO_WERROR=1 - if use qemu; then - emake bin/808610de.rom # pxe-e1000.rom - emake bin/80861209.rom # pxe-eepro100.rom - emake bin/10500940.rom # pxe-ne2k_pci.rom - emake bin/10222000.rom # pxe-pcnet.rom - emake bin/10ec8139.rom # pxe-rtl8139.rom - emake bin/1af41000.rom # pxe-virtio.rom - fi - - if use vmware; then - emake bin/8086100f.mrom # e1000 - emake bin/808610d3.mrom # e1000e - emake bin/10222000.mrom # vlance - emake bin/15ad07b0.rom # vmxnet3 - fi - - use iso && emake bin/ipxe.iso - use undi && emake bin/undionly.kpxe - use usb && emake bin/ipxe.usb -} - -src_install() { - insinto /usr/share/ipxe/ - - if use qemu || use vmware; then - doins bin/*.rom - fi - use vmware && doins bin/*.mrom - use iso && doins bin/*.iso - use undi && doins bin/*.kpxe - use usb && doins bin/*.usb -} diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20130225.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20130225.ebuild deleted file mode 100644 index 727dea3116..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20130225.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-firmware/ipxe/ipxe-1.0.0_p20130225.ebuild,v 1.5 2013/07/04 12:25:59 ago Exp $ - -EAPI=5 - -GIT_REV="09c5109b8585178172c7608de8d52e9d9af0b680" -GIT_SHORT="09c5109" - -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="iso +qemu undi usb vmware" - -DEPEND="sys-devel/make - dev-lang/perl - sys-libs/zlib - iso? ( - sys-boot/syslinux - virtual/cdrtools - )" -RDEPEND="" - -S="${WORKDIR}/ipxe-${GIT_SHORT}/src" - -src_prepare() { - cat <<-EOF > "${S}"/config/local/general.h -#undef BANNER_TIMEOUT -#define BANNER_TIMEOUT 0 -EOF -} - -src_configure() { - if use vmware; then - sed -i config/sideband.h \ - -e 's|//#define[[:space:]]VMWARE_SETTINGS|#define VMWARE_SETTINGS|' - sed -i config/console.h \ - -e 's|//#define[[:space:]]CONSOLE_VMWARE|#define CONSOLE_VMWARE|' - fi -} - -src_compile() { - export NO_WERROR=1 - if use qemu; then - emake bin/808610de.rom # pxe-e1000.rom (old) - emake bin/8086100e.rom # pxe-e1000.rom - emake bin/80861209.rom # pxe-eepro100.rom - emake bin/10500940.rom # pxe-ne2k_pci.rom - emake bin/10222000.rom # pxe-pcnet.rom - emake bin/10ec8139.rom # pxe-rtl8139.rom - emake bin/1af41000.rom # pxe-virtio.rom - fi - - if use vmware; then - emake bin/8086100f.mrom # e1000 - emake bin/808610d3.mrom # e1000e - emake bin/10222000.mrom # vlance - emake bin/15ad07b0.rom # vmxnet3 - fi - - use iso && emake bin/ipxe.iso - use undi && emake bin/undionly.kpxe - use usb && emake bin/ipxe.usb -} - -src_install() { - insinto /usr/share/ipxe/ - - if use qemu || use vmware; then - doins bin/*.rom - fi - use vmware && doins bin/*.mrom - use iso && doins bin/*.iso - use undi && doins bin/*.kpxe - use usb && doins bin/*.usb -} 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 index a819e401e0..574ffdf198 100644 --- 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 @@ -1,10 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild,v 1.3 2014/10/20 07:02:24 ago Exp $ EAPI=5 -inherit toolchain-funcs +inherit toolchain-funcs eutils savedconfig GIT_REV="cba22d36b77da53890bd65fdadd0e63925687af0" GIT_SHORT="cba22d3" @@ -16,10 +15,9 @@ SRC_URI="https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="iso +qemu undi usb vmware" +IUSE="efi ipv6 iso lkrn +qemu undi usb vmware" -DEPEND="sys-devel/make - dev-lang/perl +DEPEND="dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux @@ -29,39 +27,43 @@ RDEPEND="" S="${WORKDIR}/ipxe-${GIT_SHORT}/src" -pkg_setup() { - local myld=$(tc-getLD) - - ${myld} -v | grep -q "GNU gold" && \ - ewarn "gold linker unable to handle 16-bit code using ld.bfd. bug #438058" +src_prepare() { + epatch "${FILESDIR}"/${P}-git-version.patch #482804 + epatch "${FILESDIR}"/${P}-no-pie.patch #585752 } -src_prepare() { +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).bfd" \ - AR=$(tc-getAR) \ - OBJCOPY=$(tc-getOBJCOPY) \ - RANLIB=$(tc-getRANLIB) \ - OBJDUMP=$(tc-getPROG OBJDUMP objdump) \ - HOST_CC=$(tc-getBUILD_CC) \ - ${*} + 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 @@ -82,9 +84,11 @@ src_compile() { 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() { @@ -94,7 +98,11 @@ src_install() { 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_p20130624.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20160620.ebuild similarity index 56% rename from sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20130624.ebuild rename to sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20160620.ebuild index 61588a5fea..8e0a5495f0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20130624.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.0.0_p20160620.ebuild @@ -1,24 +1,25 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-firmware/ipxe/ipxe-1.0.0_p20130624.ebuild,v 1.7 2013/09/06 16:11:44 ago Exp $ -EAPI=5 +EAPI="5" -inherit toolchain-funcs +inherit toolchain-funcs eutils savedconfig -GIT_REV="936134ed460618e18cc05d677a442d43d5e739a1" -GIT_SHORT="936134e" +GIT_REV="694c18addc0dfdf51369f6d598dd0c8ca4bf2861" +GIT_SHORT=${GIT_REV:0:7} DESCRIPTION="Open source network boot (PXE) firmware" -HOMEPAGE="http://ipxe.org" +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="iso +qemu undi usb vmware" +# 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" -DEPEND="sys-devel/make +DEPEND="app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( @@ -29,41 +30,46 @@ RDEPEND="" S="${WORKDIR}/ipxe-${GIT_SHORT}/src" -pkg_setup() { - local myld=$(tc-getLD) - - ${myld} -v | grep -q "GNU gold" && \ - ewarn "gold linker unable to handle 16-bit code using ld.bfd. bug #438058" +src_prepare() { + epatch "${FILESDIR}"/${P}-no-pie.patch #585752 } -src_prepare() { +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 +} + +ipxemake() { + # Q='' makes the build verbose since that's what everyone loves now + emake Q='' \ + CC="$(tc-getCC)" \ + LD="$(tc-getLD)" \ + AS="$(tc-getAS)" \ + AR="$(tc-getAR)" \ + NM="$(tc-getNM)" \ + OBJCOPY="$(tc-getOBJCOPY)" \ + RANLIB="$(tc-getRANLIB)" \ + OBJDUMP="$(tc-getOBJDUMP)" \ + HOST_CC="$(tc-getBUILD_CC)" \ + "$@" } src_compile() { - ipxemake() { - # Q='' makes the build verbose since that's what everyone loves now - emake Q='' \ - CC=$(tc-getCC) \ - LD="$(tc-getLD).bfd" \ - AR=$(tc-getAR) \ - OBJCOPY=$(tc-getOBJCOPY) \ - RANLIB=$(tc-getRANLIB) \ - OBJDUMP=$(tc-getPROG OBJDUMP objdump) \ - HOST_CC=$(tc-getBUILD_CC) \ - ${*} - } - export NO_WERROR=1 if use qemu; then ipxemake bin/808610de.rom # pxe-e1000.rom (old) @@ -73,7 +79,7 @@ src_compile() { ipxemake bin/10222000.rom # pxe-pcnet.rom ipxemake bin/10ec8139.rom # pxe-rtl8139.rom ipxemake bin/1af41000.rom # pxe-virtio.rom - fi + fi if use vmware; then ipxemake bin/8086100f.mrom # e1000 @@ -82,9 +88,11 @@ src_compile() { 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() { @@ -94,7 +102,11 @@ src_install() { 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/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/metadata.xml index 6f1c5abbc3..79e3a615e1 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,16 +1,17 @@ - -cardoe@gentoo.org -Doug Goldstein + + qemu@gentoo.org - Build a bootable ISO for using PXE - Build a bootable USB image for using PXE - Build a Universal Network Device Interface driver + Build an EFI program for using PXE + Build a bootable ISO for using PXE + Build a linux kernel bootable file for using with grub/etc... + Build a bootable USB image for using PXE + Build a Universal Network Device Interface driver chainloading your existing PXE NIC into iPXE - Build the required PXE ROM images for app-emulation/qemu and app-emulation/qemu-kvm - Build the PXE ROM images that VMWare uses + Build the required PXE ROM images for app-emulation/qemu + Build the PXE ROM images that VMWare uses