diff --git a/0001-Make-efi_guid_ux_capsule-actually-work.patch b/0001-Make-efi_guid_ux_capsule-actually-work.patch new file mode 100644 index 0000000..830d66e --- /dev/null +++ b/0001-Make-efi_guid_ux_capsule-actually-work.patch @@ -0,0 +1,62 @@ +From cd732494ba7685feaf71b9ee58619ca6aef39fc9 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Tue, 12 Sep 2017 10:45:31 -0400 +Subject: [PATCH] Make efi_guid_ux_capsule actually work. + +Signed-off-by: Peter Jones +--- + src/abignore | 11 ++++++++++- + src/guids.txt | 2 +- + src/libefivar.map.in | 4 ++++ + 3 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/src/abignore b/src/abignore +index 74b5160..479b5c3 100644 +--- a/src/abignore ++++ b/src/abignore +@@ -14,7 +14,16 @@ + # 'efidp_wifi __anonymous_union__::wifi' at efivar-dp.h:868:1 + # + [suppress_type] +- soname_regexp = libefi(var|boot)\\.so ++ soname_regexp = libefi(var|boot)\\.so\\..* + name = efidp_data + type_kind = typedef + has_data_member_inserted_at = end ++ ++# 1 Added variable: ++# ++# 'const __anonymous_struct__ efi_guid_ux_capsule' {efi_guid_ux_capsule@@LIBEFIVAR_1.32} ++# ++[suppress_variable] ++ soname_regexp = ^libefivar\\.so\\.[[:digit:]]+ ++ symbol_name_regexp = ^efi_guid_[[:alnum:]_]+$ ++ change_kind = add-variable +diff --git a/src/guids.txt b/src/guids.txt +index 87e2f61..06081ed 100644 +--- a/src/guids.txt ++++ b/src/guids.txt +@@ -3,7 +3,7 @@ + 0abba7dc-e516-4167-bbf5-4d9d1c739416 redhat Red Hat + 0b6e5233-a65c-44c9-9407-d9ab83bfc8bd sha224 SHA-224 + 126a762d-5758-4fca-8531-201a7f57f850 lenovo_boot_menu Lenovo Boot Menu +-3b8c8162-188c-46a4-aec9-be43f1d65697 ux_capsule_guid Firmware update localized text image ++3b8c8162-188c-46a4-aec9-be43f1d65697 ux_capsule Firmware update localized text image + 3bd2a492-96c0-4079-b420-fcf98ef103ed x509_sha256 SHA256 hash of X.509 Certificate + 3c5766e8-269c-4e34-aa14-ed776e85b3b6 rsa2048 RSA 2048 + 3CC24E96-22C7-41D8-8863-8E39DCDCC2CF lenovo Lenovo +diff --git a/src/libefivar.map.in b/src/libefivar.map.in +index ba51d55..a95a505 100644 +--- a/src/libefivar.map.in ++++ b/src/libefivar.map.in +@@ -110,3 +110,7 @@ LIBEFIVAR_1.30 { + efi_error_get; + efi_error_clear; + } LIBEFIVAR_1.29; ++ ++LIBEFIVAR_1.32 { ++ global: efi_guid_ux_capsule; ++} LIBEFIVAR_1.30; +-- +2.13.5 + diff --git a/efivar.spec b/efivar.spec index fd02993..d8a26cc 100644 --- a/efivar.spec +++ b/efivar.spec @@ -1,6 +1,6 @@ Name: efivar Version: 32 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to manage UEFI variables License: LGPLv2.1 URL: https://github.com/rhboot/efivar @@ -9,6 +9,7 @@ ExclusiveArch: %{ix86} x86_64 aarch64 BuildRequires: popt-devel git glibc-static libabigail Source0: https://github.com/rhboot/efivar/archive/%{version}.tar.gz +Patch0001: 0001-Make-efi_guid_ux_capsule-actually-work.patch %description efivar provides a simple command line interface to the UEFI variable facility. @@ -74,6 +75,9 @@ make abicheck %{_libdir}/*.so.* %changelog +* Tue Sep 12 2017 Peter Jones - 32-2 +- Make efi_guid_ux_capsule actually get exported right. + * Tue Sep 12 2017 Peter Jones - 32-1 - efivar 32 - lots of coverity fixes; mostly leaked memory and fds and the like