summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szuba <marecki@gentoo.org>2023-02-24 11:26:22 +0000
committerMarek Szuba <marecki@gentoo.org>2023-02-24 16:49:55 +0000
commit25b65577898fd06aec1b0c1963c02f6823a47c8d (patch)
tree773c14cb4d0865494a1e9501dfd6abf7f01c39db /sys-apps/fwupd/files
parentdev-libs/libjcat: add 0.1.13 (diff)
downloadgentoo-25b65577898fd06aec1b0c1963c02f6823a47c8d.tar.gz
gentoo-25b65577898fd06aec1b0c1963c02f6823a47c8d.tar.bz2
gentoo-25b65577898fd06aec1b0c1963c02f6823a47c8d.zip
sys-apps/fwupd: drop 1.8.5, 1.8.7, 1.8.8-r1
Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'sys-apps/fwupd/files')
-rw-r--r--sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch215
-rw-r--r--sys-apps/fwupd/files/fwupd-1.8.6-installed_tests.patch357
2 files changed, 0 insertions, 572 deletions
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
deleted file mode 100644
index 1cb3b41cb728..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch
+++ /dev/null
@@ -1,215 +0,0 @@
---- 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
diff --git a/sys-apps/fwupd/files/fwupd-1.8.6-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.6-installed_tests.patch
deleted file mode 100644
index d82a326e0d08..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.6-installed_tests.patch
+++ /dev/null
@@ -1,357 +0,0 @@
---- 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