From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- sys-libs/efivar/Manifest | 4 +- sys-libs/efivar/efivar-37-r1.ebuild | 42 --------------- sys-libs/efivar/efivar-37.ebuild | 38 ++++++++++++++ .../files/efivar-32-efi_guid_ux_capsule.patch | 59 ---------------------- .../efivar-37-makeguids_fix_host_compile.patch | 36 ------------- 5 files changed, 39 insertions(+), 140 deletions(-) delete mode 100644 sys-libs/efivar/efivar-37-r1.ebuild create mode 100644 sys-libs/efivar/efivar-37.ebuild delete mode 100644 sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch delete mode 100644 sys-libs/efivar/files/efivar-37-makeguids_fix_host_compile.patch (limited to 'sys-libs/efivar') diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest index 0f1dd87d94d1..0be8003dbd44 100644 --- a/sys-libs/efivar/Manifest +++ b/sys-libs/efivar/Manifest @@ -1,5 +1,3 @@ -AUX efivar-32-efi_guid_ux_capsule.patch 2054 BLAKE2B c349cb606fabb96729af078547bdb3e425607599397a067684753565f6aa98f340885585acaee64e3642a1c284eecca313e3348014e6ccfc5cee1e72ec1885fa SHA512 7e8852b9adb3702b7a7a9a26ee734234c7163aa95d10114d79f62ab6dc918a9afb762fb0476913f4515b36db1cc2c80eb5a0b509f0252483e5aaf51d4d76df76 -AUX efivar-37-makeguids_fix_host_compile.patch 1391 BLAKE2B 079bf271f2e2087fea63265713b5ce75e277f5010f8cb08e6b0608b6c7112ebe8b121238fbc9d07b65bbce38c75732829649d3ef7dd67fc456d52677372190d4 SHA512 50f560725f2ebb2dae9c1b3b603be46aec672d8764d6ba4218aab213d812302e636f8811fe6c51ae17e705e0d461d4141e1e58b8ba997154f42b0046e67f5177 DIST efivar-37.tar.bz2 109431 BLAKE2B 813d477d31562b773f6e19f20e9e237b94beed437ce221771770e7d46ff0e657530285f035dc942cc20609185be92dc50319bfe8e10dee642c8bd88403ef6ffe SHA512 305a82ed103c7e3d8f723934019d552677c73558768dd5341f87d0364f5c60824d24f5a8e1bf90075e825908085083d4ecdccec5ac757fd38ee6ac8fea28c3e4 -EBUILD efivar-37-r1.ebuild 917 BLAKE2B 7946b77614ebed0a03055845df7aed2dad994e8e174f71162036a96b3b73e003f78dafb369b54cfd22fb51b8ad835c8366cccc85aa52dcad8d4781caf7506f25 SHA512 e7d6703547ff91db3487d6d18fc679bfd2289c15dc4e55dbabbcba18bb2cf6c0d74a8cdbb535f3e57fc0d484268945ed8db4e312a967162d929df49f13925e59 +EBUILD efivar-37.ebuild 851 BLAKE2B d103357671bfe4b1d59019f154069f67048a460cd6faa6bafa4743b30c1172ae2451bf9dedd618d41e53b083568b51a721fee134e1609301818a9ea6de5bb550 SHA512 914877cdf55617c48d5435b25f809a48d38aea3b1f329aaacf28184f2dfe85c94b511d5ce161edf7c57e8de8ad0d94870cee96a993667f8588e5b8e434d745df MISC metadata.xml 329 BLAKE2B afbb6532a53f86d455f8e77511ef1064efaa3d231ddd9023176629863f396224f733f3b15a91465ecdd878542e1af189420d7125dcb7f1de65debd613f4182e7 SHA512 a349c5ce7e3ad96d816b52ee35e6547bfb1f4cf9ebd60426ac90b84d67adb0728ab9dcccf93754ad7c71614b0fbd82a1a02fc3fde07e15d12d960d1a7fc088df diff --git a/sys-libs/efivar/efivar-37-r1.ebuild b/sys-libs/efivar/efivar-37-r1.ebuild deleted file mode 100644 index 878309f4b43a..000000000000 --- a/sys-libs/efivar/efivar-37-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Tools and library to manipulate EFI variables" -HOMEPAGE="https://github.com/rhinstaller/efivar" -SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0/1" -KEYWORDS="amd64 ~arm ~arm64 ia64 x86" - -RDEPEND="dev-libs/popt" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-3.18 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${P}-makeguids_fix_host_compile.patch" -) - -src_prepare() { - default - sed -i -e 's/-Werror //' gcc.specs || die -} - -src_configure() { - tc-export CC - export CC_FOR_BUILD=$(tc-getBUILD_CC) - tc-ld-disable-gold - export libdir="/usr/$(get_libdir)" - unset LIBS # Bug 562004 - - if [[ -n ${GCC_SPECS} ]]; then - # The environment overrides the command line. - GCC_SPECS+=":${S}/gcc.specs" - fi -} diff --git a/sys-libs/efivar/efivar-37.ebuild b/sys-libs/efivar/efivar-37.ebuild new file mode 100644 index 000000000000..f9a608e46d22 --- /dev/null +++ b/sys-libs/efivar/efivar-37.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Tools and library to manipulate EFI variables" +HOMEPAGE="https://github.com/rhinstaller/efivar" +SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0/1" +KEYWORDS="amd64 ~arm ~arm64 ia64 x86" + +RDEPEND="dev-libs/popt" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-3.18 + virtual/pkgconfig +" + +src_prepare() { + default + sed -i -e 's/-Werror //' gcc.specs || die +} + +src_configure() { + tc-export CC + export CC_FOR_BUILD=$(tc-getBUILD_CC) + tc-ld-disable-gold + export libdir="/usr/$(get_libdir)" + unset LIBS # Bug 562004 + + if [[ -n ${GCC_SPECS} ]]; then + # The environment overrides the command line. + GCC_SPECS+=":${S}/gcc.specs" + fi +} 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 8a5a72f66fb0..000000000000 --- 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; diff --git a/sys-libs/efivar/files/efivar-37-makeguids_fix_host_compile.patch b/sys-libs/efivar/files/efivar-37-makeguids_fix_host_compile.patch deleted file mode 100644 index f0172eb612eb..000000000000 --- a/sys-libs/efivar/files/efivar-37-makeguids_fix_host_compile.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 81346196bb262156fd436c78323d161af61dd6c1 Mon Sep 17 00:00:00 2001 -From: Dmitry Torokhov -Date: Tue, 6 Aug 2019 09:22:25 -0700 -Subject: [PATCH] Make sure makeguids helper is compiled for the host's arch - -Currently makeguids is compiled with the same flags/settings as the rest -of the package, which does not work in case of cross-compiles when arch -of the build host and the target host are different. Let's force -compiling for the native host arch to avoid this issue. - -Note that this is not a full cross-compile solution as this does not -account for potential differences in host/target compilers (versions, -clang vs gcc, etc), but it removes one of the issue with package build -aborting due to invalid instruction on the host. - -Signed-off-by: Dmitry Torokhov ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index addfaa0..3729d2b 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -52,7 +52,7 @@ include/efivar/efivar-guids.h : makeguids guids.txt - ./makeguids guids.txt guids.bin names.bin \ - guid-symbols.c include/efivar/efivar-guids.h - --makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT -+makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT -march=native - makeguids : LIBS=dl - makeguids : $(MAKEGUIDS_SOURCES) - makeguids : CCLD=$(CCLD_FOR_BUILD) --- -2.23.0.866.gb869b98d4c-goog - -- cgit v1.2.3