summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-firmware/ipxe/files')
-rw-r--r--sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch38
-rw-r--r--sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch32
-rw-r--r--sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch32
3 files changed, 0 insertions, 102 deletions
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 a981abdd892e..000000000000
--- 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 <flo@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 <mcb30@ipxe.org>
-Signed-off-by: Michael Brown <mcb30@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 3156f3d11700..000000000000
--- 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 <vapier@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 <vapier@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 a0501d187904..000000000000
--- 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 <vapier@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 <vapier@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
-