From 49ae245a5b03551f740b6d20e4d022ba378398b100af7f2c6873fb655cb80203 Mon Sep 17 00:00:00 2001 From: Raymund Will Date: Fri, 12 Jun 2015 07:41:29 +0000 Subject: [PATCH] Accepting request 311695 from home:pluskalm:branches:Base:System - Update to 3.0.2 * Last entry in changelog same as for version 3.0w - Drop no longer needed patches (both part of upstream) * gnu-efi-build-fix.patch * gnu-efi-allow-external-stdarg.patch - Cleanup spec file with spec-cleaner OBS-URL: https://build.opensuse.org/request/show/311695 OBS-URL: https://build.opensuse.org/package/show/Base:System/gnu-efi?expand=0&rev=17 --- gnu-efi-3.0.2.tar.bz2 | 3 + gnu-efi-allow-external-stdarg.patch | 42 ----------- gnu-efi-build-fix.patch | 113 ---------------------------- gnu-efi.changes | 10 +++ gnu-efi.spec | 38 ++++------ gnu-efi_3.0w.orig.tar.gz | 3 - 6 files changed, 27 insertions(+), 182 deletions(-) create mode 100644 gnu-efi-3.0.2.tar.bz2 delete mode 100644 gnu-efi-allow-external-stdarg.patch delete mode 100644 gnu-efi-build-fix.patch delete mode 100644 gnu-efi_3.0w.orig.tar.gz diff --git a/gnu-efi-3.0.2.tar.bz2 b/gnu-efi-3.0.2.tar.bz2 new file mode 100644 index 0000000..b90b2f5 --- /dev/null +++ b/gnu-efi-3.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:194b580ecdb1fad0e41914845ba064c279afb687855960b58693459e5537b4d7 +size 136134 diff --git a/gnu-efi-allow-external-stdarg.patch b/gnu-efi-allow-external-stdarg.patch deleted file mode 100644 index 8400952..0000000 --- a/gnu-efi-allow-external-stdarg.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6c10e225bc759d69af520a551b9d7b37f3ae0a82 Mon Sep 17 00:00:00 2001 -From: Nigel Croxon -Date: Mon, 25 Aug 2014 08:51:23 -0400 -Subject: [PATCH] From: David Decotigny Date: Thu, 31 Jul - 2014 18:19:16 -0700 Subject: [PATCH 5/5] allow to use external stdarg.h - -in cases we use gnu-efi together with other libs that define stdarg.h, -break the tie by telling gnu-efi to use that stdarg.h . - -Signed-off-by: David Decotigny -Signed-off-by: Nigel Croxon ---- - gnu-efi-3.0/inc/efistdarg.h | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/gnu-efi-3.0/inc/efistdarg.h b/gnu-efi-3.0/inc/efistdarg.h -index 440f9cd..bb04b31 100644 ---- a/gnu-efi-3.0/inc/efistdarg.h -+++ b/gnu-efi-3.0/inc/efistdarg.h -@@ -19,10 +19,15 @@ Revision History - - --*/ - -+#ifndef GNU_EFI_USE_EXTERNAL_STDARG - typedef __builtin_va_list va_list; - --#define va_start(v,l) __builtin_va_start(v,l) --#define va_end(v) __builtin_va_end(v) --#define va_arg(v,l) __builtin_va_arg(v,l) --#define va_copy(d,s) __builtin_va_copy(d,s) -+# define va_start(v,l) __builtin_va_start(v,l) -+# define va_end(v) __builtin_va_end(v) -+# define va_arg(v,l) __builtin_va_arg(v,l) -+# define va_copy(d,s) __builtin_va_copy(d,s) -+#else -+# include -+#endif -+ - #endif --- -1.8.4.5 - diff --git a/gnu-efi-build-fix.patch b/gnu-efi-build-fix.patch deleted file mode 100644 index 43fab4b..0000000 --- a/gnu-efi-build-fix.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 0a69c42779d1d28aa406fa2c435b180156ee3435 Mon Sep 17 00:00:00 2001 -From: Fedora Ninjas -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.changes b/gnu-efi.changes index fd34d65..b972963 100644 --- a/gnu-efi.changes +++ b/gnu-efi.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jun 11 20:50:21 UTC 2015 - mpluskal@suse.com + +- Update to 3.0.2 + * Last entry in changelog same as for version 3.0w +- Drop no longer needed patches (both part of upstream) + * gnu-efi-build-fix.patch + * gnu-efi-allow-external-stdarg.patch +- Cleanup spec file with spec-cleaner + ------------------------------------------------------------------- Fri Sep 26 02:41:54 UTC 2014 - glin@suse.com diff --git a/gnu-efi.spec b/gnu-efi.spec index bfa1c56..79701d5 100644 --- a/gnu-efi.spec +++ b/gnu-efi.spec @@ -1,7 +1,7 @@ # # spec file for package gnu-efi # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,14 @@ Name: gnu-efi -Version: 3.0w +Version: 3.0.2 Release: 0 Summary: Library for EFI Applications License: BSD-3-Clause and GPL-2.0+ Group: Development/Libraries/Other Url: http://sourceforge.net/projects/gnu-efi -Source: http://downloads.sourceforge.net/gnu-efi/gnu-efi_3.0w.orig.tar.gz +Source: http://sourceforge.net/projects/gnu-efi/files/gnu-efi-%{version}.tar.bz2 Source1: %{name}-rpmlintrc -Patch1: %{name}-build-fix.patch -Patch2: %{name}-allow-external-stdarg.patch BuildRequires: kernel-source BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ia64 %ix86 x86_64 aarch64 @@ -35,41 +33,33 @@ ExclusiveArch: ia64 %ix86 x86_64 aarch64 Library to develop EFI applications for IA-64 (IPF), IA-32 (x86) and x86_64 platforms using the GNU toolchain and the EFI development environment. -Authors: --------- - Johannes Erdfelt - David Mosberger - Stephane Eranian - %prep -%setup -q -n gnu-efi-3.0 -%patch1 -p1 -%patch2 -p2 +%setup -q %build ########################## ## DO NOT ADD RPM OPT FLAGS! THIS DOES NOT BUILD AGAINST GLIBC ## ########################## -make LINUX_HEADERS=/usr/src/linux +make %{?_smp_mflags} LINUX_HEADERS=%{_prefix}/src/linux %install -make install INSTALLROOT=%{buildroot} LIBDIR=%{_prefix}/%_lib PREFIX=%{_prefix} +make install INSTALLROOT=%{buildroot} LIBDIR=%{_libdir} PREFIX=%{_prefix} %if 0 -mkdir %{buildroot}%{_prefix}/%{_lib}/%{name} -cp -p apps/*.efi %{buildroot}%{_prefix}/%{_lib}/%{name} +mkdir %{buildroot}%{_libdir}/%{name} +cp -p apps/*.efi %{buildroot}%{_libdir}/%{name} %endif %files %defattr(-, root, root) %doc README.* -%{_prefix}/include/efi -%{_prefix}/%{_lib}/crt0-efi-*.o -%{_prefix}/%{_lib}/elf_*_efi.lds -%{_prefix}/%{_lib}/libefi.a -%{_prefix}/%{_lib}/libgnuefi.a +%{_includedir}/efi +%{_libdir}/crt0-efi-*.o +%{_libdir}/elf_*_efi.lds +%{_libdir}/libefi.a +%{_libdir}/libgnuefi.a %if 0 -%{_prefix}/%{_lib}/%{name} +%{_libdir}/%{name} %endif %changelog diff --git a/gnu-efi_3.0w.orig.tar.gz b/gnu-efi_3.0w.orig.tar.gz deleted file mode 100644 index 4048593..0000000 --- a/gnu-efi_3.0w.orig.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5c5ca168d25bb54ea936a25175d7626778001f788bddc60dbed103874583621 -size 172913