From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6EEBE138334 for ; Fri, 27 Dec 2019 17:10:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89BEAE09B0; Fri, 27 Dec 2019 17:10:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 598D7E09B0 for ; Fri, 27 Dec 2019 17:10:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E9B9434DC22 for ; Fri, 27 Dec 2019 17:10:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68FD036 for ; Fri, 27 Dec 2019 17:10:04 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1577466558.5fc7cefa25cf656f5a30b5ecba4368c8de78d9fe.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/efivar/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch X-VCS-Directories: sys-libs/efivar/files/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 5fc7cefa25cf656f5a30b5ecba4368c8de78d9fe X-VCS-Branch: master Date: Fri, 27 Dec 2019 17:10:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1cd95b57-cd8b-41da-8a0f-7c40c72b1c1d X-Archives-Hash: 5ceee10b33146b5b9101de0d25c0fa28 commit: 5fc7cefa25cf656f5a30b5ecba4368c8de78d9fe Author: Michael Mair-Keimberger gmail com> AuthorDate: Fri Dec 27 16:00:06 2019 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Fri Dec 27 17:09:18 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc7cefa sys-libs/efivar: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/14140 Signed-off-by: Aaron Bauman gentoo.org> .../files/efivar-32-efi_guid_ux_capsule.patch | 59 ---------------------- 1 file changed, 59 deletions(-) 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 deleted file mode 100644 index 8a5a72f66fb..00000000000 --- a/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch +++ /dev/null @@ -1,59 +0,0 @@ -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;