From 0cbe6322aa53659caff1f6921239396b8b0713f7 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 23 Jul 2010 21:12:48 +0000 Subject: [PATCH] Fix this patch so it actually works with git. --- ...e-ignore-gnu-stack => gnu-efi-3.0e-ignore-gnu-stack.patch | 5 +++++ gnu-efi.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) rename gnu-efi-3.0e-ignore-gnu-stack => gnu-efi-3.0e-ignore-gnu-stack.patch (71%) diff --git a/gnu-efi-3.0e-ignore-gnu-stack b/gnu-efi-3.0e-ignore-gnu-stack.patch similarity index 71% rename from gnu-efi-3.0e-ignore-gnu-stack rename to gnu-efi-3.0e-ignore-gnu-stack.patch index fb0b5c9..4e9339e 100644 --- a/gnu-efi-3.0e-ignore-gnu-stack +++ b/gnu-efi-3.0e-ignore-gnu-stack.patch @@ -1,3 +1,8 @@ +From 364351b4448ff20730250e89ad09088d6aeafc72 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Fri, 3 Oct 2008 14:40:56 -0400 +Subject: [PATCH] Add an ignore for .note.GNU-stack section in the linker map. + diff --git a/gnuefi/elf_ia32_efi.lds b/gnuefi/elf_ia32_efi.lds index bc29799..b15b36d 100644 --- a/gnuefi/elf_ia32_efi.lds diff --git a/gnu-efi.spec b/gnu-efi.spec index baee804..80e1b34 100644 --- a/gnu-efi.spec +++ b/gnu-efi.spec @@ -8,7 +8,7 @@ URL: ftp://ftp.hpl.hp.com/pub/linux-ia64 Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-%{version}.tar.bz2 Patch0: gnu-efi-3.0e-no-relocations.patch Patch1: gnu-efi-3.0e-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch -Patch2: gnu-efi-3.0e-ignore-gnu-stack +Patch2: gnu-efi-3.0e-ignore-gnu-stack.patch Patch3: gnu-efi-3.0e-add-uefi-2.x-boot-services.patch # these are currently disabled as we don't need them per se, and they # haven't gone upstream yet either. Also they haven't been updated