rpms/gnu-efi/devel gnu-efi-3.0e-ignore-gnu-stack.patch, NONE, 1.1 gnu-efi.spec, 1.35, 1.36 gnu-efi-3.0e-ignore-gnu-stack, 1.1, NONE

[Peter Jones]

Author: pjones

Update of /cvs/extras/rpms/gnu-efi/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8695

Modified Files:
	gnu-efi.spec 
Added Files:
	gnu-efi-3.0e-ignore-gnu-stack.patch 
Removed Files:
	gnu-efi-3.0e-ignore-gnu-stack 
Log Message:
Fix this patch so it actually works with git.


gnu-efi-3.0e-ignore-gnu-stack.patch:
 elf_ia32_efi.lds   |    2 ++
 elf_x86_64_efi.lds |    3 +++
 2 files changed, 5 insertions(+)

--- NEW FILE gnu-efi-3.0e-ignore-gnu-stack.patch ---
>From 364351b4448ff20730250e89ad09088d6aeafc72 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at cutlet.install.bos.redhat.com>
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
+++ b/gnuefi/elf_ia32_efi.lds
@@ -58,5 +58,7 @@ SECTIONS
   {
     *(.rel.reloc)
     *(.eh_frame)
+    *(.note.GNU-stack)
   }
+  .comment 0 : { *(.comment) }
 }
diff --git a/gnuefi/elf_x86_64_efi.lds b/gnuefi/elf_x86_64_efi.lds
index 9c0a9f8..d0ae5f0 100644
--- a/gnuefi/elf_x86_64_efi.lds
+++ b/gnuefi/elf_x86_64_efi.lds
@@ -54,5 +54,8 @@ SECTIONS
   .ignored.reloc :
   {
     *(.rela.reloc)
+    *(.eh_frame)
+    *(.note.GNU-stack)
   }
+  .comment 0 : { *(.comment) }
 }


Index: gnu-efi.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-efi/devel/gnu-efi.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- gnu-efi.spec	23 Jul 2010 20:56:14 -0000	1.35
+++ gnu-efi.spec	23 Jul 2010 21:12:48 -0000	1.36
@@ -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


--- gnu-efi-3.0e-ignore-gnu-stack DELETED ---