Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupdate/files/, sys-apps/fwupdate/
Date: Fri, 29 Jun 2018 16:07:17
Message-Id: 1530288427.3ba7f7315575274317258155089a7720f5627946.polynomial-c@gentoo
1 commit: 3ba7f7315575274317258155089a7720f5627946
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 29 16:06:50 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 29 16:07:07 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba7f731
7
8 sys-apps/fwupdate: Removed old.
9
10 Package-Manager: Portage-2.3.41, Repoman-2.3.9
11
12 sys-apps/fwupdate/Manifest | 1 -
13 .../files/fwupdate-9-objcopy_detection.patch | 45 -------------------
14 sys-apps/fwupdate/fwupdate-9.ebuild | 52 ----------------------
15 3 files changed, 98 deletions(-)
16
17 diff --git a/sys-apps/fwupdate/Manifest b/sys-apps/fwupdate/Manifest
18 index f5ff91d0185..1d97b111b85 100644
19 --- a/sys-apps/fwupdate/Manifest
20 +++ b/sys-apps/fwupdate/Manifest
21 @@ -1,3 +1,2 @@
22 DIST fwupdate-10.tar.gz 55899 BLAKE2B 34e74386de5151a977d0e136ac4d022a42d339775c77525fa26a2669ad7b10da2c0882435ac6093cd69d56473b83234c9d808f12565ab029a4f14c006ce6a1d8 SHA512 7c01a41a8c2876a954a1047790b45999c07416eeafffdf5a0802c53a877ca300811bc2282cb9398e46df53f761404a8fe4ef8caa1995f326122dbae2af1018da
23 DIST fwupdate-12.tar.gz 61523 BLAKE2B 4adb26e50b69f4c0aeef9e0287dd520f396b3e433e4018651ad125406a1bd160e673da55923c2764c126c1d53d1f12a65c2dd7d9b9e688411ca31426e7b7103f SHA512 1681e97982b22084cb3ca38e2965ce25c4cf72dd0afd2268f0a2612c6aa90b3030e4b6bfa64f42e504a680d60c5e623462238fa148a60359725db0a835dac193
24 -DIST fwupdate-9.tar.gz 41698 BLAKE2B 72026feab48f39e25548dc2475c10f11ea74d88228dffbb99f58f00bcc8052a90522ebb572558bffc538524a0791a78e9f7aa8fefa76f3a05ee6a09ad93e1878 SHA512 bcb7783944aa007450a28f71cb4e3c8b06220b3ad04dd90a9505273224ba192369fb63ac0d72bd1efc06c78a5f6f38f2eea2c4affe915eff5f2b7c04db0847c8
25
26 diff --git a/sys-apps/fwupdate/files/fwupdate-9-objcopy_detection.patch b/sys-apps/fwupdate/files/fwupdate-9-objcopy_detection.patch
27 deleted file mode 100644
28 index d41462397ff..00000000000
29 --- a/sys-apps/fwupdate/files/fwupdate-9-objcopy_detection.patch
30 +++ /dev/null
31 @@ -1,45 +0,0 @@
32 -From affc219a5bac93cb6e774879c874c203f755ba11 Mon Sep 17 00:00:00 2001
33 -From: Raymund Will <rw@××××.com>
34 -Date: Mon, 13 Mar 2017 12:57:07 +0100
35 -Subject: [PATCH] Fix regression in "objcopy version check" (AKA `expr: syntax
36 - error`)
37 -
38 -While commit 8418fee4 may have fixed the check for "some distributions"
39 -it broke the same check for others, like
40 -
41 -`GNU objcopy (WinAVR 20090313) 2.19`
42 -`GNU objcopy (AVR_8_bit_GNU_Toolchain_3.4.3_1072) 2.23.2`
43 -`GNU objcopy (Codescape GNU Tools 2016.05-03 for MIPS MTI Bare Metal) 2.24.90`
44 -`GNU objcopy (GNU Binutils; openSUSE Leap 42.2) 2.26.1`
45 -`GNU objcopy (GNU Binutils; SUSE Linux Enterprise 12) 2.26.1`
46 -
47 -(some more, some less relevant... ;)
48 -
49 -This version is meant to cover them all (or at least be easily extensible).
50 -
51 -Signed-off-by: Raymund Will <rw@××××.com>
52 ----
53 - efi/Makefile | 10 +++++++++-
54 - 1 file changed, 9 insertions(+), 1 deletion(-)
55 -
56 -diff --git a/efi/Makefile b/efi/Makefile
57 -index 920c096..faf8ee2 100644
58 ---- a/efi/Makefile
59 -+++ b/efi/Makefile
60 -@@ -15,7 +15,15 @@ CCLDFLAGS ?= -nostdlib -Wl,--warn-common \
61 - -Wl,-shared -Wl,-Bsymbolic -L$(LIBDIR) -L$(GNUEFIDIR) \
62 - -Wl,--build-id=sha1 -Wl,--hash-style=sysv \
63 - $(GNUEFIDIR)/crt0-efi-$(ARCH).o
64 --OBJCOPY_GTE224 = $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed 's/^[^0-9]*//g' | cut -f1-2 -d.` \>= 2.24)
65 -+
66 -+define objcopy_version =
67 -+ $(OBJCOPY) --version |
68 -+ sed -e '/^GNU objcopy/! d;
69 -+ : loop1; s/([^)(]*)//g; t loop1;
70 -+ : loop2; s/\[[^][]*\]//g; t loop2;
71 -+ s/.* \([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;'
72 -+endef
73 -+OBJCOPY_GTE224 := $(shell expr `$(objcopy_version)` \>= 2.24)
74 -
75 - FWUP = fwupdate
76 -
77
78 diff --git a/sys-apps/fwupdate/fwupdate-9.ebuild b/sys-apps/fwupdate/fwupdate-9.ebuild
79 deleted file mode 100644
80 index 74e9ccfa61b..00000000000
81 --- a/sys-apps/fwupdate/fwupdate-9.ebuild
82 +++ /dev/null
83 @@ -1,52 +0,0 @@
84 -# Copyright 1999-2017 Gentoo Foundation
85 -# Distributed under the terms of the GNU General Public License v2
86 -
87 -EAPI=6
88 -
89 -inherit mount-boot toolchain-funcs
90 -
91 -DESCRIPTION="Tools for using the ESRT and UpdateCapsule() to apply firmware updates"
92 -HOMEPAGE="https://github.com/rhinstaller/fwupdate"
93 -SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
94 -
95 -LICENSE="GPL-2+"
96 -SLOT="0"
97 -KEYWORDS="~amd64 ~x86"
98 -IUSE=""
99 -
100 -RDEPEND="
101 - dev-libs/popt
102 - sys-libs/efivar
103 - >=sys-libs/libsmbios-2.3.2
104 -"
105 -DEPEND="
106 - ${RDEPEND}
107 - sys-boot/gnu-efi
108 -"
109 -
110 -PATCHES=(
111 - "${FILESDIR}/${P}-objcopy_detection.patch"
112 -)
113 -
114 -do_make() {
115 - emake \
116 - CC="$(tc-getCC)" \
117 - EFIDIR="gentoo" \
118 - GNUEFIDIR="/usr/$(get_libdir)" \
119 - "${@}"
120 -}
121 -
122 -src_prepare() {
123 - default
124 -
125 - # Remove -Werror
126 - sed 's@ -Werror\([[:space:]]\|\n\)@\1@' -i linux/Makefile || die
127 -}
128 -
129 -src_compile() {
130 - do_make
131 -}
132 -
133 -src_install() {
134 - do_make DESTDIR="${D}" install
135 -}