Maybe even provide the *right* old linker deps.

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2016-09-28 11:31:35 -04:00
parent daf9b65522
commit c8fe6e79dc
2 changed files with 17 additions and 14 deletions

View File

@ -1,7 +1,7 @@
From 106068931a9ace55140371ade9588c60991061a0 Mon Sep 17 00:00:00 2001 From 7ae5c70750d31d7ddce736b5979d15a1a0ccaae2 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com> From: Peter Jones <pjones@redhat.com>
Date: Wed, 28 Sep 2016 09:28:24 -0400 Date: Wed, 28 Sep 2016 09:28:24 -0400
Subject: [PATCH] lib*: provide LIBEFIVAR_0.28 etc. Subject: [PATCH] lib*: provide LIBEFIVAR_1.28 etc.
Signed-off-by: Peter Jones <pjones@redhat.com> Signed-off-by: Peter Jones <pjones@redhat.com>
--- ---
@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 16 insertions(+), 4 deletions(-) 2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/libefiboot.map.in b/src/libefiboot.map.in diff --git a/src/libefiboot.map.in b/src/libefiboot.map.in
index 51822a5..9de1232 100644 index 51822a5..dce38a3 100644
--- a/src/libefiboot.map.in --- a/src/libefiboot.map.in
+++ b/src/libefiboot.map.in +++ b/src/libefiboot.map.in
@@ -23,7 +23,13 @@ LIBEFIBOOT_0.0 { @@ -23,7 +23,13 @@ LIBEFIBOOT_0.0 {
@ -20,17 +20,17 @@ index 51822a5..9de1232 100644
-}; -};
+} LIBEFIBOOT_0.0; +} LIBEFIBOOT_0.0;
+ +
+LIBEFIBOOT_0.28 { +LIBEFIBOOT_1.28 {
+} LIBEFIBOOT_0.24; +} LIBEFIBOOT_0.24;
+ +
+LIBEFIBOOT_0.29 { +LIBEFIBOOT_1.29 {
+} LIBEFIBOOT_0.28; +} LIBEFIBOOT_1.28;
LIBEFIBOOT_1.@@VERSION@@ { LIBEFIBOOT_1.@@VERSION@@ {
-}; -};
+} LIBEFIBOOT_0.29; +} LIBEFIBOOT_1.29;
diff --git a/src/libefivar.map.in b/src/libefivar.map.in diff --git a/src/libefivar.map.in b/src/libefivar.map.in
index 6b8f996..b2743ef 100644 index 6b8f996..033eb8d 100644
--- a/src/libefivar.map.in --- a/src/libefivar.map.in
+++ b/src/libefivar.map.in +++ b/src/libefivar.map.in
@@ -99,8 +99,14 @@ LIBEFIVAR_0.24 { @@ -99,8 +99,14 @@ LIBEFIVAR_0.24 {
@ -38,18 +38,18 @@ index 6b8f996..b2743ef 100644
} LIBEFIVAR_0.0; } LIBEFIVAR_0.0;
-LIBEFIVAR_1.@@VERSION@@ { -LIBEFIVAR_1.@@VERSION@@ {
+LIBEFIVAR_0.28 { +LIBEFIVAR_1.28 {
global: efi_error_set; global: efi_error_set;
efi_error_get; efi_error_get;
efi_error_clear; efi_error_clear;
-}; -};
+} LIBEFIVAR_0.24; +} LIBEFIVAR_0.24;
+ +
+LIBEFIVAR_0.29 { +LIBEFIVAR_1.29 {
+} LIBEFIVAR_0.28; +} LIBEFIVAR_1.28;
+ +
+LIBEFIVAR_1.@@VERSION@@ { +LIBEFIVAR_1.@@VERSION@@ {
+} LIBEFIVAR_0.29; +} LIBEFIVAR_1.29;
-- --
2.7.4 2.7.4

View File

@ -1,6 +1,6 @@
Name: efivar Name: efivar
Version: 30 Version: 30
Release: 2%{?dist} Release: 3{?dist}
Summary: Tools to manage UEFI variables Summary: Tools to manage UEFI variables
License: LGPLv2.1 License: LGPLv2.1
URL: https://github.com/rhinstaller/efivar URL: https://github.com/rhinstaller/efivar
@ -9,7 +9,7 @@ ExclusiveArch: %{ix86} x86_64 aarch64
BuildRequires: popt-devel popt-static git glibc-static BuildRequires: popt-devel popt-static git glibc-static
Source0: https://github.com/rhinstaller/efivar/releases/download/efivar-%{version}/efivar-%{version}.tar.bz2 Source0: https://github.com/rhinstaller/efivar/releases/download/efivar-%{version}/efivar-%{version}.tar.bz2
Patch0001: 0001-lib-provide-LIBEFIVAR_0.28-etc.patch Patch0001: 0001-lib-provide-LIBEFIVAR_1.28-etc.patch
%description %description
efivar provides a simple command line interface to the UEFI variable facility. efivar provides a simple command line interface to the UEFI variable facility.
@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.so.* %{_libdir}/*.so.*
%changelog %changelog
* Wed Sep 28 2016 Peter Jones <pjones@redhat.com> - 30-3
- Maybe even provide the *right* old linker deps.
* Tue Sep 27 2016 Peter Jones <pjones@redhat.com> - 30-2 * Tue Sep 27 2016 Peter Jones <pjones@redhat.com> - 30-2
- Try not to screw up SONAME stuff quite so badly. - Try not to screw up SONAME stuff quite so badly.