Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/efivar/files/
Date: Fri, 27 Dec 2019 17:10:25
Message-Id: 1577466558.5fc7cefa25cf656f5a30b5ecba4368c8de78d9fe.bman@gentoo
1 commit: 5fc7cefa25cf656f5a30b5ecba4368c8de78d9fe
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Dec 27 16:00:06 2019 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 27 17:09:18 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc7cefa
7
8 sys-libs/efivar: remove unused patch(es)
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/14140
12 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
13
14 .../files/efivar-32-efi_guid_ux_capsule.patch | 59 ----------------------
15 1 file changed, 59 deletions(-)
16
17 diff --git a/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch b/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch
18 deleted file mode 100644
19 index 8a5a72f66fb..00000000000
20 --- a/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch
21 +++ /dev/null
22 @@ -1,59 +0,0 @@
23 -From cd732494ba7685feaf71b9ee58619ca6aef39fc9 Mon Sep 17 00:00:00 2001
24 -From: Peter Jones <pjones@××××××.com>
25 -Date: Tue, 12 Sep 2017 10:45:31 -0400
26 -Subject: [PATCH] Make efi_guid_ux_capsule actually work.
27 -
28 -Signed-off-by: Peter Jones <pjones@××××××.com>
29 ----
30 - src/abignore | 11 ++++++++++-
31 - src/guids.txt | 2 +-
32 - src/libefivar.map.in | 4 ++++
33 - 3 files changed, 15 insertions(+), 2 deletions(-)
34 -
35 -diff --git a/src/abignore b/src/abignore
36 -index 74b5160..479b5c3 100644
37 ---- a/src/abignore
38 -+++ b/src/abignore
39 -@@ -14,7 +14,16 @@
40 - # 'efidp_wifi __anonymous_union__::wifi' at efivar-dp.h:868:1
41 - #
42 - [suppress_type]
43 -- soname_regexp = libefi(var|boot)\\.so
44 -+ soname_regexp = libefi(var|boot)\\.so\\..*
45 - name = efidp_data
46 - type_kind = typedef
47 - has_data_member_inserted_at = end
48 -+
49 -+# 1 Added variable:
50 -+#
51 -+# 'const __anonymous_struct__ efi_guid_ux_capsule' {efi_guid_ux_capsule@@LIBEFIVAR_1.32}
52 -+#
53 -+[suppress_variable]
54 -+ soname_regexp = ^libefivar\\.so\\.[[:digit:]]+
55 -+ symbol_name_regexp = ^efi_guid_[[:alnum:]_]+$
56 -+ change_kind = add-variable
57 -diff --git a/src/guids.txt b/src/guids.txt
58 -index 87e2f61..06081ed 100644
59 ---- a/src/guids.txt
60 -+++ b/src/guids.txt
61 -@@ -3,7 +3,7 @@
62 - 0abba7dc-e516-4167-bbf5-4d9d1c739416 redhat Red Hat
63 - 0b6e5233-a65c-44c9-9407-d9ab83bfc8bd sha224 SHA-224
64 - 126a762d-5758-4fca-8531-201a7f57f850 lenovo_boot_menu Lenovo Boot Menu
65 --3b8c8162-188c-46a4-aec9-be43f1d65697 ux_capsule_guid Firmware update localized text image
66 -+3b8c8162-188c-46a4-aec9-be43f1d65697 ux_capsule Firmware update localized text image
67 - 3bd2a492-96c0-4079-b420-fcf98ef103ed x509_sha256 SHA256 hash of X.509 Certificate
68 - 3c5766e8-269c-4e34-aa14-ed776e85b3b6 rsa2048 RSA 2048
69 - 3CC24E96-22C7-41D8-8863-8E39DCDCC2CF lenovo Lenovo
70 -diff --git a/src/libefivar.map.in b/src/libefivar.map.in
71 -index ba51d55..a95a505 100644
72 ---- a/src/libefivar.map.in
73 -+++ b/src/libefivar.map.in
74 -@@ -110,3 +110,7 @@ LIBEFIVAR_1.30 {
75 - efi_error_get;
76 - efi_error_clear;
77 - } LIBEFIVAR_1.29;
78 -+
79 -+LIBEFIVAR_1.32 {
80 -+ global: efi_guid_ux_capsule;
81 -+} LIBEFIVAR_1.30;