1 |
commit: b2a24c43c431b163fda4a7eb1b982ad43a8187e5 |
2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 31 13:20:38 2022 +0000 |
4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 31 13:24:08 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2a24c43 |
7 |
|
8 |
sys-apps/fwupd: add 1.8.4 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/867616 |
11 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
12 |
|
13 |
sys-apps/fwupd/Manifest | 1 + |
14 |
.../fwupd/files/fwupd-1.8.4-installed_tests.patch | 215 +++++++++++++++++++++ |
15 |
sys-apps/fwupd/fwupd-1.8.4.ebuild | 201 +++++++++++++++++++ |
16 |
3 files changed, 417 insertions(+) |
17 |
|
18 |
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest |
19 |
index 060c1b5fe73c..7fc645626c16 100644 |
20 |
--- a/sys-apps/fwupd/Manifest |
21 |
+++ b/sys-apps/fwupd/Manifest |
22 |
@@ -1,2 +1,3 @@ |
23 |
DIST fwupd-1.7.7.tar.gz 4057638 BLAKE2B 197d7b8a8de64094d267bb4e2de30101373bcc52fd54d12dc2590a50f2bcebbcfe00847d19c0088d2c778743d219ee73c0237db711ad27e36f7126f7c615ccf7 SHA512 a787ffdff93f483ad97547d335c50a4db7b61bce1bc27d737b077bbedfa4676c8d6d37db94ac24083c50e3bfde8aefd4d1adb3d0e473303f454a46dde136df0a |
24 |
DIST fwupd-1.8.3.tar.gz 4267315 BLAKE2B 35e5855ea0d314fa5b1cc33ed4efa71e54c35b57c742748a5d6c7f4c1f88bfd9c2e5a84f2af72f6e5e63ddfc4f6521312fb7b1446922c76917f9abdd4d90e618 SHA512 271a1c2547f35322a7a7d83adc84d729ba73d810f6ac526d1c6aa2a9774dea1edc986b7d62481ebb70d43653577ced19f13f695dedf4012c82d814da70cb83f4 |
25 |
+DIST fwupd-1.8.4.tar.xz 3269648 BLAKE2B 20857c5de6194a561c587ace0463d94440d25256a04cce51b77f3dcffde9b0f08a03a03e1d0dbb5f15016169f9a31e290609b3fc3f68b40b932c77335f05ec6f SHA512 569d0cb81f9a29259d0a7ae7100ca1063d20557b56903f80c1466667baf40a74d677f48159e5bd53ab6b33de8ce7185bf279b6dbcf6edfee744c1d4965c5db8f |
26 |
|
27 |
diff --git a/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch |
28 |
new file mode 100644 |
29 |
index 000000000000..1cb3b41cb728 |
30 |
--- /dev/null |
31 |
+++ b/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch |
32 |
@@ -0,0 +1,215 @@ |
33 |
+--- a/data/meson.build |
34 |
++++ b/data/meson.build |
35 |
+@@ -10,20 +10,10 @@ |
36 |
+ subdir('fish-completion') |
37 |
+ endif |
38 |
+ |
39 |
+-if get_option('tests') |
40 |
+-subdir('device-tests') |
41 |
+-endif |
42 |
+- |
43 |
+ if build_daemon |
44 |
+ subdir('motd') |
45 |
+ endif |
46 |
+ |
47 |
+-if get_option('tests') |
48 |
+- if build_daemon |
49 |
+- subdir('installed-tests') |
50 |
+- endif |
51 |
+-endif |
52 |
+- |
53 |
+ if build_standalone |
54 |
+ install_data(['daemon.conf'], |
55 |
+ install_dir: join_paths(sysconfdir, 'fwupd') |
56 |
+--- a/plugins/acpi-dmar/meson.build |
57 |
++++ b/plugins/acpi-dmar/meson.build |
58 |
+@@ -47,7 +47,6 @@ |
59 |
+ fwupd, |
60 |
+ fwupdplugin, |
61 |
+ ], |
62 |
+- install: true, |
63 |
+ install_dir: installed_test_bindir, |
64 |
+ ) |
65 |
+ test('acpi-dmar-self-test', e, env: env) # added to installed-tests |
66 |
+--- a/plugins/acpi-facp/meson.build |
67 |
++++ b/plugins/acpi-facp/meson.build |
68 |
+@@ -47,7 +47,6 @@ |
69 |
+ fwupd, |
70 |
+ fwupdplugin, |
71 |
+ ], |
72 |
+- install: true, |
73 |
+ install_dir: installed_test_bindir, |
74 |
+ ) |
75 |
+ test('acpi-facp-self-test', e, env: env) # added to installed-tests |
76 |
+--- a/plugins/acpi-ivrs/meson.build |
77 |
++++ b/plugins/acpi-ivrs/meson.build |
78 |
+@@ -47,7 +47,6 @@ |
79 |
+ fwupd, |
80 |
+ fwupdplugin, |
81 |
+ ], |
82 |
+- install: true, |
83 |
+ install_dir: installed_test_bindir, |
84 |
+ ) |
85 |
+ test('acpi-ivrs-self-test', e, env: env) # added to installed-tests |
86 |
+--- a/plugins/acpi-phat/meson.build |
87 |
++++ b/plugins/acpi-phat/meson.build |
88 |
+@@ -53,7 +53,6 @@ |
89 |
+ fwupd, |
90 |
+ fwupdplugin, |
91 |
+ ], |
92 |
+- install: true, |
93 |
+ install_dir: installed_test_bindir, |
94 |
+ ) |
95 |
+ test('acpi-phat-self-test', e, env: env) # added to installed-tests |
96 |
+--- a/plugins/ata/meson.build |
97 |
++++ b/plugins/ata/meson.build |
98 |
+@@ -53,7 +53,6 @@ |
99 |
+ fwupd, |
100 |
+ fwupdplugin, |
101 |
+ ], |
102 |
+- install: true, |
103 |
+ install_dir: installed_test_bindir, |
104 |
+ ) |
105 |
+ test('ata-self-test', e, env: env) # added to installed-tests |
106 |
+--- a/plugins/bcm57xx/meson.build |
107 |
++++ b/plugins/bcm57xx/meson.build |
108 |
+@@ -35,8 +35,6 @@ |
109 |
+ ) |
110 |
+ |
111 |
+ if get_option('tests') |
112 |
+- install_data(['tests/bcm57xx.builder.xml'], |
113 |
+- install_dir: join_paths(installed_test_datadir, 'tests')) |
114 |
+ env = environment() |
115 |
+ env.set('G_TEST_SRCDIR', meson.current_source_dir()) |
116 |
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir()) |
117 |
+@@ -63,7 +61,6 @@ |
118 |
+ fwupd, |
119 |
+ fwupdplugin, |
120 |
+ ], |
121 |
+- install: true, |
122 |
+ install_dir: installed_test_bindir, |
123 |
+ ) |
124 |
+ test('bcm57xx-self-test', e, env: env) |
125 |
+--- a/plugins/ccgx/meson.build |
126 |
++++ b/plugins/ccgx/meson.build |
127 |
+@@ -37,8 +37,6 @@ |
128 |
+ endif |
129 |
+ |
130 |
+ if get_option('tests') |
131 |
+- install_data(['tests/ccgx.builder.xml', 'tests/ccgx-dmc.builder.xml'], |
132 |
+- install_dir: join_paths(installed_test_datadir, 'tests')) |
133 |
+ env = environment() |
134 |
+ env.set('G_TEST_SRCDIR', meson.current_source_dir()) |
135 |
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir()) |
136 |
+@@ -64,7 +62,6 @@ |
137 |
+ fwupd, |
138 |
+ fwupdplugin, |
139 |
+ ], |
140 |
+- install: true, |
141 |
+ install_dir: installed_test_bindir, |
142 |
+ ) |
143 |
+ test('ccgx-self-test', e, env: env) |
144 |
+--- a/plugins/elantp/meson.build |
145 |
++++ b/plugins/elantp/meson.build |
146 |
+@@ -33,8 +33,6 @@ |
147 |
+ endif |
148 |
+ |
149 |
+ if get_option('tests') |
150 |
+- install_data(['tests/elantp.builder.xml'], |
151 |
+- install_dir: join_paths(installed_test_datadir, 'tests')) |
152 |
+ env = environment() |
153 |
+ env.set('G_TEST_SRCDIR', meson.current_source_dir()) |
154 |
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir()) |
155 |
+@@ -57,7 +55,6 @@ |
156 |
+ fwupd, |
157 |
+ fwupdplugin, |
158 |
+ ], |
159 |
+- install: true, |
160 |
+ install_dir: installed_test_bindir, |
161 |
+ ) |
162 |
+ test('elantp-self-test', e, env: env) |
163 |
+--- a/plugins/linux-swap/meson.build |
164 |
++++ b/plugins/linux-swap/meson.build |
165 |
+@@ -44,7 +44,6 @@ |
166 |
+ fwupd, |
167 |
+ fwupdplugin, |
168 |
+ ], |
169 |
+- install: true, |
170 |
+ install_dir: installed_test_bindir, |
171 |
+ ) |
172 |
+ test('linux-swap-self-test', e) # added to installed-tests |
173 |
+--- a/plugins/mtd/meson.build |
174 |
++++ b/plugins/mtd/meson.build |
175 |
+@@ -46,7 +46,6 @@ |
176 |
+ fwupd, |
177 |
+ fwupdplugin, |
178 |
+ ], |
179 |
+- install: true, |
180 |
+ install_dir: installed_test_bindir, |
181 |
+ ) |
182 |
+ test('mtd-self-test', e) # added to installed-tests |
183 |
+--- a/plugins/nitrokey/meson.build |
184 |
++++ b/plugins/nitrokey/meson.build |
185 |
+@@ -47,7 +47,6 @@ |
186 |
+ link_with: [ |
187 |
+ fwupdplugin, |
188 |
+ ], |
189 |
+- install: true, |
190 |
+ install_dir: installed_test_bindir, |
191 |
+ ) |
192 |
+ test('nitrokey-self-test', e) # added to installed-tests |
193 |
+--- a/plugins/pixart-rf/meson.build |
194 |
++++ b/plugins/pixart-rf/meson.build |
195 |
+@@ -31,8 +31,6 @@ |
196 |
+ ) |
197 |
+ |
198 |
+ if get_option('tests') |
199 |
+- install_data(['tests/pixart.builder.xml'], |
200 |
+- install_dir: join_paths(installed_test_datadir, 'tests')) |
201 |
+ env = environment() |
202 |
+ env.set('G_TEST_SRCDIR', meson.current_source_dir()) |
203 |
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir()) |
204 |
+@@ -55,7 +53,6 @@ |
205 |
+ fwupd, |
206 |
+ fwupdplugin, |
207 |
+ ], |
208 |
+- install: true, |
209 |
+ install_dir: installed_test_bindir, |
210 |
+ ) |
211 |
+ test('pxi-self-test', e, env: env) |
212 |
+--- a/plugins/redfish/meson.build |
213 |
++++ b/plugins/redfish/meson.build |
214 |
+@@ -47,14 +47,6 @@ |
215 |
+ ) |
216 |
+ |
217 |
+ if get_option('tests') |
218 |
+- install_data(['tests/redfish-smbios.bin'], |
219 |
+- install_dir: join_paths(installed_test_datadir, 'tests')) |
220 |
+- install_data(['tests/redfish.conf'], |
221 |
+- install_dir: join_paths(installed_test_datadir, 'tests')) |
222 |
+- install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'], |
223 |
+- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars')) |
224 |
+- install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'], |
225 |
+- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars')) |
226 |
+ env = environment() |
227 |
+ env.set('G_TEST_SRCDIR', meson.current_source_dir()) |
228 |
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir()) |
229 |
+@@ -89,7 +81,6 @@ |
230 |
+ fwupd, |
231 |
+ fwupdplugin, |
232 |
+ ], |
233 |
+- install: true, |
234 |
+ install_dir: installed_test_bindir, |
235 |
+ ) |
236 |
+ test('redfish-self-test', e, env: env) # added to installed-tests |
237 |
+--- a/src/tests/host-emulate/meson.build |
238 |
++++ b/src/tests/host-emulate/meson.build |
239 |
+@@ -8,7 +8,7 @@ |
240 |
+ output: '@0@.gz'.format(input_file), |
241 |
+ capture: true, |
242 |
+ command: [gzip, '-k', '--stdout', '@INPUT@'], |
243 |
+- install: true, |
244 |
++ install: false, |
245 |
+ install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'), |
246 |
+ ) |
247 |
+ endforeach |
248 |
|
249 |
diff --git a/sys-apps/fwupd/fwupd-1.8.4.ebuild b/sys-apps/fwupd/fwupd-1.8.4.ebuild |
250 |
new file mode 100644 |
251 |
index 000000000000..995724a81068 |
252 |
--- /dev/null |
253 |
+++ b/sys-apps/fwupd/fwupd-1.8.4.ebuild |
254 |
@@ -0,0 +1,201 @@ |
255 |
+# Copyright 1999-2022 Gentoo Authors |
256 |
+# Distributed under the terms of the GNU General Public License v2 |
257 |
+ |
258 |
+EAPI=8 |
259 |
+ |
260 |
+PYTHON_COMPAT=( python3_{8..11} ) |
261 |
+ |
262 |
+inherit linux-info meson python-single-r1 vala udev xdg |
263 |
+ |
264 |
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" |
265 |
+HOMEPAGE="https://fwupd.org" |
266 |
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" |
267 |
+ |
268 |
+LICENSE="LGPL-2.1+" |
269 |
+SLOT="0" |
270 |
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" |
271 |
+IUSE="amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi" |
272 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
273 |
+ ^^ ( elogind minimal systemd ) |
274 |
+ dell? ( uefi ) |
275 |
+ fastboot? ( gusb ) |
276 |
+ logitech? ( gusb ) |
277 |
+ minimal? ( !introspection ) |
278 |
+ modemmanager? ( gusb ) |
279 |
+ spi? ( lzma ) |
280 |
+ synaptics? ( gnutls ) |
281 |
+ uefi? ( gnutls ) |
282 |
+" |
283 |
+RESTRICT="!test? ( test )" |
284 |
+ |
285 |
+BDEPEND="$(vala_depend) |
286 |
+ >=dev-util/meson-0.60.0 |
287 |
+ virtual/pkgconfig |
288 |
+ gtk-doc? ( |
289 |
+ >=dev-util/gi-docgen-2021.1 |
290 |
+ ) |
291 |
+ bash-completion? ( >=app-shells/bash-completion-2.0 ) |
292 |
+ introspection? ( dev-libs/gobject-introspection ) |
293 |
+ man? ( |
294 |
+ app-text/docbook-sgml-utils |
295 |
+ sys-apps/help2man |
296 |
+ ) |
297 |
+ test? ( |
298 |
+ dev-util/umockdev |
299 |
+ net-libs/gnutls[tools] |
300 |
+ ) |
301 |
+" |
302 |
+COMMON_DEPEND="${PYTHON_DEPS} |
303 |
+ >=app-arch/gcab-1.0 |
304 |
+ app-arch/xz-utils |
305 |
+ >=dev-libs/glib-2.58:2 |
306 |
+ dev-libs/json-glib |
307 |
+ dev-libs/libgudev:= |
308 |
+ >=dev-libs/libjcat-0.1.4[gpg,pkcs7] |
309 |
+ >=dev-libs/libxmlb-0.1.13:=[introspection?] |
310 |
+ $(python_gen_cond_dep ' |
311 |
+ dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] |
312 |
+ ') |
313 |
+ >=net-libs/libsoup-2.51.92:2.4[introspection?] |
314 |
+ net-misc/curl |
315 |
+ archive? ( app-arch/libarchive:= ) |
316 |
+ cbor? ( dev-libs/libcbor ) |
317 |
+ dell? ( |
318 |
+ >=app-crypt/tpm2-tss-2.0 |
319 |
+ >=sys-libs/libsmbios-2.4.0 |
320 |
+ ) |
321 |
+ elogind? ( >=sys-auth/elogind-211 ) |
322 |
+ flashrom? ( >=sys-apps/flashrom-1.2-r3 ) |
323 |
+ gnutls? ( net-libs/gnutls ) |
324 |
+ gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) |
325 |
+ logitech? ( dev-libs/protobuf-c:= ) |
326 |
+ lzma? ( app-arch/xz-utils ) |
327 |
+ modemmanager? ( net-misc/modemmanager[qmi] ) |
328 |
+ policykit? ( >=sys-auth/polkit-0.114 ) |
329 |
+ sqlite? ( dev-db/sqlite ) |
330 |
+ systemd? ( >=sys-apps/systemd-211 ) |
331 |
+ tpm? ( app-crypt/tpm2-tss:= ) |
332 |
+ uefi? ( |
333 |
+ sys-apps/fwupd-efi |
334 |
+ sys-boot/efibootmgr |
335 |
+ sys-fs/udisks |
336 |
+ sys-libs/efivar |
337 |
+ ) |
338 |
+" |
339 |
+RDEPEND=" |
340 |
+ ${COMMON_DEPEND} |
341 |
+ sys-apps/dbus |
342 |
+" |
343 |
+ |
344 |
+DEPEND=" |
345 |
+ ${COMMON_DEPEND} |
346 |
+ x11-libs/pango[introspection] |
347 |
+" |
348 |
+ |
349 |
+PATCHES=( |
350 |
+ "${FILESDIR}"/${PN}-1.8.3-docgen_deps_test.patch |
351 |
+ "${FILESDIR}"/${PN}-1.8.4-installed_tests.patch |
352 |
+) |
353 |
+ |
354 |
+pkg_setup() { |
355 |
+ python-single-r1_pkg_setup |
356 |
+ vala_setup |
357 |
+ if use nvme ; then |
358 |
+ kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" |
359 |
+ fi |
360 |
+} |
361 |
+ |
362 |
+src_prepare() { |
363 |
+ default |
364 |
+ |
365 |
+ # c.f. https://github.com/fwupd/fwupd/issues/1414 |
366 |
+ sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ |
367 |
+ -i plugins/thunderbolt/meson.build || die |
368 |
+ |
369 |
+ sed -e '/platform-integrity/d' \ |
370 |
+ -i plugins/meson.build || die #753521 |
371 |
+ |
372 |
+ sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \ |
373 |
+ -i docs/meson.build || die |
374 |
+ |
375 |
+ python_fix_shebang "${S}"/contrib/*.py |
376 |
+} |
377 |
+ |
378 |
+src_configure() { |
379 |
+ # TODO (maybe): acpi_phat, bcm57xx, cfu, cpu, emmc, ep963x, mtd, nitrokey, |
380 |
+ # parade_lspcon, pixart_rf, realtek_mst, scsi, redfish, upower |
381 |
+ local plugins=( |
382 |
+ -Dplugin_gpio="enabled" |
383 |
+ $(meson_feature amt plugin_amt) |
384 |
+ $(meson_feature dell plugin_dell) |
385 |
+ $(meson_feature fastboot plugin_fastboot) |
386 |
+ $(meson_feature flashrom plugin_flashrom) |
387 |
+ $(meson_feature gusb plugin_uf2) |
388 |
+ $(meson_feature logitech plugin_logitech_bulkcontroller) |
389 |
+ $(meson_feature modemmanager plugin_modem_manager) |
390 |
+ $(meson_feature nvme plugin_nvme) |
391 |
+ $(meson_use spi plugin_intel_spi) |
392 |
+ $(meson_feature synaptics plugin_synaptics_mst) |
393 |
+ $(meson_feature synaptics plugin_synaptics_rmi) |
394 |
+ $(meson_feature tpm plugin_tpm) |
395 |
+ $(meson_feature uefi plugin_uefi_capsule) |
396 |
+ $(meson_use uefi plugin_uefi_capsule_splash) |
397 |
+ $(meson_feature uefi plugin_uefi_pk) |
398 |
+ ) |
399 |
+ if use ppc64 || use riscv ; then |
400 |
+ plugins+=( -Dplugin_msr="disabled" ) |
401 |
+ fi |
402 |
+ |
403 |
+ local emesonargs=( |
404 |
+ --localstatedir "${EPREFIX}"/var |
405 |
+ -Dbuild="$(usex minimal standalone all)" |
406 |
+ -Dconsolekit="disabled" |
407 |
+ -Dcurl="enabled" |
408 |
+ -Defi_binary="false" |
409 |
+ -Dgresource_quirks="disabled" |
410 |
+ -Dsupported_build="enabled" |
411 |
+ -Dudevdir="${EPREFIX}$(get_udevdir)" |
412 |
+ $(meson_feature archive libarchive) |
413 |
+ $(meson_use bash-completion bash_completion) |
414 |
+ $(meson_feature bluetooth bluez) |
415 |
+ $(meson_feature cbor) |
416 |
+ $(meson_feature elogind) |
417 |
+ $(meson_feature gnutls) |
418 |
+ $(meson_feature gtk-doc docs) |
419 |
+ $(meson_feature gusb) |
420 |
+ $(meson_feature lzma) |
421 |
+ $(meson_use man) |
422 |
+ $(meson_feature introspection) |
423 |
+ $(meson_feature policykit polkit) |
424 |
+ $(meson_feature sqlite) |
425 |
+ $(meson_feature systemd) |
426 |
+ $(meson_use test tests) |
427 |
+ |
428 |
+ ${plugins[@]} |
429 |
+ ) |
430 |
+ use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) |
431 |
+ export CACHE_DIRECTORY="${T}" |
432 |
+ meson_src_configure |
433 |
+} |
434 |
+ |
435 |
+src_install() { |
436 |
+ meson_src_install |
437 |
+ |
438 |
+ if ! use minimal ; then |
439 |
+ newinitd "${FILESDIR}"/${PN}-r2 ${PN} |
440 |
+ |
441 |
+ if ! use systemd ; then |
442 |
+ # Don't timeout when fwupd is running (#673140) |
443 |
+ sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ |
444 |
+ -i "${ED}"/etc/${PN}/daemon.conf || die |
445 |
+ fi |
446 |
+ fi |
447 |
+} |
448 |
+ |
449 |
+pkg_postinst() { |
450 |
+ use minimal || udev_reload |
451 |
+} |
452 |
+ |
453 |
+pkg_postrm() { |
454 |
+ use minimal || udev_reload |
455 |
+} |