1 |
commit: eacede9511f1ab52b71e0ae103bf3880fc400d27 |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Jan 25 19:45:04 2018 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Jan 25 19:45:04 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=eacede95 |
7 |
|
8 |
sys-libs/efivar: version bump to 32-r1 |
9 |
|
10 |
sys-libs/efivar/efivar-32-r1.ebuild | 44 ++++++++++++++++ |
11 |
.../files/efivar-32-efi_guid_ux_capsule.patch | 59 ++++++++++++++++++++++ |
12 |
2 files changed, 103 insertions(+) |
13 |
|
14 |
diff --git a/sys-libs/efivar/efivar-32-r1.ebuild b/sys-libs/efivar/efivar-32-r1.ebuild |
15 |
new file mode 100644 |
16 |
index 0000000..710609b |
17 |
--- /dev/null |
18 |
+++ b/sys-libs/efivar/efivar-32-r1.ebuild |
19 |
@@ -0,0 +1,44 @@ |
20 |
+# Copyright 1999-2018 Gentoo Foundation |
21 |
+# Distributed under the terms of the GNU General Public License v2 |
22 |
+ |
23 |
+EAPI=6 |
24 |
+ |
25 |
+inherit flag-o-matic toolchain-funcs |
26 |
+ |
27 |
+DESCRIPTION="Tools and library to manipulate EFI variables" |
28 |
+HOMEPAGE="https://github.com/rhinstaller/efivar" |
29 |
+#SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.bz2" |
30 |
+SRC_URI="https://github.com/rhinstaller/efivar/archive/${PV}/${P}.tar.gz" |
31 |
+ |
32 |
+LICENSE="GPL-2" |
33 |
+SLOT="0/1" |
34 |
+KEYWORDS="~amd64 ~x86" |
35 |
+ |
36 |
+RDEPEND="dev-libs/popt" |
37 |
+DEPEND="${RDEPEND} |
38 |
+ >=sys-kernel/linux-headers-3.18 |
39 |
+ virtual/pkgconfig |
40 |
+" |
41 |
+ |
42 |
+PATCHES=( |
43 |
+ "${FILESDIR}/${P}-efi_guid_ux_capsule.patch" |
44 |
+ "${FILESDIR}/0.23-musl.patch" |
45 |
+ "${FILESDIR}/27-strndupa.patch" |
46 |
+) |
47 |
+ |
48 |
+src_prepare() { |
49 |
+ default |
50 |
+ sed -i -e s/-Werror// gcc.specs || die |
51 |
+} |
52 |
+ |
53 |
+src_configure() { |
54 |
+ tc-export CC |
55 |
+ tc-ld-disable-gold |
56 |
+ export libdir="/usr/$(get_libdir)" |
57 |
+ unset LIBS # Bug 562004 |
58 |
+ |
59 |
+ if [[ -n ${GCC_SPECS} ]]; then |
60 |
+ # The environment overrides the command line. |
61 |
+ GCC_SPECS+=":${S}/gcc.specs" |
62 |
+ fi |
63 |
+} |
64 |
|
65 |
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 |
66 |
new file mode 100644 |
67 |
index 0000000..8a5a72f |
68 |
--- /dev/null |
69 |
+++ b/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch |
70 |
@@ -0,0 +1,59 @@ |
71 |
+From cd732494ba7685feaf71b9ee58619ca6aef39fc9 Mon Sep 17 00:00:00 2001 |
72 |
+From: Peter Jones <pjones@××××××.com> |
73 |
+Date: Tue, 12 Sep 2017 10:45:31 -0400 |
74 |
+Subject: [PATCH] Make efi_guid_ux_capsule actually work. |
75 |
+ |
76 |
+Signed-off-by: Peter Jones <pjones@××××××.com> |
77 |
+--- |
78 |
+ src/abignore | 11 ++++++++++- |
79 |
+ src/guids.txt | 2 +- |
80 |
+ src/libefivar.map.in | 4 ++++ |
81 |
+ 3 files changed, 15 insertions(+), 2 deletions(-) |
82 |
+ |
83 |
+diff --git a/src/abignore b/src/abignore |
84 |
+index 74b5160..479b5c3 100644 |
85 |
+--- a/src/abignore |
86 |
++++ b/src/abignore |
87 |
+@@ -14,7 +14,16 @@ |
88 |
+ # 'efidp_wifi __anonymous_union__::wifi' at efivar-dp.h:868:1 |
89 |
+ # |
90 |
+ [suppress_type] |
91 |
+- soname_regexp = libefi(var|boot)\\.so |
92 |
++ soname_regexp = libefi(var|boot)\\.so\\..* |
93 |
+ name = efidp_data |
94 |
+ type_kind = typedef |
95 |
+ has_data_member_inserted_at = end |
96 |
++ |
97 |
++# 1 Added variable: |
98 |
++# |
99 |
++# 'const __anonymous_struct__ efi_guid_ux_capsule' {efi_guid_ux_capsule@@LIBEFIVAR_1.32} |
100 |
++# |
101 |
++[suppress_variable] |
102 |
++ soname_regexp = ^libefivar\\.so\\.[[:digit:]]+ |
103 |
++ symbol_name_regexp = ^efi_guid_[[:alnum:]_]+$ |
104 |
++ change_kind = add-variable |
105 |
+diff --git a/src/guids.txt b/src/guids.txt |
106 |
+index 87e2f61..06081ed 100644 |
107 |
+--- a/src/guids.txt |
108 |
++++ b/src/guids.txt |
109 |
+@@ -3,7 +3,7 @@ |
110 |
+ 0abba7dc-e516-4167-bbf5-4d9d1c739416 redhat Red Hat |
111 |
+ 0b6e5233-a65c-44c9-9407-d9ab83bfc8bd sha224 SHA-224 |
112 |
+ 126a762d-5758-4fca-8531-201a7f57f850 lenovo_boot_menu Lenovo Boot Menu |
113 |
+-3b8c8162-188c-46a4-aec9-be43f1d65697 ux_capsule_guid Firmware update localized text image |
114 |
++3b8c8162-188c-46a4-aec9-be43f1d65697 ux_capsule Firmware update localized text image |
115 |
+ 3bd2a492-96c0-4079-b420-fcf98ef103ed x509_sha256 SHA256 hash of X.509 Certificate |
116 |
+ 3c5766e8-269c-4e34-aa14-ed776e85b3b6 rsa2048 RSA 2048 |
117 |
+ 3CC24E96-22C7-41D8-8863-8E39DCDCC2CF lenovo Lenovo |
118 |
+diff --git a/src/libefivar.map.in b/src/libefivar.map.in |
119 |
+index ba51d55..a95a505 100644 |
120 |
+--- a/src/libefivar.map.in |
121 |
++++ b/src/libefivar.map.in |
122 |
+@@ -110,3 +110,7 @@ LIBEFIVAR_1.30 { |
123 |
+ efi_error_get; |
124 |
+ efi_error_clear; |
125 |
+ } LIBEFIVAR_1.29; |
126 |
++ |
127 |
++LIBEFIVAR_1.32 { |
128 |
++ global: efi_guid_ux_capsule; |
129 |
++} LIBEFIVAR_1.30; |