[gnu-efi/f20] New upstream version 3.0w

[Peter Jones]

commit 00ee2aed955fc64a95d987b17243509433bad8b4
Author: Kyle McMartin <kyle at mcmartin.ca>
Date:   Tue Aug 26 13:33:17 2014 -0400

    New upstream version 3.0w
    
    - Add pjones' build fixes patch from that other distro.
    - Enable AArch64
    
    Conflicts:
    	gnu-efi.spec

 ...ilation-on-x86_64-without-HAVE_USE_MS_ABI.patch |   29 --
 0002-be-more-pedantic-when-linking.patch           |   46 ---
 0003-Sample-boot-service-driver.patch              |  371 --------------------
 build-fix.patch                                    |  113 ++++++
 gnu-efi.spec                                       |   21 +-
 sources                                            |    1 +
 6 files changed, 129 insertions(+), 452 deletions(-)
---
diff --git a/build-fix.patch b/build-fix.patch
new file mode 100644
index 0000000..3f78d96
--- /dev/null
+++ b/build-fix.patch
@@ -0,0 +1,113 @@
+From 0a69c42779d1d28aa406fa2c435b180156ee3435 Mon Sep 17 00:00:00 2001
+From: Fedora Ninjas <pjones at fedoraproject.org>
+Date: Thu, 15 May 2014 21:29:25 -0400
+Subject: [PATCH] Try to make this build.
+
+---
+ Make.defaults 
+ inc/Makefile  
+ 2 files changed, 12 insertions(+), 22 deletion(-)
+
+diff -up a/gnuefi/Makefile b/gnuefi/Makefile
+--- a/gnuefi/Makefile	2014-05-15 17:15:54.000000000 -0500
++++ b/gnuefi/Makefile	2014-05-19 14:02:29.048732554 -0500
+@@ -52,19 +52,6 @@ reloc_aarch64.o: CFLAGS += -fno-jump-tab
+ 
+ TARGETS	= crt0-efi-$(ARCH).o libgnuefi.a
+ 
+-INSTALLTARGETS = $(TARGETS)
+-ifneq (,$(findstring FreeBSD,$(OS)))
+- ifeq ($(ARCH),x86_64)
+-  INSTALLTARGETS += elf_$(ARCH)_fbsd_efi.lds
+- else
+-  INSTALLTARGETS += elf_$(ARCH)_efi.lds
+- endif
+-else
+-  INSTALLTARGETS += elf_$(ARCH)_efi.lds
+-endif
+-
+-LIBDIRINSTALL = $(INSTALLROOT)/$(LIBDIR)
+-
+ all:	$(TARGETS)
+ 
+ libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS))
+@@ -72,14 +59,17 @@ libgnuefi.a: $(patsubst %,libgnuefi.a(%)
+ clean:
+ 	rm -f $(TARGETS) *~ *.o $(OBJS)
+ 
+-$(LIBDIRINSTALL):
+-	mkdir -p $@
+-
+-.SECONDEXPANSION:
+-
+-$(LIBDIRINSTALL)/%: % | $$(dir $$@)
+-	$(INSTALL) -m 644 $< $(dir $@)
+-
+-install: $(addprefix $(LIBDIRINSTALL)/,$(INSTALLTARGETS))
++install:
++	mkdir -p $(INSTALLROOT)/$(LIBDIR)
++	$(INSTALL) -m 644 $(TARGETS) $(INSTALLROOT)/$(LIBDIR)
++ifneq (,$(findstring FreeBSD,$(OS)))
++ ifeq ($(ARCH),x86_64)
++	$(INSTALL) -m 644 elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)/$(LIBDIR)
++ else
++	$(INSTALL) -m 644 elf_$(ARCH)_efi.lds $(INSTALLROOT)/$(LIBDIR)
++ endif
++else
++	$(INSTALL) -m 644 elf_$(ARCH)_efi.lds $(INSTALLROOT)/$(LIBDIR)
++endif
+ 
+ include $(SRCDIR)/../Make.rules
+diff --git a/inc/Makefile b/inc/Makefile
+index 526af22..71fded5 100644
+--- a/inc/Makefile
++++ b/inc/Makefile
+@@ -8,34 +8,20 @@ TOPDIR = $(SRCDIR)/..
+ 
+ CDIR=$(TOPDIR)/..
+ 
+-INCDIRINSTALL = $(INSTALLROOT)$(PREFIX)/include/efi
+-
+-SRCHEADERS = $(wildcard $(SRCDIR)/*.h) \
+-             $(wildcard $(SRCDIR)/protocol/*.h) \
+-             $(wildcard $(SRCDIR)/$(ARCH)/*.h)
+-ifeq ($(ARCH),ia64)
+- SRCHEADERS += $(wildcard $(SRCDIR)/protocol/$(ARCH)/*.h)
+-endif
+-
+-HEADERS = $(patsubst $(SRCDIR)/%,%,$(SRCHEADERS))
+-
+ all:
+ 
+ clean:
+ 
+-	rm -f *~
+-
+-$(INCDIRINSTALL) \
+-$(INCDIRINSTALL)/protocol \
+-$(INCDIRINSTALL)/$(ARCH) \
+-$(INCDIRINSTALL)/protocol/$(ARCH):
+-	mkdir -p $@
+-
+-.SECONDEXPANSION:
+-
+-$(INCDIRINSTALL)/%.h: %.h | $$(dir $$@)
+-	$(INSTALL) -m 644 $< $(dir $@)
+-
+-install: $(addprefix $(INCDIRINSTALL)/,$(HEADERS))
++install:
++	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi
++	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol
++	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
++	$(INSTALL) -m 644 *.h $(INSTALLROOT)$(PREFIX)/include/efi
++	$(INSTALL) -m 644 protocol/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol
++	$(INSTALL) -m 644 $(ARCH)/*.h $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
++ifeq ($(ARCH),ia64)
++	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
++	$(INSTALL) -m 644 protocol/ia64/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
++endif
+ 
+ include $(SRCDIR)/../Make.rules
+-- 
+1.8.3.1
+
diff --git a/gnu-efi.spec b/gnu-efi.spec
index 5e79677..8859054 100644
--- a/gnu-efi.spec
+++ b/gnu-efi.spec
@@ -1,16 +1,14 @@
 Summary: Development Libraries and headers for EFI
 Name: gnu-efi
-Version: 3.0u
-Release: 0.2%{?dist}
+Version: 3.0w
+Release: 0.1%{?dist}
 Group: Development/System
 License: BSD 
 URL: ftp://ftp.hpl.hp.com/pub/linux-ia64
 Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi_%{version}.orig.tar.gz
-Patch0001: 0001-fix-compilation-on-x86_64-without-HAVE_USE_MS_ABI.patch
-Patch0002: 0002-be-more-pedantic-when-linking.patch
-Patch0003: 0003-Sample-boot-service-driver.patch
+Patch0: build-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: i686 x86_64 ia64
+ExclusiveArch: i686 x86_64 ia64 aarch64
 BuildRequires: git
 
 %define debug_package %{nil}
@@ -86,6 +84,17 @@ rm -rf %{buildroot}
 %attr(0644,root,root) /boot/efi/EFI/%{efidir}/*.efi
 
 %changelog
+* Fri Aug 22 2014 Kyle McMartin <kyle at fedoraproject.org> - 3.0w-0.1
+- New upstream version 3.0w
+- Add pjones' build fixes patch from that other distro.
+- Enable AArch64
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0u-0.4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0u-0.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Tue Sep 24 2013 Peter Jones <pjones at redhat.com> - 3.0u-0.1
 - Update to 3.0u
 - Split out subpackages so -devel can be multilib
diff --git a/sources b/sources
index 59e01e7..4dcef2b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 d15d3c700e79a1e2938544d73edc572d  gnu-efi_3.0u.orig.tar.gz
+36d1c5e7b6edd4733700aaf749d9b80c  gnu-efi_3.0w.orig.tar.gz