From 8b63b46fda85d54cfbe94df2444a3ddd3e63b8e4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 30 Mar 2023 16:00:34 +0100 Subject: gentoo auto-resync : 30:03:2023 - 16:00:34 --- sys-apps/fwupd/Manifest | 4 +- .../fwupd/files/fwupd-1.8.13-installed_tests.patch | 406 +++++++++++++++++++++ sys-apps/fwupd/fwupd-1.8.11.ebuild | 197 ---------- sys-apps/fwupd/fwupd-1.8.13.ebuild | 193 ++++++++++ 4 files changed, 602 insertions(+), 198 deletions(-) create mode 100644 sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch delete mode 100644 sys-apps/fwupd/fwupd-1.8.11.ebuild create mode 100644 sys-apps/fwupd/fwupd-1.8.13.ebuild (limited to 'sys-apps/fwupd') diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index 96d45ef6ed23..60c254036135 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,10 +1,12 @@ AUX fwupd-1.8.10-installed_tests.patch 10892 BLAKE2B 27f52fd33ddcf9d64aecf40105413047668e538ace3efe25a87abfc3100c264515b238252b303aed43dde6ca6ddd788ada826f52ec0a0e7bc7b1e2fe47142025 SHA512 f581dfac2e2a94659751958b8c05a54eb2cfc0c23fd89dc1cf3e2a460e3079e15ee60898b5bdb6d399bdc997a82b5bb8a581f5db21cbf6830a94b6f01c443a5a AUX fwupd-1.8.11-empty_kernel_cmdline.patch 812 BLAKE2B 5542b3df5de628a069ab26ab53576073a2d4ef30da970061c1129883181d7adfe2fd22f18f1179e7f179a52e55126b12235478c66f3a5e921339e74a7adc34ab SHA512 317f26e6317878c8886e4adeb3a7fca4c4ca823a5f35865f11fac7a810fb5d76dd726526b496069edb7f8a6f8ae86965f07530ec751b616f63dc3e8eef30707e AUX fwupd-1.8.11-installed_tests.patch 11562 BLAKE2B ae49094cf8b8312fa529424c5235cd12c68d368ab9a6b5f7520351683c31f71a824d50987869858454c27f6f6868df311042785618eb9bf18e424d5ea00ff987 SHA512 a4ddfd3c36dcb2ad47c4640180c301f0244f056d6812c2c722a84e33232694fd051305fb13600bea100e2ab5f692a039091238cf24d6aa29ca9044825b7dba35 +AUX fwupd-1.8.13-installed_tests.patch 11799 BLAKE2B 7d1b5e18f27a95aabda2421a9ba2ff98ae68f74fc82b103d199fe57905fbe40d21d88c60f2a0708bd575f6ce013abda848c9d0830f2489fb88ff1810926505db SHA512 3edd59a52310a454a86470feb9b17f627def0362947788c65743e0cbbc4670b94a227080caddc1e7808fc9b63f5e045d4a0638b63ae1ff850f70db9e3b748910 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7 DIST fwupd-1.8.10.tar.xz 3366400 BLAKE2B 891cade6c4a3a58d61c19ba6001d0161de046465729ebd349d04b2e2170146d2a7dc099285f60f7b1f7438d70a7792b5ff3921a2892e726cc6674f0628f9fabc SHA512 8437cdc93d553e42d33a037d14fcb09bb65b4c4d7d60add6a90c84dce0845097fe96005a1f6a9da7daf89df5b7dcd1b43a9fbba666cd18129b67ebe1c3ce7c97 DIST fwupd-1.8.11.tar.xz 3389224 BLAKE2B d86b8776f78405384fcced78ebe1478585a4ca5127a184d357f2b8fc78f6437a58030c81f5bae672564e2a0df85d9b8512869b7eb1b82f5099bd0c4269acebc5 SHA512 f1fe648e33dc407bbb2ab438a29dee6e29ccdfa8cb6ca421b92cdfd724a3347254e6ddf35634b1e41e985558ea95166914b3fde927f61f1c0aa29800bf6ca6de +DIST fwupd-1.8.13.tar.xz 3734812 BLAKE2B fb4d172e88dd15e13e4a682e87ce65f7b7ff25bd952fc2efed54bf5d8ad32874f91f143c17c90d4d63ec9138f214338f55d073a2c82bc86bf01b2531ef4a88cc SHA512 82616a3a239574020edbe6d026fb1652a0b0d1e173cb67f85d05829d4ab498852d5137019665de3c7102f16853aa4b195a9de7df039bc18857b226b04b5aec71 EBUILD fwupd-1.8.10.ebuild 4877 BLAKE2B 374ad7b6b8f3332a00716dcd46d9904833ef7c52e95d9e269fde77fe810ef17cfb3a76c0bff112b2831b2d80b985b1257386c092363e9e542bcb53afaac8ffc4 SHA512 b1435e3079eae1f76433511b13473fc72665c09b095d21ddba889178ea636ffa53f30f5e8055db3f8c33149af7041e9741aa89d4a2c87aaf60a124253837afdd EBUILD fwupd-1.8.11-r1.ebuild 4865 BLAKE2B c654e52b393d0772c96977ce6ba8ca3da83be3738e00e7c7c3475d51bf8c1173e18b2c69da31570e13bbb4d754c55baf92fa43cfb52b217e8471d82da8cca82e SHA512 c0aa1a103ce2f59789bd32e1859daae68e7c42fb589f2f63e980c2f6db9420a3e12096eb9522c9fbc32b2853ec028c951c4882016d81170c6866f6634dd611e6 -EBUILD fwupd-1.8.11.ebuild 4879 BLAKE2B bcb4bc55a2db90ef65d1dfcf217ca677cd8f87790395828a7be8fc24c24557bf97b757bfe8ba21391a270cff7cf3993c6457f9bfee338eb95d86899254e0f00c SHA512 129634825e136cf9d4a243d3386f5f3d9e6d2b9a81ed1a55e92fbf1419b30f3f6a7bb3f123c915e5f059e81f1f048c799872ce270765b18323b03d78647d163d +EBUILD fwupd-1.8.13.ebuild 4810 BLAKE2B eda66e330abc30b2a7dab73a15b5778326e54cde68da66d1c9dbaa0458059223b34ef5f3a1e18f20c5eb32a73ad6958d9463c361c8ef3f02503b2e05d97ceb43 SHA512 dd8cb5e60205fe0fc8664b39d629f24766070bad9800cb8f4eaba0668a62a9b3cadba3b9a13e9fd54e21d2c78603f1a62453b9b41e5e19e938a9ec50dc63795c MISC metadata.xml 1466 BLAKE2B ac548631c37c846437843bb6711add698a211637e273bace245f1f062eea1563e10c6918a9688a67ad3941e0e63bae22570599a29477aadf770430bd4abda126 SHA512 10b8bdaed532227e36a8a83ab0357e8964aeceadee3f045e0d4c90420acf68f370c08588a746e98efe386d2482bfabbf36db72371f4fe4e12fff187c734e79de diff --git a/sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch new file mode 100644 index 000000000000..f97343be5224 --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch @@ -0,0 +1,406 @@ +--- a/data/meson.build ++++ b/data/meson.build +@@ -10,20 +10,10 @@ + subdir('fish-completion') + endif + +-if get_option('tests') +-subdir('device-tests') +-endif +- + if build_daemon + subdir('motd') + endif + +-if get_option('tests') +- if build_daemon +- subdir('installed-tests') +- endif +-endif +- + if build_standalone + install_data(['daemon.conf'], + install_dir: join_paths(sysconfdir, 'fwupd') +--- a/libfwupdplugin/meson.build ++++ b/libfwupdplugin/meson.build +@@ -371,6 +371,7 @@ + ) + test('fwupdplugin-self-test', e, is_parallel: false, timeout: 180, env: env) + ++ if false + install_data([ + 'tests/chassis_type', + 'tests/sys_vendor', +@@ -389,6 +390,7 @@ + ], + install_dir: join_paths(installed_test_datadir, 'tests/dmi/tables64'), + ) ++ endif + endif + + fwupdplugin_incdir = include_directories('.') +--- a/libfwupdplugin/tests/meson.build ++++ b/libfwupdplugin/tests/meson.build +@@ -10,6 +10,5 @@ + command: [ + python3, '-m', 'zipfile', '-c', '@OUTPUT@', '@INPUT@', + ], +- install: true, + install_dir: installed_test_datadir, + ) +--- a/plugins/acpi-dmar/meson.build ++++ b/plugins/acpi-dmar/meson.build +@@ -28,7 +28,6 @@ + plugin_libs, + plugin_builtin_acpi_dmar, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/acpi-facp/meson.build ++++ b/plugins/acpi-facp/meson.build +@@ -28,7 +28,6 @@ + plugin_libs, + plugin_builtin_acpi_facp, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/acpi-ivrs/meson.build ++++ b/plugins/acpi-ivrs/meson.build +@@ -28,7 +28,6 @@ + plugin_libs, + plugin_builtin_acpi_ivrs, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/acpi-phat/meson.build ++++ b/plugins/acpi-phat/meson.build +@@ -31,7 +31,6 @@ + plugin_libs, + plugin_builtin_acpi_phat, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/ata/meson.build ++++ b/plugins/ata/meson.build +@@ -33,7 +33,6 @@ + plugin_libs, + plugin_builtin_ata, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/bcm57xx/meson.build ++++ b/plugins/bcm57xx/meson.build +@@ -25,8 +25,6 @@ + plugin_builtins += plugin_builtin_bcm57xx + + if get_option('tests') +- install_data(['tests/bcm57xx.builder.xml'], +- install_dir: join_paths(installed_test_datadir, 'tests')) + env = environment() + env.set('G_TEST_SRCDIR', meson.current_source_dir()) + env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +@@ -41,7 +39,6 @@ + plugin_libs, + plugin_builtin_bcm57xx, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/ccgx/meson.build ++++ b/plugins/ccgx/meson.build +@@ -29,8 +29,6 @@ + plugin_builtins += plugin_builtin_ccgx + + if get_option('tests') +- install_data(['tests/ccgx.builder.xml', 'tests/ccgx-dmc.builder.xml'], +- install_dir: join_paths(installed_test_datadir, 'tests')) + env = environment() + env.set('G_TEST_SRCDIR', meson.current_source_dir()) + env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +@@ -45,7 +43,6 @@ + plugin_libs, + plugin_builtin_ccgx, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/dfu/meson.build ++++ b/plugins/dfu/meson.build +@@ -70,7 +70,6 @@ + plugin_libs, + plugin_builtin_dfu, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/elantp/meson.build ++++ b/plugins/elantp/meson.build +@@ -22,8 +22,6 @@ + plugin_builtins += plugin_builtin_elantp + + if get_option('tests') +- install_data(['tests/elantp.builder.xml'], +- install_dir: join_paths(installed_test_datadir, 'tests')) + env = environment() + env.set('G_TEST_SRCDIR', meson.current_source_dir()) + env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +@@ -38,7 +36,6 @@ + plugin_libs, + plugin_builtin_elantp, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/linux-swap/meson.build ++++ b/plugins/linux-swap/meson.build +@@ -28,7 +28,6 @@ + plugin_libs, + plugin_builtin_linux_swap, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/mtd/meson.build ++++ b/plugins/mtd/meson.build +@@ -29,7 +29,6 @@ + plugin_libs, + plugin_builtin_mtd, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/nitrokey/meson.build ++++ b/plugins/nitrokey/meson.build +@@ -33,7 +33,6 @@ + plugin_libs, + plugin_builtin_nitrokey, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/nvme/meson.build ++++ b/plugins/nvme/meson.build +@@ -38,7 +38,6 @@ + plugin_libs, + plugin_builtin_nvme, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/pixart-rf/meson.build ++++ b/plugins/pixart-rf/meson.build +@@ -19,8 +19,6 @@ + plugin_builtins += plugin_builtin_pxi + + if get_option('tests') +- install_data(['tests/pixart.builder.xml'], +- install_dir: join_paths(installed_test_datadir, 'tests')) + env = environment() + env.set('G_TEST_SRCDIR', meson.current_source_dir()) + env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +@@ -35,7 +33,6 @@ + plugin_libs, + plugin_builtin_pxi, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/redfish/meson.build ++++ b/plugins/redfish/meson.build +@@ -40,16 +40,6 @@ + ) + + if get_option('tests') +- install_data(['tests/redfish-smbios.bin'], +- install_dir: join_paths(installed_test_datadir, 'tests')) +- install_data(['tests/redfish.conf'], +- install_dir: join_paths(installed_test_datadir, 'tests'), +- install_mode: 'rw-r-----', +- ) +- install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'], +- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars')) +- install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'], +- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars')) + env = environment() + env.set('G_TEST_SRCDIR', meson.current_source_dir()) + env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +@@ -69,7 +59,6 @@ + fwupdplugin, + plugin_builtin_redfish, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/synaptics-mst/meson.build ++++ b/plugins/synaptics-mst/meson.build +@@ -22,8 +22,6 @@ + plugin_builtins += plugin_builtin_synaptics_mst + + if get_option('tests') +- install_data(['tests/synaptics-mst.builder.xml'], +- install_dir: join_paths(installed_test_datadir, 'tests')) + env = environment() + env.set('G_TEST_SRCDIR', meson.current_source_dir()) + env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +@@ -44,7 +42,6 @@ + fwupdplugin, + plugin_builtin_synaptics_mst, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/synaptics-prometheus/meson.build ++++ b/plugins/synaptics-prometheus/meson.build +@@ -18,8 +18,6 @@ + plugin_builtins += plugin_builtin_synaprom + + if get_option('tests') +- install_data(['tests/synaptics-prometheus.builder.xml'], +- install_dir: join_paths(installed_test_datadir, 'tests')) + env = environment() + env.set('G_TEST_SRCDIR', meson.current_source_dir()) + env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +@@ -34,7 +32,6 @@ + plugin_libs, + plugin_builtin_synaprom, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/synaptics-rmi/meson.build ++++ b/plugins/synaptics-rmi/meson.build +@@ -25,8 +25,6 @@ + plugin_builtins += plugin_builtin_synaptics_rmi + + if get_option('tests') +- install_data(['tests/synaptics-rmi-0x.builder.xml','tests/synaptics-rmi-10.builder.xml'], +- install_dir: join_paths(installed_test_datadir, 'tests')) + env = environment() + env.set('G_TEST_SRCDIR', meson.current_source_dir()) + env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +@@ -41,7 +39,6 @@ + plugin_libs, + plugin_builtin_synaptics_rmi, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/uefi-capsule/meson.build ++++ b/plugins/uefi-capsule/meson.build +@@ -149,25 +149,6 @@ + ], + ) + test('uefi-self-test', e, env: env) +- +-# to use these do `sudo systemctl edit fwupd.service` and set +-# Environment="FWUPD_SYSFSFWDIR=/usr/share/installed-tests/fwupd" +-install_data([ +- 'tests/efi/esrt/entries/entry0/capsule_flags', +- 'tests/efi/esrt/entries/entry0/fw_class', +- 'tests/efi/esrt/entries/entry0/fw_type', +- 'tests/efi/esrt/entries/entry0/fw_version', +- 'tests/efi/esrt/entries/entry0/last_attempt_status', +- 'tests/efi/esrt/entries/entry0/last_attempt_version', +- 'tests/efi/esrt/entries/entry0/lowest_supported_fw_version', +- ], +- install_dir: join_paths(installed_test_datadir, 'efi/esrt/entries/entry0'), +-) +-install_data([ +- 'tests/efi/efivars/CapsuleMax-39b68c46-f7fb-441b-b6ec-16b0f69821f3', +- ], +- install_dir: join_paths(installed_test_datadir, 'efi/efivars'), +-) + endif + + endif +--- a/plugins/uefi-dbx/meson.build ++++ b/plugins/uefi-dbx/meson.build +@@ -31,7 +31,6 @@ + plugin_libs, + plugin_builtin_uefi_dbx, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/uf2/meson.build ++++ b/plugins/uf2/meson.build +@@ -18,8 +18,6 @@ + plugin_builtins += plugin_builtin_uf2 + + if get_option('tests') +- install_data(['tests/uf2.builder.xml'], +- install_dir: join_paths(installed_test_datadir, 'tests')) + env = environment() + env.set('G_TEST_SRCDIR', meson.current_source_dir()) + env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +@@ -34,7 +32,6 @@ + plugin_libs, + plugin_builtin_uf2, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/vli/meson.build ++++ b/plugins/vli/meson.build +@@ -48,7 +48,6 @@ + plugin_libs, + plugin_builtin_vli, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/plugins/wacom-usb/meson.build ++++ b/plugins/wacom-usb/meson.build +@@ -23,8 +23,6 @@ + plugin_builtins += plugin_builtin_wac + + if get_option('tests') +- install_data(['tests/wacom-usb.builder.xml'], +- install_dir: join_paths(installed_test_datadir, 'tests')) + env = environment() + env.set('G_TEST_SRCDIR', meson.current_source_dir()) + env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +@@ -39,7 +37,6 @@ + plugin_libs, + plugin_builtin_wac, + ], +- install: true, + install_rpath: libdir_pkg, + install_dir: installed_test_bindir, + c_args: [ +--- a/src/tests/host-emulate/meson.build ++++ b/src/tests/host-emulate/meson.build +@@ -8,7 +8,6 @@ + output: '@0@.gz'.format(input_file), + capture: true, + command: [gzip, '-k', '--stdout', '@INPUT@'], +- install: true, + install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'), + ) + endforeach diff --git a/sys-apps/fwupd/fwupd-1.8.11.ebuild b/sys-apps/fwupd/fwupd-1.8.11.ebuild deleted file mode 100644 index ae2c0c6958c2..000000000000 --- a/sys-apps/fwupd/fwupd-1.8.11.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit meson python-single-r1 vala udev xdg - -DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" -HOMEPAGE="https://fwupd.org" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -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" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ^^ ( elogind minimal systemd ) - dell? ( uefi ) - fastboot? ( gusb ) - logitech? ( gusb ) - minimal? ( !introspection ) - modemmanager? ( gusb ) - spi? ( lzma ) - synaptics? ( gnutls ) - test? ( archive gusb ) - uefi? ( gnutls ) -" -RESTRICT="!test? ( test )" - -BDEPEND="$(vala_depend) - >=dev-util/meson-0.60.0 - virtual/pkgconfig - gtk-doc? ( - $(python_gen_cond_dep ' - >=dev-python/markdown-3.2[${PYTHON_USEDEP}] - ') - >=dev-util/gi-docgen-2021.1 - ) - bash-completion? ( >=app-shells/bash-completion-2.0 ) - introspection? ( dev-libs/gobject-introspection ) - man? ( - app-text/docbook-sgml-utils - sys-apps/help2man - ) - test? ( - dev-util/umockdev - net-libs/gnutls[tools] - ) -" -COMMON_DEPEND="${PYTHON_DEPS} - >=app-arch/gcab-1.0 - app-arch/xz-utils - >=dev-libs/glib-2.58:2 - dev-libs/json-glib - dev-libs/libgudev:= - >=dev-libs/libjcat-0.1.4[gpg,pkcs7] - >=dev-libs/libxmlb-0.1.13:=[introspection?] - $(python_gen_cond_dep ' - dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - ') - net-misc/curl - archive? ( app-arch/libarchive:= ) - cbor? ( dev-libs/libcbor:= ) - dell? ( - >=app-crypt/tpm2-tss-2.0 - >=sys-libs/libsmbios-2.4.0 - ) - elogind? ( >=sys-auth/elogind-211 ) - flashrom? ( >=sys-apps/flashrom-1.2-r3 ) - gnutls? ( net-libs/gnutls ) - gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) - logitech? ( dev-libs/protobuf-c:= ) - lzma? ( app-arch/xz-utils ) - modemmanager? ( net-misc/modemmanager[qmi] ) - policykit? ( >=sys-auth/polkit-0.114 ) - sqlite? ( dev-db/sqlite ) - systemd? ( >=sys-apps/systemd-211 ) - tpm? ( app-crypt/tpm2-tss:= ) - uefi? ( - sys-apps/fwupd-efi - sys-boot/efibootmgr - sys-fs/udisks - sys-libs/efivar - ) -" -RDEPEND=" - ${COMMON_DEPEND} - sys-apps/dbus -" - -DEPEND=" - ${COMMON_DEPEND} - x11-libs/pango[introspection] -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.11-installed_tests.patch -) - -src_prepare() { - default - - vala_setup - - # c.f. https://github.com/fwupd/fwupd/issues/1414 - sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ - -i plugins/thunderbolt/meson.build || die - - sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \ - -i docs/meson.build || die - - python_fix_shebang "${S}"/contrib/*.py -} - -src_configure() { - local plugins=( - -Dplugin_gpio="enabled" - $(meson_feature amt plugin_intel_me) - $(meson_feature dell plugin_dell) - $(meson_feature fastboot plugin_fastboot) - $(meson_feature flashrom plugin_flashrom) - $(meson_feature gusb plugin_uf2) - $(meson_feature logitech plugin_logitech_bulkcontroller) - $(meson_feature modemmanager plugin_modem_manager) - $(meson_feature nvme plugin_nvme) - $(meson_use spi plugin_intel_spi) - $(meson_feature synaptics plugin_synaptics_mst) - $(meson_feature synaptics plugin_synaptics_rmi) - $(meson_feature tpm plugin_tpm) - $(meson_feature uefi plugin_uefi_capsule) - $(meson_use uefi plugin_uefi_capsule_splash) - $(meson_feature uefi plugin_uefi_pk) - ) - if use ppc64 || use riscv ; then - plugins+=( -Dplugin_msr="disabled" ) - fi - - local emesonargs=( - --localstatedir "${EPREFIX}"/var - -Dbuild="$(usex minimal standalone all)" - -Dconsolekit="disabled" - -Dcurl="enabled" - -Defi_binary="false" - -Dsupported_build="enabled" - -Dudevdir="${EPREFIX}$(get_udevdir)" - $(meson_feature archive libarchive) - $(meson_use bash-completion bash_completion) - $(meson_feature bluetooth bluez) - $(meson_feature cbor) - $(meson_feature elogind) - $(meson_feature gnutls) - $(meson_feature gtk-doc docs) - $(meson_feature gusb) - $(meson_feature lzma) - $(meson_use man) - $(meson_feature introspection) - $(meson_feature policykit polkit) - $(meson_feature sqlite) - $(meson_feature systemd) - $(meson_use test tests) - - ${plugins[@]} - ) - use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) - export CACHE_DIRECTORY="${T}" - meson_src_configure -} - -src_test() { - LC_ALL="C" meson_src_test -} - -src_install() { - meson_src_install - - if ! use minimal ; then - newinitd "${FILESDIR}"/${PN}-r2 ${PN} - - if ! use systemd ; then - # Don't timeout when fwupd is running (#673140) - sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ - -i "${ED}"/etc/${PN}/daemon.conf || die - fi - fi -} - -pkg_postinst() { - xdg_pkg_postinst - use minimal || udev_reload -} - -pkg_postrm() { - xdg_pkg_postrm - use minimal || udev_reload -} diff --git a/sys-apps/fwupd/fwupd-1.8.13.ebuild b/sys-apps/fwupd/fwupd-1.8.13.ebuild new file mode 100644 index 000000000000..0689a45a9731 --- /dev/null +++ b/sys-apps/fwupd/fwupd-1.8.13.ebuild @@ -0,0 +1,193 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit meson python-single-r1 vala udev xdg + +DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" +HOMEPAGE="https://fwupd.org" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="amt +archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ^^ ( elogind minimal systemd ) + dell? ( uefi ) + fastboot? ( gusb ) + logitech? ( gusb ) + minimal? ( !introspection ) + modemmanager? ( gusb ) + spi? ( lzma ) + synaptics? ( gnutls ) + test? ( archive gusb ) + uefi? ( gnutls ) +" +RESTRICT="!test? ( test )" + +BDEPEND="$(vala_depend) + >=dev-util/meson-0.60.0 + virtual/pkgconfig + gtk-doc? ( + $(python_gen_cond_dep ' + >=dev-python/markdown-3.2[${PYTHON_USEDEP}] + ') + >=dev-util/gi-docgen-2021.1 + ) + bash-completion? ( >=app-shells/bash-completion-2.0 ) + introspection? ( dev-libs/gobject-introspection ) + test? ( + dev-util/umockdev + net-libs/gnutls[tools] + ) +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-arch/gcab-1.0 + app-arch/xz-utils + >=dev-libs/glib-2.58:2 + dev-libs/json-glib + dev-libs/libgudev:= + >=dev-libs/libjcat-0.1.4[gpg,pkcs7] + >=dev-libs/libxmlb-0.1.13:=[introspection?] + $(python_gen_cond_dep ' + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + ') + net-misc/curl + archive? ( app-arch/libarchive:= ) + cbor? ( dev-libs/libcbor:= ) + dell? ( + >=app-crypt/tpm2-tss-2.0 + >=sys-libs/libsmbios-2.4.0 + ) + elogind? ( >=sys-auth/elogind-211 ) + flashrom? ( >=sys-apps/flashrom-1.2-r3 ) + gnutls? ( net-libs/gnutls ) + gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) + logitech? ( dev-libs/protobuf-c:= ) + lzma? ( app-arch/xz-utils ) + modemmanager? ( net-misc/modemmanager[qmi] ) + policykit? ( >=sys-auth/polkit-0.114 ) + sqlite? ( dev-db/sqlite ) + systemd? ( >=sys-apps/systemd-211 ) + tpm? ( app-crypt/tpm2-tss:= ) + uefi? ( + sys-apps/fwupd-efi + sys-boot/efibootmgr + sys-fs/udisks + sys-libs/efivar + ) +" +RDEPEND=" + ${COMMON_DEPEND} + sys-apps/dbus +" + +DEPEND=" + ${COMMON_DEPEND} + x11-libs/pango[introspection] +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.13-installed_tests.patch +) + +src_prepare() { + default + + vala_setup + + # c.f. https://github.com/fwupd/fwupd/issues/1414 + sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ + -i plugins/thunderbolt/meson.build || die + + sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \ + -i docs/meson.build || die + + python_fix_shebang "${S}"/contrib/*.py +} + +src_configure() { + local plugins=( + -Dplugin_gpio="enabled" + $(meson_feature amt plugin_intel_me) + $(meson_feature dell plugin_dell) + $(meson_feature fastboot plugin_fastboot) + $(meson_feature flashrom plugin_flashrom) + $(meson_feature gusb plugin_uf2) + $(meson_feature logitech plugin_logitech_bulkcontroller) + $(meson_feature modemmanager plugin_modem_manager) + $(meson_feature nvme plugin_nvme) + $(meson_use spi plugin_intel_spi) + $(meson_feature synaptics plugin_synaptics_mst) + $(meson_feature synaptics plugin_synaptics_rmi) + $(meson_feature tpm plugin_tpm) + $(meson_feature uefi plugin_uefi_capsule) + $(meson_use uefi plugin_uefi_capsule_splash) + $(meson_feature uefi plugin_uefi_pk) + ) + if use ppc64 || use riscv ; then + plugins+=( -Dplugin_msr="disabled" ) + fi + + local emesonargs=( + --localstatedir "${EPREFIX}"/var + -Dbuild="$(usex minimal standalone all)" + -Dconsolekit="disabled" + -Dcurl="enabled" + -Defi_binary="false" + -Dman="true" + -Dsupported_build="enabled" + -Dudevdir="${EPREFIX}$(get_udevdir)" + $(meson_feature archive libarchive) + $(meson_use bash-completion bash_completion) + $(meson_feature bluetooth bluez) + $(meson_feature cbor) + $(meson_feature elogind) + $(meson_feature gnutls) + $(meson_feature gtk-doc docs) + $(meson_feature gusb) + $(meson_feature lzma) + $(meson_feature introspection) + $(meson_feature policykit polkit) + $(meson_feature sqlite) + $(meson_feature systemd) + $(meson_use test tests) + + ${plugins[@]} + ) + use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) + export CACHE_DIRECTORY="${T}" + meson_src_configure +} + +src_test() { + LC_ALL="C" meson_src_test +} + +src_install() { + meson_src_install + + if ! use minimal ; then + newinitd "${FILESDIR}"/${PN}-r2 ${PN} + + if ! use systemd ; then + # Don't timeout when fwupd is running (#673140) + sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ + -i "${ED}"/etc/${PN}/daemon.conf || die + fi + fi +} + +pkg_postinst() { + xdg_pkg_postinst + use minimal || udev_reload +} + +pkg_postrm() { + xdg_pkg_postrm + use minimal || udev_reload +} -- cgit v1.2.3