fwupd-1.8.12 added

This commit is contained in:
Николай Шашкин 2023-02-25 00:55:23 +03:00
parent b7bbd3073c
commit d8b009a812
6 changed files with 1163 additions and 0 deletions

1
sys-apps/fwupd/Manifest Normal file
View File

@ -0,0 +1 @@
DIST fwupd-1.8.12.tar.xz 3390000 SHA256 6b70e7e815ad661726da20c1c3737949f286e7a5a4fdbccb5330b85227da801b SHA512 1e0b9641b078de14796e2ee761e29dc6abd3669242bc64b5f9810c475d8eb7b87965d0216ddbf54ec72c383ae5943b9ffa69294bd9c7f4cf43daa1a1737d3f64 WHIRLPOOL 645c08204ab15355a2607f187f03199571b8488187fba38ae5dce2231ccd4b14b06e4fac2963eb4523c0cd7462a89e0e0838a0f4c8a357b8c2200bb4b2888aff

View File

@ -0,0 +1,379 @@
--- 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/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,
)
--- 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,
)
--- 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,
)
--- 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,
)
--- 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,
)
--- 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,
)
--- a/plugins/ccgx/meson.build
+++ b/plugins/ccgx/meson.build
@@ -28,8 +28,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())
@@ -44,7 +42,6 @@
plugin_libs,
plugin_builtin_ccgx,
],
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- 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,
)
--- 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,
)
--- 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,
)
--- a/plugins/mtd/meson.build
+++ b/plugins/mtd/meson.build
@@ -30,7 +30,6 @@
plugin_libs,
plugin_builtin_mtd,
],
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- 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,
)
--- 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,
)
--- 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,
)
--- 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())
@@ -70,7 +60,6 @@
fwupdplugin,
plugin_builtin_redfish,
],
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- 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())
@@ -47,7 +45,6 @@
c_args: [
cargs,
],
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- 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())
@@ -35,7 +33,6 @@
plugin_builtin_synaprom,
],
c_args: cargs,
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- 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,
)
--- a/plugins/uefi-capsule/meson.build
+++ b/plugins/uefi-capsule/meson.build
@@ -145,25 +145,6 @@
c_args: cargs
)
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
@@ -32,7 +32,6 @@
plugin_builtin_uefi_dbx,
],
c_args: cargs,
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- 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,
)
--- a/plugins/vli/meson.build
+++ b/plugins/vli/meson.build
@@ -49,7 +49,6 @@
plugin_builtin_vli,
],
c_args: cargs,
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- 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())
@@ -40,7 +38,6 @@
plugin_builtin_wac,
],
c_args: cargs,
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- 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

View File

@ -0,0 +1,215 @@
--- 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/plugins/acpi-dmar/meson.build
+++ b/plugins/acpi-dmar/meson.build
@@ -47,7 +47,6 @@
fwupd,
fwupdplugin,
],
- install: true,
install_dir: installed_test_bindir,
)
test('acpi-dmar-self-test', e, env: env) # added to installed-tests
--- a/plugins/acpi-facp/meson.build
+++ b/plugins/acpi-facp/meson.build
@@ -47,7 +47,6 @@
fwupd,
fwupdplugin,
],
- install: true,
install_dir: installed_test_bindir,
)
test('acpi-facp-self-test', e, env: env) # added to installed-tests
--- a/plugins/acpi-ivrs/meson.build
+++ b/plugins/acpi-ivrs/meson.build
@@ -47,7 +47,6 @@
fwupd,
fwupdplugin,
],
- install: true,
install_dir: installed_test_bindir,
)
test('acpi-ivrs-self-test', e, env: env) # added to installed-tests
--- a/plugins/acpi-phat/meson.build
+++ b/plugins/acpi-phat/meson.build
@@ -53,7 +53,6 @@
fwupd,
fwupdplugin,
],
- install: true,
install_dir: installed_test_bindir,
)
test('acpi-phat-self-test', e, env: env) # added to installed-tests
--- a/plugins/ata/meson.build
+++ b/plugins/ata/meson.build
@@ -53,7 +53,6 @@
fwupd,
fwupdplugin,
],
- install: true,
install_dir: installed_test_bindir,
)
test('ata-self-test', e, env: env) # added to installed-tests
--- a/plugins/bcm57xx/meson.build
+++ b/plugins/bcm57xx/meson.build
@@ -35,8 +35,6 @@
)
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())
@@ -63,7 +61,6 @@
fwupd,
fwupdplugin,
],
- install: true,
install_dir: installed_test_bindir,
)
test('bcm57xx-self-test', e, env: env)
--- a/plugins/ccgx/meson.build
+++ b/plugins/ccgx/meson.build
@@ -37,8 +37,6 @@
endif
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())
@@ -64,7 +62,6 @@
fwupd,
fwupdplugin,
],
- install: true,
install_dir: installed_test_bindir,
)
test('ccgx-self-test', e, env: env)
--- a/plugins/elantp/meson.build
+++ b/plugins/elantp/meson.build
@@ -33,8 +33,6 @@
endif
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())
@@ -57,7 +55,6 @@
fwupd,
fwupdplugin,
],
- install: true,
install_dir: installed_test_bindir,
)
test('elantp-self-test', e, env: env)
--- a/plugins/linux-swap/meson.build
+++ b/plugins/linux-swap/meson.build
@@ -44,7 +44,6 @@
fwupd,
fwupdplugin,
],
- install: true,
install_dir: installed_test_bindir,
)
test('linux-swap-self-test', e) # added to installed-tests
--- a/plugins/mtd/meson.build
+++ b/plugins/mtd/meson.build
@@ -46,7 +46,6 @@
fwupd,
fwupdplugin,
],
- install: true,
install_dir: installed_test_bindir,
)
test('mtd-self-test', e) # added to installed-tests
--- a/plugins/nitrokey/meson.build
+++ b/plugins/nitrokey/meson.build
@@ -47,7 +47,6 @@
link_with: [
fwupdplugin,
],
- install: true,
install_dir: installed_test_bindir,
)
test('nitrokey-self-test', e) # added to installed-tests
--- a/plugins/pixart-rf/meson.build
+++ b/plugins/pixart-rf/meson.build
@@ -31,8 +31,6 @@
)
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())
@@ -55,7 +53,6 @@
fwupd,
fwupdplugin,
],
- install: true,
install_dir: installed_test_bindir,
)
test('pxi-self-test', e, env: env)
--- a/plugins/redfish/meson.build
+++ b/plugins/redfish/meson.build
@@ -47,14 +47,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_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())
@@ -89,7 +81,6 @@
fwupd,
fwupdplugin,
],
- install: true,
install_dir: installed_test_bindir,
)
test('redfish-self-test', e, env: env) # added to installed-tests
--- a/src/tests/host-emulate/meson.build
+++ b/src/tests/host-emulate/meson.build
@@ -8,7 +8,7 @@
output: '@0@.gz'.format(input_file),
capture: true,
command: [gzip, '-k', '--stdout', '@INPUT@'],
- install: true,
+ install: false,
install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'),
)
endforeach

