rpms/gnu-efi/devel gnu-efi-3.0e-no-relocations.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 gnu-efi.spec, 1.23, 1.24 sources, 1.7, 1.8

[Peter Jones]

Author: pjones

Update of /cvs/extras/rpms/gnu-efi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26164

Modified Files:
	.cvsignore gnu-efi.spec sources 
Added Files:
	gnu-efi-3.0e-no-relocations.patch 
Log Message:
* Thu Oct 02 2008 Peter Jones <pjones at redhat.com> - 3.0e-1
- Update to 3.0e
- Fix relocation bug in 3.0e


gnu-efi-3.0e-no-relocations.patch:

--- NEW FILE gnu-efi-3.0e-no-relocations.patch ---
diff --git a/apps/.t2.c.swp b/apps/.t2.c.swp
deleted file mode 100644
index 4c0e28e..0000000
Binary files a/apps/.t2.c.swp and /dev/null differ
diff --git a/apps/.t3.c.swp b/apps/.t3.c.swp
deleted file mode 100644
index 68e3246..0000000
Binary files a/apps/.t3.c.swp and /dev/null differ
diff --git a/apps/t2.efi b/apps/t2.efi
index f7ec910..f2742ed 100755
Binary files a/apps/t2.efi and b/apps/t2.efi differ
diff --git a/gnuefi/libgnuefi.a b/gnuefi/libgnuefi.a
index 297b765..1fdc201 100644
Binary files a/gnuefi/libgnuefi.a and b/gnuefi/libgnuefi.a differ
diff --git a/gnuefi/reloc_ia32.c b/gnuefi/reloc_ia32.c
index 9bf4a8d..0b461cf 100644
--- a/gnuefi/reloc_ia32.c
+++ b/gnuefi/reloc_ia32.c
@@ -76,6 +76,9 @@ EFI_STATUS _relocate (long ldbase, ElfW(Dyn) *dyn, EFI_HANDLE image, EFI_SYSTEM_
 		}
 	}
 
+	if (!rel && relent == 0)
+		return EFI_SUCCESS;
+
 	if (!rel || relent == 0)
 		return EFI_LOAD_ERROR;
 
diff --git a/gnuefi/reloc_x86_64.c b/gnuefi/reloc_x86_64.c
index 9906084..3f94f47 100644
--- a/gnuefi/reloc_x86_64.c
+++ b/gnuefi/reloc_x86_64.c
@@ -76,6 +76,9 @@ EFI_STATUS _relocate (long ldbase, ElfW(Dyn) *dyn, EFI_HANDLE image, EFI_SYSTEM_
 		}
 	}
 
+	if (!rel && relent == 0)
+		return EFI_SUCCESS;
+
  	if (!rel || relent == 0)
  		return EFI_LOAD_ERROR;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnu-efi/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Dec 2007 20:18:49 -0000	1.7
+++ .cvsignore	3 Oct 2008 18:04:58 -0000	1.8
@@ -1 +1,2 @@
-gnu-efi-3.0d.tar.gz
+clog
+gnu-efi-3.0e.tar.bz2


Index: gnu-efi.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-efi/devel/gnu-efi.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnu-efi.spec	29 Jul 2008 20:09:33 -0000	1.23
+++ gnu-efi.spec	3 Oct 2008 18:04:58 -0000	1.24
@@ -1,18 +1,15 @@
 Summary: Development Libraries and headers for EFI
 Name: gnu-efi
-Version: 3.0d
-Release: 6%{?dist}
+Version: 3.0e
+Release: 1%{?dist}
 Group: Development/System
 License: GPLv2+
 URL: ftp://ftp.hpl.hp.com/pub/linux-ia64
-Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-%{version}.tar.gz
-Patch0: gnu-efi-3.0d-pragma.patch
-Patch1: gnu-efi-3.0d-uefi_wrap.patch
-Patch2: gnu-efi-3.0d-x86_64.patch
-Patch3: gnu-efi-3.0d-rpm.patch
-Patch4: gnu-efi-3.0d-unwrap.patch
-Patch5: gnu-efi-3.0d-uefi_wrap_call10.patch
-Patch6: gnu-efi-3.0d-palproc-license.patch
+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.0d-unwrap.patch
+Patch2: gnu-efi-3.0d-uefi_wrap.patch
+Patch3: gnu-efi-3.0d-uefi_wrap_call10.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: i386 x86_64
 
@@ -23,12 +20,12 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+# these are currently disabled as we don't need them per se, and they
+# haven't gone upstream yet either.  Also #2 and #3 haven't been updated
+# to work with gnu-efi-3.0e yet.
+#%%patch1 -p1
+#%%patch2 -p1
+#%%patch3 -p1
 
 %build
 # Package cannot build with %{?_smp_mflags}.
@@ -56,6 +53,10 @@
 %{_libdir}/*
 
 %changelog
+* Thu Oct 02 2008 Peter Jones <pjones at redhat.com> - 3.0e-1
+- Update to 3.0e
+- Fix relocation bug in 3.0e
+
 * Tue Jul 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.0d-6
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnu-efi/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Dec 2007 20:18:49 -0000	1.7
+++ sources	3 Oct 2008 18:04:58 -0000	1.8
@@ -1 +1 @@
-29013d3cd15009942fb855ba3e1a8096  gnu-efi-3.0d.tar.gz
+964ba7c19d88ef26f3f411447c6ef733  gnu-efi-3.0e.tar.bz2