diff options
Diffstat (limited to 'sys-apps/fwupdate')
| -rw-r--r-- | sys-apps/fwupdate/Manifest | 5 | ||||
| -rw-r--r-- | sys-apps/fwupdate/files/fwupdate-9-objcopy_detection.patch | 45 | ||||
| -rw-r--r-- | sys-apps/fwupdate/fwupdate-12.ebuild (renamed from sys-apps/fwupdate/fwupdate-9.ebuild) | 11 |
3 files changed, 6 insertions, 55 deletions
diff --git a/sys-apps/fwupdate/Manifest b/sys-apps/fwupdate/Manifest index 2cd69c6cc35d..fad357917378 100644 --- a/sys-apps/fwupdate/Manifest +++ b/sys-apps/fwupdate/Manifest @@ -1,6 +1,5 @@ -AUX fwupdate-9-objcopy_detection.patch 1616 BLAKE2B 88daad5739b7bc1e7a5fb2d9c96a4e8c3157b42e654de23061ea871cbab85d4d02c18066b213aeb9817a5926794eccfd83e30eed9d1b047c47ab29c7f3c263fc SHA512 d2e790aaf3a3e10d4154507d1243d429e3fefb914a1fdc3677ec8f7450b3059c34c6d8aeb48eba96647165d95b41adebb849dbba398be07031759499de4a3052 DIST fwupdate-10.tar.gz 55899 BLAKE2B 34e74386de5151a977d0e136ac4d022a42d339775c77525fa26a2669ad7b10da2c0882435ac6093cd69d56473b83234c9d808f12565ab029a4f14c006ce6a1d8 SHA512 7c01a41a8c2876a954a1047790b45999c07416eeafffdf5a0802c53a877ca300811bc2282cb9398e46df53f761404a8fe4ef8caa1995f326122dbae2af1018da -DIST fwupdate-9.tar.gz 41698 BLAKE2B 72026feab48f39e25548dc2475c10f11ea74d88228dffbb99f58f00bcc8052a90522ebb572558bffc538524a0791a78e9f7aa8fefa76f3a05ee6a09ad93e1878 SHA512 bcb7783944aa007450a28f71cb4e3c8b06220b3ad04dd90a9505273224ba192369fb63ac0d72bd1efc06c78a5f6f38f2eea2c4affe915eff5f2b7c04db0847c8 +DIST fwupdate-12.tar.gz 61523 BLAKE2B 4adb26e50b69f4c0aeef9e0287dd520f396b3e433e4018651ad125406a1bd160e673da55923c2764c126c1d53d1f12a65c2dd7d9b9e688411ca31426e7b7103f SHA512 1681e97982b22084cb3ca38e2965ce25c4cf72dd0afd2268f0a2612c6aa90b3030e4b6bfa64f42e504a680d60c5e623462238fa148a60359725db0a835dac193 EBUILD fwupdate-10.ebuild 852 BLAKE2B fde9ce5e48019e4b33907fe2c6c6c5887a02676297fb59282b90dd8ebbc69263d9634c5674218d56a0fa80cca4732950c92b28622eea54c4ddadfa62310c39c9 SHA512 40d3e3498c3797d230d3a38cd1ce9e5c8355942baad10f99d8f8d549d5416639f3375e6317f9762a42a5d477355f0016ae8286cbc7517d8c1c27a7d976e349dc -EBUILD fwupdate-9.ebuild 901 BLAKE2B 3c6e68d44c4de562e43cfbc808624f0c06ad94a98d67ca4b7a4e78694680eae5be4681add956c0dce9c5a17850edc0809a612f64ff676856c63350fbb1e3006a SHA512 fe51dd20e9b7e8f23d5d76b48c027bb6b13df001b705d780c4a24fbc5b435d040d5c6a8bbac2293092e032d7625bfe9976ec5c1371ae5e80a469eba6560824df +EBUILD fwupdate-12.ebuild 876 BLAKE2B bdc849d79ff4f9b101093fdf64fc490a7fc779df53c0234778f4b6bf3a6e21afd640713b9598cc17adefcfd49cfba083fd9e77df997d2182c2c118846961aaed SHA512 2b151bc40e98f4d704aef4c1f6c87f26778db5009f269802de6b8842684b1c632d7c4bb55f25827c8a0be885ac8a2158dd5943c3b3ddfad5826d17a33d481748 MISC metadata.xml 346 BLAKE2B c1ac02b4846e985ebd37bf1cd865b1ca889ed8c7b06efc75dc293fe28b443f3eb886e1c31c461776f567288702923c0b9cf4ce644c31fe5064321b194a60c210 SHA512 55ff3da29bf22afc47434b7079e8559e72d34f769ecdfd198f84c051e6ba68e91751c23c36c841b6c0f81ada4fe74854dd7f1fc0e579e96e43ba3b35bc164dcf diff --git a/sys-apps/fwupdate/files/fwupdate-9-objcopy_detection.patch b/sys-apps/fwupdate/files/fwupdate-9-objcopy_detection.patch deleted file mode 100644 index d41462397ff2..000000000000 --- a/sys-apps/fwupdate/files/fwupdate-9-objcopy_detection.patch +++ /dev/null @@ -1,45 +0,0 @@ -From affc219a5bac93cb6e774879c874c203f755ba11 Mon Sep 17 00:00:00 2001 -From: Raymund Will <rw@suse.com> -Date: Mon, 13 Mar 2017 12:57:07 +0100 -Subject: [PATCH] Fix regression in "objcopy version check" (AKA `expr: syntax - error`) - -While commit 8418fee4 may have fixed the check for "some distributions" -it broke the same check for others, like - -`GNU objcopy (WinAVR 20090313) 2.19` -`GNU objcopy (AVR_8_bit_GNU_Toolchain_3.4.3_1072) 2.23.2` -`GNU objcopy (Codescape GNU Tools 2016.05-03 for MIPS MTI Bare Metal) 2.24.90` -`GNU objcopy (GNU Binutils; openSUSE Leap 42.2) 2.26.1` -`GNU objcopy (GNU Binutils; SUSE Linux Enterprise 12) 2.26.1` - -(some more, some less relevant... ;) - -This version is meant to cover them all (or at least be easily extensible). - -Signed-off-by: Raymund Will <rw@suse.com> ---- - efi/Makefile | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/efi/Makefile b/efi/Makefile -index 920c096..faf8ee2 100644 ---- a/efi/Makefile -+++ b/efi/Makefile -@@ -15,7 +15,15 @@ CCLDFLAGS ?= -nostdlib -Wl,--warn-common \ - -Wl,-shared -Wl,-Bsymbolic -L$(LIBDIR) -L$(GNUEFIDIR) \ - -Wl,--build-id=sha1 -Wl,--hash-style=sysv \ - $(GNUEFIDIR)/crt0-efi-$(ARCH).o --OBJCOPY_GTE224 = $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed 's/^[^0-9]*//g' | cut -f1-2 -d.` \>= 2.24) -+ -+define objcopy_version = -+ $(OBJCOPY) --version | -+ sed -e '/^GNU objcopy/! d; -+ : loop1; s/([^)(]*)//g; t loop1; -+ : loop2; s/\[[^][]*\]//g; t loop2; -+ s/.* \([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;' -+endef -+OBJCOPY_GTE224 := $(shell expr `$(objcopy_version)` \>= 2.24) - - FWUP = fwupdate - diff --git a/sys-apps/fwupdate/fwupdate-9.ebuild b/sys-apps/fwupdate/fwupdate-12.ebuild index 74e9ccfa61bc..4f3674c54d8a 100644 --- a/sys-apps/fwupdate/fwupdate-9.ebuild +++ b/sys-apps/fwupdate/fwupdate-12.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mount-boot toolchain-funcs @@ -16,7 +16,7 @@ IUSE="" RDEPEND=" dev-libs/popt - sys-libs/efivar + >=sys-libs/efivar-32-r1 >=sys-libs/libsmbios-2.3.2 " DEPEND=" @@ -24,10 +24,6 @@ DEPEND=" sys-boot/gnu-efi " -PATCHES=( - "${FILESDIR}/${P}-objcopy_detection.patch" -) - do_make() { emake \ CC="$(tc-getCC)" \ @@ -49,4 +45,5 @@ src_compile() { src_install() { do_make DESTDIR="${D}" install + keepdir /var/lib/${PN} } |