View File

@ -0,0 +1,357 @@
--- 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/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,
)
--- 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,
)
--- 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,
)
--- 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,
)
--- 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,
)
--- 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,
)
--- a/plugins/ccgx/meson.build
+++ b/plugins/ccgx/meson.build
@@ -28,8 +28,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())
@@ -44,7 +42,6 @@
plugin_libs,
plugin_builtin_ccgx,
],
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- 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,
)
--- a/plugins/elantp/meson.build
+++ b/plugins/elantp/meson.build
@@ -20,8 +20,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())
@@ -36,7 +34,6 @@
plugin_libs,
plugin_builtin_elantp,
],
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- a/plugins/linux-swap/meson.build
+++ b/plugins/linux-swap/meson.build
@@ -25,7 +25,6 @@
plugin_libs,
plugin_builtin_linux_swap,
],
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- a/plugins/mtd/meson.build
+++ b/plugins/mtd/meson.build
@@ -27,7 +27,6 @@
plugin_libs,
plugin_builtin_mtd,
],
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- a/plugins/nitrokey/meson.build
+++ b/plugins/nitrokey/meson.build
@@ -30,7 +30,6 @@
plugin_libs,
plugin_builtin_nitrokey,
],
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- 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,
)
--- a/plugins/redfish/meson.build
+++ b/plugins/redfish/meson.build
@@ -40,14 +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_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())
@@ -68,7 +60,6 @@
fwupdplugin,
plugin_builtin_redfish,
],
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- 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())
@@ -47,7 +45,6 @@
c_args: [
cargs,
],
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- 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())
@@ -35,7 +33,6 @@
plugin_builtin_synaprom,
],
c_args: cargs,
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- 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,
)
--- a/plugins/uefi-capsule/meson.build
+++ b/plugins/uefi-capsule/meson.build
@@ -144,25 +144,6 @@
c_args: cargs
)
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/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,
)
--- a/plugins/vli/meson.build
+++ b/plugins/vli/meson.build
@@ -46,7 +46,6 @@
plugin_builtin_vli,
],
c_args: cargs,
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- a/plugins/wacom-usb/meson.build
+++ b/plugins/wacom-usb/meson.build
@@ -22,8 +22,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_builtin_wac,
],
c_args: cargs,
- install: true,
install_rpath: libdir_pkg,
install_dir: installed_test_bindir,
)
--- 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

View File

@ -0,0 +1,13 @@
#!/sbin/openrc-run
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
description="Firmware update daemon"
pidfile="/var/run/fwupd.pid"
command="/usr/libexec/fwupd/fwupd"
command_background="true"
depend() {
need elogind dbus
before display-manager
}

View File

@ -0,0 +1,198 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
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]
)
app-text/pandoc-bin
"
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.10-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
}