commit: 6968deeca51314386b64a4ce8e3f936bda0b776c Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Sun Jul 28 20:03:37 2019 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Sun Jul 28 20:19:38 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6968deec
sys-firmware/ipxe: drop old Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> sys-firmware/ipxe/Manifest | 2 - .../files/ipxe-1.0.0_p20130925-git-version.patch | 38 ------- .../ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch | 32 ------ .../ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch | 32 ------ sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild | 108 -------------------- sys-firmware/ipxe/ipxe-1.0.0_p20160620.ebuild | 112 --------------------- 6 files changed, 324 deletions(-) diff --git a/sys-firmware/ipxe/Manifest b/sys-firmware/ipxe/Manifest index da4bd1fddb1..bdab5924bb6 100644 --- a/sys-firmware/ipxe/Manifest +++ b/sys-firmware/ipxe/Manifest @@ -1,4 +1,2 @@ -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 diff --git a/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch b/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch deleted file mode 100644 index a981abdd892..00000000000 --- a/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 <f...@geekplace.eu> -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 <mc...@ipxe.org> -Signed-off-by: Michael Brown <mc...@ipxe.org> ---- - 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/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch b/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch deleted file mode 100644 index 3156f3d1170..00000000000 --- a/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 <vap...@gentoo.org> -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 <vap...@gentoo.org> ---- - 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/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch b/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch deleted file mode 100644 index a0501d18790..00000000000 --- a/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 <vap...@gentoo.org> -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 <vap...@gentoo.org> ---- - 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/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild deleted file mode 100644 index 574ffdf1986..00000000000 --- a/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/sys-firmware/ipxe/ipxe-1.0.0_p20160620.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20160620.ebuild deleted file mode 100644 index 8e0a5495f08..00000000000 --- a/sys-firmware/ipxe/ipxe-1.0.0_p20160620.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit toolchain-funcs eutils savedconfig - -GIT_REV="694c18addc0dfdf51369f6d598dd0c8ca4bf2861" -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" - -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" - -DEPEND="app-arch/xz-utils - dev-lang/perl - sys-libs/zlib - iso? ( - sys-boot/syslinux - virtual/cdrtools - )" -RDEPEND="" - -S="${WORKDIR}/ipxe-${GIT_SHORT}/src" - -src_prepare() { - 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 -} - -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() { - 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 -}
