1 |
commit: 5384be291948c734f441e772b1f1933c578dc13f |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 28 09:44:27 2022 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 28 09:46:43 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5384be29 |
7 |
|
8 |
sys-apps/fwupd: Removed old |
9 |
|
10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
|
12 |
sys-apps/fwupd/Manifest | 1 - |
13 |
sys-apps/fwupd/files/fwupd-1.7.4-efivar38.patch | 55 -------- |
14 |
sys-apps/fwupd/fwupd-1.7.4.ebuild | 178 ------------------------ |
15 |
3 files changed, 234 deletions(-) |
16 |
|
17 |
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest |
18 |
index b613b94ed5da..c7fc8c92a4c5 100644 |
19 |
--- a/sys-apps/fwupd/Manifest |
20 |
+++ b/sys-apps/fwupd/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
DIST fwupd-1.7.2.tar.gz 3922633 BLAKE2B aec40de0bbadba9a8688617bf2f1a79b8952b8a30ac011b3656a3dee312295250e370a09b4ea2fbf35992f0124a7aa78b6e17200dc57c768d75d9ce3a94f6f18 SHA512 9cf47d13e31eaf11e2ffddfd26a0fb23a18049bcd7a54a1cb4e96003db8134cf01bbe83e507b90d429df78e478cb3c97bdd3d2c0e194f02994ef4c5a15347521 |
23 |
-DIST fwupd-1.7.4.tar.gz 4002584 BLAKE2B 6d01ee3993cc2a55164fd6ae468c00430fdc63b737abbad3dd279ef061625de4e2540d76b7069757753a9e94c1afc3635b565a25758c9d616e0d467212fd4751 SHA512 fa7195e2873a55fe544636c639597b4b2bac0855b10df4fac075ce377b87ae2aa2ccd86fb173379d39ebff542acca33e97234fd6c946e12b212dcf88b5f378a1 |
24 |
DIST fwupd-1.7.5.tar.gz 4014523 BLAKE2B b7297bbf3358209464691b928b928fa029c68ae6a3bc413d514409e4382bf8a3b0d57f4febc29a24d6351481474dd8111406ffdcb11125139fbc04a33ea00321 SHA512 1c2d99d905f76ebfce65db310ba0f6c1305ecf662b58bd9f6f6597ccc79cbabed126c97f2142207c99d8373ed42575363a58d9f053f390780b7c9a19c614fb31 |
25 |
DIST fwupd-1.7.6.tar.gz 4054269 BLAKE2B dea4a37aea406e933f312fb809ee2ea972e3b017e5267d51bed835b6d440c15ca1d589f76a6c1906e616acc7cdd6c0f6dcec034e1460427057d8a1168583c4ce SHA512 f04ee78a6ec9e73ce0f3eb9c2dcbfc471ac88264451a378f1b0010fa528596052b4d3a63f5303074dd4fad55bf153fe5642d77adebd4ed805d74f57fbbff5b2b |
26 |
|
27 |
diff --git a/sys-apps/fwupd/files/fwupd-1.7.4-efivar38.patch b/sys-apps/fwupd/files/fwupd-1.7.4-efivar38.patch |
28 |
deleted file mode 100644 |
29 |
index 968a0e7222d3..000000000000 |
30 |
--- a/sys-apps/fwupd/files/fwupd-1.7.4-efivar38.patch |
31 |
+++ /dev/null |
32 |
@@ -1,55 +0,0 @@ |
33 |
-From e74d38bfd3097471fe60dbe843a68c16516a78da Mon Sep 17 00:00:00 2001 |
34 |
-From: Richard Hughes <richard@×××××××.com> |
35 |
-Date: Mon, 17 Jan 2022 14:50:47 +0000 |
36 |
-Subject: [PATCH] Fix compiling with new versions of efivar |
37 |
- |
38 |
-Fixes https://github.com/fwupd/fwupd/issues/4181 |
39 |
---- |
40 |
- meson.build | 5 +++++ |
41 |
- plugins/uefi-capsule/fu-uefi-common.h | 3 +++ |
42 |
- 2 files changed, 8 insertions(+) |
43 |
- |
44 |
-diff --git a/meson.build b/meson.build |
45 |
-index 833bdbf56..691cc8a58 100644 |
46 |
---- a/meson.build |
47 |
-+++ b/meson.build |
48 |
-@@ -412,6 +412,11 @@ endif |
49 |
- if build_standalone and get_option('plugin_uefi_capsule') |
50 |
- efiboot = dependency('efiboot') |
51 |
- |
52 |
-+ efivar = dependency('efivar') |
53 |
-+ if cc.has_header_symbol('efivar/efivar-types.h', 'efi_time_t', dependencies : efivar) |
54 |
-+ conf.set('HAVE_EFI_TIME_T', '1') |
55 |
-+ endif |
56 |
-+ |
57 |
- efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') |
58 |
- conf.set_quoted('EFI_APP_LOCATION', efi_app_location) |
59 |
- |
60 |
-diff --git a/plugins/uefi-capsule/fu-uefi-common.h b/plugins/uefi-capsule/fu-uefi-common.h |
61 |
-index a21806d6b..1d616c9e0 100644 |
62 |
---- a/plugins/uefi-capsule/fu-uefi-common.h |
63 |
-+++ b/plugins/uefi-capsule/fu-uefi-common.h |
64 |
-@@ -9,6 +9,7 @@ |
65 |
- |
66 |
- #include <fwupdplugin.h> |
67 |
- |
68 |
-+#include <efivar/efivar.h> |
69 |
- #include <glib.h> |
70 |
- |
71 |
- #define EFI_CAPSULE_HEADER_FLAGS_PERSIST_ACROSS_RESET 0x00010000 |
72 |
-@@ -17,6 +18,7 @@ |
73 |
- |
74 |
- #define EFI_OS_INDICATIONS_FILE_CAPSULE_DELIVERY_SUPPORTED 0x0000000000000004ULL |
75 |
- |
76 |
-+#ifndef HAVE_EFI_TIME_T |
77 |
- typedef struct __attribute__((__packed__)) { |
78 |
- guint16 year; |
79 |
- guint8 month; |
80 |
-@@ -30,6 +32,7 @@ typedef struct __attribute__((__packed__)) { |
81 |
- guint8 daylight; |
82 |
- guint8 pad2; |
83 |
- } efi_time_t; |
84 |
-+#endif |
85 |
- |
86 |
- typedef struct __attribute__((__packed__)) { |
87 |
- fwupd_guid_t guid; |
88 |
|
89 |
diff --git a/sys-apps/fwupd/fwupd-1.7.4.ebuild b/sys-apps/fwupd/fwupd-1.7.4.ebuild |
90 |
deleted file mode 100644 |
91 |
index aaed0839779c..000000000000 |
92 |
--- a/sys-apps/fwupd/fwupd-1.7.4.ebuild |
93 |
+++ /dev/null |
94 |
@@ -1,178 +0,0 @@ |
95 |
-# Copyright 1999-2022 Gentoo Authors |
96 |
-# Distributed under the terms of the GNU General Public License v2 |
97 |
- |
98 |
-EAPI=7 |
99 |
- |
100 |
-PYTHON_COMPAT=( python3_{8..10} ) |
101 |
- |
102 |
-inherit bash-completion-r1 linux-info meson python-single-r1 vala xdg |
103 |
- |
104 |
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" |
105 |
-HOMEPAGE="https://fwupd.org" |
106 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
107 |
- |
108 |
-LICENSE="LGPL-2.1+" |
109 |
-SLOT="0" |
110 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
111 |
-IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi" |
112 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
113 |
- ^^ ( elogind minimal systemd ) |
114 |
- dell? ( uefi ) |
115 |
- fastboot? ( gusb ) |
116 |
- logitech? ( gusb ) |
117 |
- minimal? ( !introspection ) |
118 |
- spi? ( lzma ) |
119 |
- synaptics? ( gnutls ) |
120 |
- uefi? ( gnutls ) |
121 |
-" |
122 |
-RESTRICT="!test? ( test )" |
123 |
- |
124 |
-BDEPEND="$(vala_depend) |
125 |
- virtual/pkgconfig |
126 |
- gtk-doc? ( dev-util/gtk-doc ) |
127 |
- bash-completion? ( >=app-shells/bash-completion-2.0 ) |
128 |
- introspection? ( dev-libs/gobject-introspection ) |
129 |
- man? ( |
130 |
- app-text/docbook-sgml-utils |
131 |
- sys-apps/help2man |
132 |
- ) |
133 |
- test? ( |
134 |
- thunderbolt? ( dev-util/umockdev ) |
135 |
- net-libs/gnutls[tools] |
136 |
- ) |
137 |
-" |
138 |
-COMMON_DEPEND="${PYTHON_DEPS} |
139 |
- >=app-arch/gcab-1.0 |
140 |
- app-arch/xz-utils |
141 |
- >=dev-libs/glib-2.58:2 |
142 |
- dev-libs/json-glib |
143 |
- dev-libs/libgudev:= |
144 |
- >=dev-libs/libjcat-0.1.0[gpg,pkcs7] |
145 |
- >=dev-libs/libxmlb-0.1.13:=[introspection?] |
146 |
- $(python_gen_cond_dep ' |
147 |
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] |
148 |
- ') |
149 |
- >=net-libs/libsoup-2.51.92:2.4[introspection?] |
150 |
- net-misc/curl |
151 |
- archive? ( app-arch/libarchive:= ) |
152 |
- dell? ( >=sys-libs/libsmbios-2.4.0 ) |
153 |
- elogind? ( >=sys-auth/elogind-211 ) |
154 |
- flashrom? ( >=sys-apps/flashrom-1.2-r3 ) |
155 |
- gnutls? ( net-libs/gnutls ) |
156 |
- gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) |
157 |
- logitech? ( dev-libs/protobuf-c:= ) |
158 |
- lzma? ( app-arch/xz-utils ) |
159 |
- modemmanager? ( net-misc/modemmanager[qmi] ) |
160 |
- policykit? ( >=sys-auth/polkit-0.103 ) |
161 |
- sqlite? ( dev-db/sqlite ) |
162 |
- systemd? ( >=sys-apps/systemd-211 ) |
163 |
- tpm? ( app-crypt/tpm2-tss ) |
164 |
- uefi? ( |
165 |
- sys-apps/fwupd-efi |
166 |
- sys-boot/efibootmgr |
167 |
- sys-fs/udisks |
168 |
- sys-libs/efivar |
169 |
- ) |
170 |
-" |
171 |
-# Block sci-chemistry/chemical-mime-data for bug #701900 |
172 |
-RDEPEND=" |
173 |
- !<sci-chemistry/chemical-mime-data-0.1.94-r4 |
174 |
- ${COMMON_DEPEND} |
175 |
- sys-apps/dbus |
176 |
-" |
177 |
- |
178 |
-DEPEND=" |
179 |
- ${COMMON_DEPEND} |
180 |
- x11-libs/pango[introspection] |
181 |
-" |
182 |
- |
183 |
-PATCHES=( |
184 |
- "${FILESDIR}/${PN}-1.7.4-efivar38.patch" #831327 |
185 |
-) |
186 |
- |
187 |
-pkg_setup() { |
188 |
- python-single-r1_pkg_setup |
189 |
- if use nvme ; then |
190 |
- kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" |
191 |
- fi |
192 |
-} |
193 |
- |
194 |
-src_prepare() { |
195 |
- default |
196 |
- # c.f. https://github.com/fwupd/fwupd/issues/1414 |
197 |
- sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ |
198 |
- -i plugins/thunderbolt/meson.build || die |
199 |
- |
200 |
- sed -e '/platform-integrity/d' \ |
201 |
- -i plugins/meson.build || die #753521 |
202 |
- |
203 |
- sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \ |
204 |
- -i data/builder/meson.build || die |
205 |
- |
206 |
- vala_src_prepare |
207 |
-} |
208 |
- |
209 |
-src_configure() { |
210 |
- local plugins=( |
211 |
- $(meson_use amt plugin_amt) |
212 |
- $(meson_use dell plugin_dell) |
213 |
- $(meson_use fastboot plugin_fastboot) |
214 |
- $(meson_use flashrom plugin_flashrom) |
215 |
- $(meson_use gusb plugin_uf2) |
216 |
- $(meson_use logitech plugin_logitech_bulkcontroller) |
217 |
- $(meson_use modemmanager plugin_modem_manager) |
218 |
- $(meson_use nvme plugin_nvme) |
219 |
- $(meson_use sqlite) |
220 |
- $(meson_use spi plugin_intel_spi) |
221 |
- $(meson_use synaptics plugin_synaptics_mst) |
222 |
- $(meson_use synaptics plugin_synaptics_rmi) |
223 |
- $(meson_use thunderbolt plugin_thunderbolt) |
224 |
- $(meson_use tpm plugin_tpm) |
225 |
- $(meson_use uefi plugin_uefi_capsule) |
226 |
- $(meson_use uefi plugin_uefi_capsule_splash) |
227 |
- $(meson_use uefi plugin_uefi_pk) |
228 |
- ) |
229 |
- use ppc64 && plugins+=( -Dplugin_msr="false" ) |
230 |
- use riscv && plugins+=( -Dplugin_msr="false" ) |
231 |
- |
232 |
- local emesonargs=( |
233 |
- --localstatedir "${EPREFIX}"/var |
234 |
- -Dbuild="$(usex minimal standalone all)" |
235 |
- -Dconsolekit="false" |
236 |
- -Dcurl="true" |
237 |
- -Ddocs="$(usex gtk-doc gtkdoc none)" |
238 |
- -Defi_binary="false" |
239 |
- -Dsupported_build="true" |
240 |
- $(meson_use archive libarchive) |
241 |
- $(meson_use bash-completion bash_completion) |
242 |
- $(meson_use bluetooth bluez) |
243 |
- $(meson_use elogind) |
244 |
- $(meson_use gnutls) |
245 |
- $(meson_use gusb) |
246 |
- $(meson_use lzma) |
247 |
- $(meson_use man) |
248 |
- $(meson_use introspection) |
249 |
- $(meson_use policykit polkit) |
250 |
- $(meson_use systemd) |
251 |
- $(meson_use test tests) |
252 |
- |
253 |
- ${plugins[@]} |
254 |
- ) |
255 |
- use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) |
256 |
- export CACHE_DIRECTORY="${T}" |
257 |
- meson_src_configure |
258 |
-} |
259 |
- |
260 |
-src_install() { |
261 |
- meson_src_install |
262 |
- |
263 |
- if ! use minimal ; then |
264 |
- newinitd "${FILESDIR}"/${PN}-r2 ${PN} |
265 |
- |
266 |
- if ! use systemd ; then |
267 |
- # Don't timeout when fwupd is running (#673140) |
268 |
- sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ |
269 |
- -i "${ED}"/etc/${PN}/daemon.conf || die |
270 |
- fi |
271 |
- fi |
272 |
-} |