[gnu-efi] Update to current upstream
Matthew Garrett
mjg59 at fedoraproject.org
Sat Jul 28 02:42:45 UTC 2012
commit 76e9368fa88a36c52d37a197bef693850895f53f
Author: Matthew Garrett <mjg at redhat.com>
Date: Fri Jul 27 22:41:24 2012 -0400
Update to current upstream
- License change - GPLv2+ to BSD
.gitignore | 1 +
gnu-efi-3.0d-callwrap.patch | 518 --------------------
gnu-efi-3.0d-palproc-license.patch | 238 ---------
gnu-efi-3.0d-pragma.patch | 255 ----------
gnu-efi-3.0d-relocfmt.patch | 173 -------
gnu-efi-3.0d-rpm.patch | 52 --
gnu-efi-3.0d-section-attribs.patch | 12 -
gnu-efi-3.0d-setjmp.patch | 170 -------
gnu-efi-3.0d-uefi_wrap.patch | 504 -------------------
gnu-efi-3.0d-uefi_wrap_call10.patch | 12 -
gnu-efi-3.0d-x86_64.patch | 26 -
...-to-test-our-calling-convention-shananaga.patch | 484 ------------------
...e-Add-the-routines-to-make-callbacks-work.patch | 141 ------
...6-byte-stack-alignment-on-x86_64-efi_call.patch | 331 -------------
gnu-efi-3.0e-add-pciio.patch | 277 -----------
gnu-efi-3.0e-add-uefi-2.x-boot-services.patch | 218 --------
gnu-efi-3.0e-align-reloc-section.patch | 34 --
gnu-efi-3.0e-ignore-gnu-stack.patch | 30 --
gnu-efi-3.0e-no-relocations.patch | 33 --
gnu-efi-3.0e-pad-all-sections.patch | 243 ---------
...patch => gnu-efi-3.0q-Add-.S-and-.E-rules.patch | 12 +-
...ix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch | 14 +-
... => gnu-efi-3.0q-handle-uninitialized-gop.patch | 8 +-
...types.patch => gnu-efi-3.0q-machine-types.patch | 14 +-
...e-modelist.patch => gnu-efi-3.0q-modelist.patch | 16 +-
... => gnu-efi-3.0q-route80h-add-cougarpoint.patch | 8 +-
...e-route80h.patch => gnu-efi-3.0q-route80h.patch | 18 +-
gnu-efi.spec | 34 +-
sources | 2 +-
29 files changed, 62 insertions(+), 3816 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1bda4ed..cf51ef5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
clog
gnu-efi-3.0e.tar.bz2
+/gnu-efi-3.0q.tar.gz
diff --git a/gnu-efi-3.0e-Add-.S-and-.E-rules.patch b/gnu-efi-3.0q-Add-.S-and-.E-rules.patch
similarity index 61%
rename from gnu-efi-3.0e-Add-.S-and-.E-rules.patch
rename to gnu-efi-3.0q-Add-.S-and-.E-rules.patch
index aae632e..b6fdfaf 100644
--- a/gnu-efi-3.0e-Add-.S-and-.E-rules.patch
+++ b/gnu-efi-3.0q-Add-.S-and-.E-rules.patch
@@ -1,17 +1,17 @@
-From 44e7c2b928b8c71dfe189208e35ca49ab210f058 Mon Sep 17 00:00:00 2001
+From bb12d86aceb7d9ea6748f45a17f719a8e18c81c8 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Tue, 9 Aug 2011 12:30:49 -0400
-Subject: [PATCH] Add %.S and %.E rules to make debugging easier.
+Subject: [PATCH 7/7] Add %.S and %.E rules to make debugging easier.
---
Make.rules | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ 1 file changed, 5 insertions(+)
diff --git a/Make.rules b/Make.rules
-index 1f24ebd..cb029c3 100644
+index eab12d7..65fb612 100644
--- a/Make.rules
+++ b/Make.rules
-@@ -31,3 +31,8 @@
+@@ -44,3 +44,8 @@
%.o: %.c
$(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
@@ -21,5 +21,5 @@ index 1f24ebd..cb029c3 100644
+%.E: %.c
+ $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -E $< -o $@
--
-1.7.6
+1.7.10.4
diff --git a/gnu-efi-3.0e-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch b/gnu-efi-3.0q-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch
similarity index 88%
rename from gnu-efi-3.0e-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch
rename to gnu-efi-3.0q-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch
index 8617c34..ecb5c56 100644
--- a/gnu-efi-3.0e-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch
+++ b/gnu-efi-3.0q-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch
@@ -1,7 +1,7 @@
-From 364351b4448ff20730250e89ad09088d6aeafc72 Mon Sep 17 00:00:00 2001
+From 3f40a425e763edfde77a9a6e05ed09b0676d8fa9 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] Fix usage of INSTALLROOT, PREFIX, and LIBDIR.
+Subject: [PATCH 1/7] Fix usage of INSTALLROOT, PREFIX, and LIBDIR.
I screwed it up last time.
---
@@ -10,10 +10,10 @@ I screwed it up last time.
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Make.defaults b/Make.defaults
-index 4ad6480..de72d9b 100644
+index bf162c5..6278fa7 100644
--- a/Make.defaults
+++ b/Make.defaults
-@@ -25,8 +25,9 @@
+@@ -38,8 +38,9 @@
# Where to install the package. GNU-EFI will create and access
# lib and include under the root
#
@@ -25,10 +25,10 @@ index 4ad6480..de72d9b 100644
TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
-@@ -59,7 +60,6 @@ endif
+@@ -73,7 +74,6 @@ endif
ifeq ($(ARCH), x86_64)
- CFLAGS += -DEFI_FUNCTION_WRAPPER -mno-red-zone
+ CFLAGS += -mno-red-zone
- LIBDIR = lib
ifeq ($(HOSTARCH), ia32)
ARCH3264 = -m64
@@ -62,5 +62,5 @@ index 9683be5..71fded5 100644
include $(SRCDIR)/../Make.rules
--
-1.5.4.5
+1.7.10.4
diff --git a/gnu-efi-3.0e-handle-uninitialized-gop.patch b/gnu-efi-3.0q-handle-uninitialized-gop.patch
similarity index 87%
rename from gnu-efi-3.0e-handle-uninitialized-gop.patch
rename to gnu-efi-3.0q-handle-uninitialized-gop.patch
index 3a0db88..450ad8b 100644
--- a/gnu-efi-3.0e-handle-uninitialized-gop.patch
+++ b/gnu-efi-3.0q-handle-uninitialized-gop.patch
@@ -1,11 +1,11 @@
-From c261b8de0504fd37af99c61cdda248f312124034 Mon Sep 17 00:00:00 2001
+From 0f8b3ac2ec984de7f3437fe6a3b37ab8eb07ae71 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Thu, 16 Jun 2011 16:10:27 -0400
-Subject: [PATCH] Handle un-initialized GOP.
+Subject: [PATCH 6/7] Handle un-initialized GOP.
---
apps/modelist.c | 27 +++++++++++++++++++++++++++
- 1 files changed, 27 insertions(+), 0 deletions(-)
+ 1 file changed, 27 insertions(+)
diff --git a/apps/modelist.c b/apps/modelist.c
index c4a4b1a..8d816d1 100644
@@ -53,5 +53,5 @@ index c4a4b1a..8d816d1 100644
CHAR16 Buffer[64];
StatusToString(Buffer, rc);
--
-1.7.4.4
+1.7.10.4
diff --git a/gnu-efi-3.0e-machine-types.patch b/gnu-efi-3.0q-machine-types.patch
similarity index 91%
rename from gnu-efi-3.0e-machine-types.patch
rename to gnu-efi-3.0q-machine-types.patch
index 206c619..8c0aa72 100644
--- a/gnu-efi-3.0e-machine-types.patch
+++ b/gnu-efi-3.0q-machine-types.patch
@@ -1,17 +1,17 @@
-From eb2e79305e8363b1340afc24387a7b6967b5874b Mon Sep 17 00:00:00 2001
+From 9ab3fefd9b86c567ba6b0ea1429ce932572040c1 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Tue, 26 Apr 2011 13:25:26 -0400
-Subject: [PATCH] Add more machine type defines.
+Subject: [PATCH 5/7] Add more machine type defines.
Add machine type defines for i386, arm/thumb, ia64, ebc, and x86_64.
---
inc/ia32/pe.h | 4 ++++
inc/ia64/pe.h | 4 ++++
inc/x86_64/pe.h | 4 ++++
- 3 files changed, 12 insertions(+), 0 deletions(-)
+ 3 files changed, 12 insertions(+)
diff --git a/inc/ia32/pe.h b/inc/ia32/pe.h
-index c492606..85d6981 100644
+index 16e40ef..979b936 100644
--- a/inc/ia32/pe.h
+++ b/inc/ia32/pe.h
@@ -98,8 +98,12 @@ typedef struct _IMAGE_FILE_HEADER {
@@ -28,7 +28,7 @@ index c492606..85d6981 100644
// Directory format.
//
diff --git a/inc/ia64/pe.h b/inc/ia64/pe.h
-index 618d59f..226e49d 100644
+index f67128d..b1cade2 100644
--- a/inc/ia64/pe.h
+++ b/inc/ia64/pe.h
@@ -113,8 +113,12 @@ typedef struct _IMAGE_FILE_HEADER {
@@ -45,7 +45,7 @@ index 618d59f..226e49d 100644
// Directory format.
//
diff --git a/inc/x86_64/pe.h b/inc/x86_64/pe.h
-index f0a1fd0..4f5f469 100644
+index 16e40ef..979b936 100644
--- a/inc/x86_64/pe.h
+++ b/inc/x86_64/pe.h
@@ -98,8 +98,12 @@ typedef struct _IMAGE_FILE_HEADER {
@@ -62,5 +62,5 @@ index f0a1fd0..4f5f469 100644
// Directory format.
//
--
-1.7.3.1
+1.7.10.4
diff --git a/gnu-efi-3.0e-modelist.patch b/gnu-efi-3.0q-modelist.patch
similarity index 89%
rename from gnu-efi-3.0e-modelist.patch
rename to gnu-efi-3.0q-modelist.patch
index 4dcf545..e176697 100644
--- a/gnu-efi-3.0e-modelist.patch
+++ b/gnu-efi-3.0q-modelist.patch
@@ -1,25 +1,25 @@
-From b9bc87d00d55891a443c8a276842abdcd6df9482 Mon Sep 17 00:00:00 2001
+From d29825db356c7ea240e62404c5d3422c01c18bd4 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Fri, 10 Sep 2010 16:04:38 -0400
-Subject: [PATCH] Add "modelist" test app.
+Subject: [PATCH 3/7] Add "modelist" test app.
This lists video modes the GOP driver is showing us.
---
apps/Makefile | 2 +-
apps/modelist.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 88 insertions(+), 1 deletions(-)
+ 2 files changed, 88 insertions(+), 1 deletion(-)
create mode 100644 apps/modelist.c
diff --git a/apps/Makefile b/apps/Makefile
-index c063d9a..0919bf3 100644
+index 6bda7ea..45bc4ac 100644
--- a/apps/Makefile
+++ b/apps/Makefile
-@@ -45,7 +45,7 @@ LDFLAGS += -T $(LDSCRIPT) -shared -Bsymbolic -L../lib -L../gnuefi $(CRTOBJS)
+@@ -58,7 +58,7 @@ LDFLAGS += -T $(LDSCRIPT) -shared -Bsymbolic -L../lib -L../gnuefi $(CRTOBJS)
LOADLIBES = -lefi -lgnuefi $(shell $(CC) $(ARCH3264) -print-libgcc-file-name)
FORMAT = efi-app-$(ARCH)
--TARGETS = t.efi t2.efi t3.efi t4.efi t5.efi t6.efi printenv.efi t7.efi route80h.efi
-+TARGETS = t.efi t2.efi t3.efi t4.efi t5.efi t6.efi printenv.efi t7.efi route80h.efi modelist.efi
+-TARGETS = t.efi t2.efi t3.efi t4.efi t5.efi t6.efi printenv.efi t7.efi tcc.efi route80h.efi
++TARGETS = t.efi t2.efi t3.efi t4.efi t5.efi t6.efi printenv.efi t7.efi tcc.efi route80h.efi modelist.efi
all: $(TARGETS)
@@ -117,5 +117,5 @@ index 0000000..c4a4b1a
+ return EFI_SUCCESS;
+}
--
-1.7.2.2
+1.7.10.4
diff --git a/gnu-efi-3.0e-route80h-add-cougarpoint.patch b/gnu-efi-3.0q-route80h-add-cougarpoint.patch
similarity index 85%
rename from gnu-efi-3.0e-route80h-add-cougarpoint.patch
rename to gnu-efi-3.0q-route80h-add-cougarpoint.patch
index 00f9232..64c2c71 100644
--- a/gnu-efi-3.0e-route80h-add-cougarpoint.patch
+++ b/gnu-efi-3.0q-route80h-add-cougarpoint.patch
@@ -1,12 +1,12 @@
-From 628dbd2ecce3793850f7c7d789b0adcab6746809 Mon Sep 17 00:00:00 2001
+From b7a088b6f3ffacc5b98e1568bed7dcf225089c20 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Thu, 11 Nov 2010 16:42:16 -0500
-Subject: [PATCH] Add CougarPoint support to route80h.c
+Subject: [PATCH 4/7] Add CougarPoint support to route80h.c
CougarPoint is some other northbridge. Yay!
---
apps/route80h.c | 16 +++++++++++++++-
- 1 files changed, 15 insertions(+), 1 deletions(-)
+ 1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/apps/route80h.c b/apps/route80h.c
index 1a04b5a..30330ab 100644
@@ -45,5 +45,5 @@ index 1a04b5a..30330ab 100644
if (rc == EFI_NOT_FOUND) {
Print(L"Device not found.\n");
--
-1.7.2.2
+1.7.10.4
diff --git a/gnu-efi-3.0e-route80h.patch b/gnu-efi-3.0q-route80h.patch
similarity index 91%
rename from gnu-efi-3.0e-route80h.patch
rename to gnu-efi-3.0q-route80h.patch
index 1040c4a..a0ea3f7 100644
--- a/gnu-efi-3.0e-route80h.patch
+++ b/gnu-efi-3.0q-route80h.patch
@@ -1,31 +1,31 @@
-From 796ce7f03ed606a801b6a23384e8cf4a13c46fc6 Mon Sep 17 00:00:00 2001
+From 61b347a766d9e2f85fcbca96b535b9fdffe7fe8b Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Mon, 26 Jul 2010 17:04:12 -0400
-Subject: [PATCH] Add the "route80h.efi" test program.
+Subject: [PATCH 2/7] Add the "route80h.efi" test program.
This is a test program for PciIo. It routes port80h on ICH10 to PCI.
---
apps/Makefile | 2 +-
apps/route80h.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 126 insertions(+), 1 deletions(-)
+ 2 files changed, 126 insertions(+), 1 deletion(-)
create mode 100644 apps/route80h.c
diff --git a/apps/Makefile b/apps/Makefile
-index 44122ad..2baf64d 100644
+index 1e43821..6bda7ea 100644
--- a/apps/Makefile
+++ b/apps/Makefile
-@@ -38,7 +38,7 @@ LDFLAGS += -T $(LDSCRIPT) -shared -Bsymbolic -L../lib -L../gnuefi $(CRTOBJS)
+@@ -58,7 +58,7 @@ LDFLAGS += -T $(LDSCRIPT) -shared -Bsymbolic -L../lib -L../gnuefi $(CRTOBJS)
LOADLIBES = -lefi -lgnuefi $(shell $(CC) $(ARCH3264) -print-libgcc-file-name)
FORMAT = efi-app-$(ARCH)
--TARGETS = t.efi t2.efi t3.efi t4.efi t5.efi t6.efi printenv.efi t7.efi
-+TARGETS = t.efi t2.efi t3.efi t4.efi t5.efi t6.efi printenv.efi t7.efi route80h.efi
+-TARGETS = t.efi t2.efi t3.efi t4.efi t5.efi t6.efi printenv.efi t7.efi tcc.efi
++TARGETS = t.efi t2.efi t3.efi t4.efi t5.efi t6.efi printenv.efi t7.efi tcc.efi route80h.efi
all: $(TARGETS)
diff --git a/apps/route80h.c b/apps/route80h.c
new file mode 100644
-index 0000000..05cc883
+index 0000000..1a04b5a
--- /dev/null
+++ b/apps/route80h.c
@@ -0,0 +1,125 @@
@@ -155,5 +155,5 @@ index 0000000..05cc883
+ return EFI_SUCCESS;
+}
--
-1.7.1.1
+1.7.10.4
diff --git a/gnu-efi.spec b/gnu-efi.spec
index 8eb28f4..6c5287f 100644
--- a/gnu-efi.spec
+++ b/gnu-efi.spec
@@ -1,26 +1,18 @@
Summary: Development Libraries and headers for EFI
Name: gnu-efi
-Version: 3.0e
-Release: 18%{?dist}
+Version: 3.0q
+Release: 1%{?dist}
Group: Development/System
-License: GPLv2+
+License: BSD
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.patch
-Patch3: gnu-efi-3.0e-add-uefi-2.x-boot-services.patch
-Patch4: gnu-efi-3.0e-add-pciio.patch
-Patch5: gnu-efi-3.0e-route80h.patch
-Patch6: gnu-efi-3.0e-modelist.patch
-Patch7: gnu-efi-3.0e-route80h-add-cougarpoint.patch
-Patch8: gnu-efi-3.0e-machine-types.patch
-Patch9: gnu-efi-3.0e-handle-uninitialized-gop.patch
-Patch10: gnu-efi-3.0e-Add-.S-and-.E-rules.patch
-Patch11: gnu-efi-3.0e-Guarantee-16-byte-stack-alignment-on-x86_64-efi_call.patch
-Patch12: gnu-efi-3.0e-Add-the-routines-to-make-callbacks-work.patch
-Patch13: gnu-efi-3.0e-Add-tcc.efi-to-test-our-calling-convention-shananaga.patch
-Patch14: gnu-efi-3.0e-align-reloc-section.patch
+Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-%{version}.tar.gz
+Patch0: gnu-efi-3.0q-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch
+Patch1: gnu-efi-3.0q-route80h.patch
+Patch2: gnu-efi-3.0q-modelist.patch
+Patch3: gnu-efi-3.0q-route80h-add-cougarpoint.patch
+Patch4: gnu-efi-3.0q-machine-types.patch
+Patch5: gnu-efi-3.0q-handle-uninitialized-gop.patch
+Patch6: gnu-efi-3.0q-Add-.S-and-.E-rules.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: i686 x86_64 ia64
BuildRequires: git
@@ -70,6 +62,10 @@ rm -rf %{buildroot}
%attr(0644,root,root) /boot/efi/EFI/redhat/*.efi
%changelog
+* Fri Jul 27 2012 Matthew Garrett <mjg at redhat.com> - 3.0q-1
+- Update to current upstream
+- License change - GPLv2+ to BSD
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0e-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 7516131..c75f7af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e915989bc79249d167d3102aa9bd792b gnu-efi-3.0e.tar.bz2
+9c3a873b364aa58c057f829c83463925 gnu-efi-3.0q.tar.gz
More information about the scm-commits
mailing list