Accepting request 311544 from home:pluskalm:branches:Base:System

- Use default CFLAGS - Update to 0.20 * Make sure tester is build with the right link order for libraries. * Adjust linker order for pkg-config * Work around LocateDevicePath() not grokking PcieRoot() devices properly. * Rectify some missing changelog entries - Changes for 0.19 * Lots of debugging in this release, as well as some of the documentation that's planned. There's more of that to come. - Changes for 0.18 * This release is mostly about adding the efidp and libefiboot APIs available.Next release will feature documentation for them, verification that various different device path types work, etc. Right now efi device path generation is basically limited to: + full file paths on sata devices + full file paths on sas devices + HD() paths for SATA and SAS devices + ipv4 dhcp device paths that don't specify their own filenames - Drop upstreamed patche * efivar-correct-license-header.patch - Drop as Makefiles have been restructured, CFLAGS no longer defined in them * efivar-suse-build.patch - Use fdupes to reduce amount of duplicate files OBS-URL: https://build.opensuse.org/request/show/311544 OBS-URL: https://build.opensuse.org/package/show/Base:System/efivar?expand=0&rev=5
2015-06-12 01:46:12 +00:00 · 2015-06-12 01:46:12 +00:00 · aa2420073f
commit aa2420073f
parent e88dca50cb
6 changed files with 48 additions and 83 deletions
--- a/efivar-0.15.tar.bz2
+++ b/efivar-0.15.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08251e10dbee8a5a9851d859b98fc6cb479acfced38695a101bd8ed2a447051e
-size 26936
--- a/efivar-0.20.tar.bz2
+++ b/efivar-0.20.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf699c1406c6d012ab0665f653b2f1a14d99edd8e2bf06f5ac2caa1b10e030a9
+size 66165
--- a/efivar-correct-license-header.patch
+++ b/efivar-correct-license-header.patch
@ -1,47 +0,0 @@
-From f41c4b36f83cd33f7eeef0daa76712073d6aec5f Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 6 Nov 2014 12:14:59 -0500
-Subject: [PATCH] Make the license terms of util.h be right.
-
-This code is all mine, so there's nothing weird going on here, I just
-put the wrong license blurb in the file.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
---
- src/util.h | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/src/util.h b/src/util.h
-index 1cd59d2..189350c 100644
--- a/src/util.h
-+++ b/src/util.h
-@@ -2,17 +2,18 @@
-  * Copyright 2011-2014 Red Hat, Inc.
-  * All rights reserved.
-  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation;
-+ * version 2.1 of the License.
-  *
- * This program is distributed in the hope that it will be useful,
-+ * This library is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * along with this library.  If not, see <http://www.gnu.org/licenses/>.
-  *
-  * Author(s): Peter Jones <pjones@redhat.com>
-  */
-- 
-1.8.4.5
-
--- a/efivar-suse-build.patch
+++ b/efivar-suse-build.patch
@ -1,26 +0,0 @@
-diff --git a/Make.defaults b/Make.defaults
-index a6f2ea0..e559fec 100644
--- a/Make.defaults
-+++ b/Make.defaults
-@@ -6,7 +6,7 @@ bindir	?= /usr/bin/
- PCDIR	?= $(libdir)/pkgconfig/
- CC	:= $(if $(filter default,$(origin CC)),gcc,$(CC))
- CCLD	:= $(if $(filter undefined,$(origin CCLD)),$(CC),$(CCLD))
-CFLAGS	?= -O0 -g
-+CFLAGS	:= $(OPT_FLAGS)
- 
- ARCH = $(shell uname -m)
- clang_cflags =
-diff --git a/src/Makefile b/src/Makefile
-index d5bd885..5a767cd 100644
--- a/src/Makefile
-+++ b/src/Makefile
-@@ -22,7 +22,7 @@ libefivar.a :: $(OBJECTS)
- libefivar.so.$(SONAME_VERSION) :: $(OBJECTS)
- 
- efivar : efivar.o libefivar.so
-	$(CCLD) $(ccldflags) -L. -lefivar -o $@ $^ -lpopt $(foreach lib,$(LIBS),-l$(lib))
-+	$(CCLD) $(ccldflags) -L. $^ -lefivar -o $@ -lpopt $(foreach lib,$(LIBS),-l$(lib))
- 
- efivar.pc : efivar.pc.in
- 	sed -e "s,@@VERSION@@,$(VERSION),g" \
--- a/efivar.changes
+++ b/efivar.changes
@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Thu Jun 11 06:59:41 UTC 2015 - mpluskal@suse.com
+
+- Use default CFLAGS
+
+-------------------------------------------------------------------
+Wed Jun  3 07:46:58 UTC 2015 - mpluskal@suse.com
+
+- Update to 0.20
+  * Make sure tester is build with the right link order for 
+    libraries.
+  * Adjust linker order for pkg-config
+  * Work around LocateDevicePath() not grokking PcieRoot() devices
+    properly.
+  * Rectify some missing changelog entries
+- Changes for 0.19
+  * Lots of debugging in this release, as well as some of the 
+    documentation that's planned. There's more of that to come.
+- Changes for 0.18
+  * This release is mostly about adding the efidp and libefiboot 
+    APIs available.Next release will feature documentation for 
+    them, verification that various different device path types 
+    work, etc. Right now efi device path generation is basically 
+    limited to:
+    + full file paths on sata devices
+    + full file paths on sas devices
+    + HD() paths for SATA and SAS devices
+    + ipv4 dhcp device paths that don't specify their own 
+      filenames
+- Drop upstreamed patche
+  * efivar-correct-license-header.patch
+- Drop as Makefiles have been restructured, CFLAGS no longer
+  defined in them
+  * efivar-suse-build.patch
+- Use fdupes to reduce amount of duplicate files
+
 -------------------------------------------------------------------
 Fri Nov  7 02:20:06 UTC 2014 - glin@suse.com

--- a/efivar.spec
+++ b/efivar.spec
@ -1,7 +1,7 @@
 #
 # spec file for package efivar
 #
-# 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,15 +17,14 @@


 Name:           efivar
-Version:        0.15
+Version:        0.20
 Release:        0
 Summary:        Tools to manage UEFI variables
 License:        LGPL-2.1
 Group:          Development/Libraries/Other
 Url:            https://github.com/vathpela/efivar
 Source0:        https://github.com/vathpela/efivar/releases/download/%{version}/%{name}-%{version}.tar.bz2
-Patch0:         efivar-suse-build.patch
-Patch1:         efivar-correct-license-header.patch
+BuildRequires:  fdupes
 BuildRequires:  pkg-config
 BuildRequires:  popt-devel
 Requires:       libefivar0 = %{version}-%{release}
@ -50,14 +49,17 @@ development headers required to use libefivar.

 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1

 %build
-make %{?_smp_mflags} libdir=%{_libdir} bindir=%{_bindir} OPT_FLAGS="%{optflags}"
+export CFLAGS="%{optflags}"
+make \
+  %{?_smp_mflags} \
+  libdir=%{_libdir} \
+  bindir=%{_bindir}

 %install
 make DESTDIR=%{buildroot} libdir=%{_libdir} install
+%fdupes -s %{buildroot}

 %post -n libefivar0 -p /sbin/ldconfig