* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/
@ 2019-11-08 2:44 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2019-11-08 2:44 UTC (permalink / raw
To: gentoo-commits
commit: 79474f2a7bdf14df4f44d9936856173202034f82
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Oct 20 07:40:28 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 8 02:42:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79474f2a
sys-apps/fwupd: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13356
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../fwupd-1.2.9-without_systemd_build_fix.patch | 77 ----------------------
1 file changed, 77 deletions(-)
diff --git a/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch b/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch
deleted file mode 100644
index 37be190d8aa..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From d92cccaf1396d93f97480f32694372b8256f9b11 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 20 May 2019 11:28:31 +0100
-Subject: [PATCH] trivial: Fix non-systemd build
-
----
- src/fu-tool.c | 2 ++
- src/fu-util-common.c | 5 ++++-
- src/fu-util.c | 6 +++++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/src/fu-tool.c b/src/fu-tool.c
-index 353a52e88..eac7a8cc4 100644
---- a/src/fu-tool.c
-+++ b/src/fu-tool.c
-@@ -113,8 +113,10 @@ fu_util_start_engine (FuUtilPrivate *priv, FuEngineLoadFlags flags, GError **err
- {
- g_autoptr(GError) error_local = NULL;
-
-+#ifdef HAVE_SYSTEMD
- if (!fu_systemd_unit_stop (fu_util_get_systemd_unit (), &error_local))
- g_debug ("Failed top stop daemon: %s", error_local->message);
-+#endif
- if (!fu_engine_load (priv->engine, flags, error))
- return FALSE;
- if (fu_engine_get_tainted (priv->engine)) {
-diff --git a/src/fu-util-common.c b/src/fu-util-common.c
-index 219752b1e..51e16f671 100644
---- a/src/fu-util-common.c
-+++ b/src/fu-util-common.c
-@@ -28,6 +28,7 @@ fu_util_get_systemd_unit (void)
- return SYSTEMD_FWUPD_UNIT;
- }
-
-+#ifdef HAVE_SYSTEMD
- static const gchar *
- fu_util_get_expected_command (const gchar *target)
- {
-@@ -35,10 +36,12 @@ fu_util_get_expected_command (const gchar *target)
- return "fwupd.fwupdmgr";
- return "fwupdmgr";
- }
-+#endif
-
- gboolean
- fu_util_using_correct_daemon (GError **error)
- {
-+#ifdef HAVE_SYSTEMD
- g_autofree gchar *default_target = NULL;
- g_autoptr(GError) error_local = NULL;
- const gchar *target = fu_util_get_systemd_unit ();
-@@ -58,7 +61,7 @@ fu_util_using_correct_daemon (GError **error)
- fu_util_get_expected_command (target));
- return FALSE;
- }
--
-+#endif
- return TRUE;
- }
-
-diff --git a/src/fu-util.c b/src/fu-util.c
-index c8528e71e..dec96e741 100644
---- a/src/fu-util.c
-+++ b/src/fu-util.c
-@@ -2122,7 +2122,11 @@ fu_util_modify_config (FuUtilPrivate *priv, gchar **values, GError **error)
- if (!fu_util_prompt_for_boolean (FALSE))
- return TRUE;
- }
-- return fu_systemd_unit_stop (fu_util_get_systemd_unit (), error);
-+#ifdef HAVE_SYSTEMD
-+ if (!fu_systemd_unit_stop (fu_util_get_systemd_unit (), error))
-+ return FALSE;
-+#endif
-+ return TRUE;
- }
-
- static void
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/
@ 2021-08-29 22:42 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2021-08-29 22:42 UTC (permalink / raw
To: gentoo-commits
commit: 1700e47376ab05fcfadebbda8a7358e5221c201a
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Aug 28 19:27:43 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Aug 29 22:40:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1700e473
sys-apps/fwupd: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/22146
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/fwupd-1.6.1-fix-python-detection.patch | 51 ----------------------
1 file changed, 51 deletions(-)
diff --git a/sys-apps/fwupd/files/fwupd-1.6.1-fix-python-detection.patch b/sys-apps/fwupd/files/fwupd-1.6.1-fix-python-detection.patch
deleted file mode 100644
index b5da660e643..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.6.1-fix-python-detection.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 1a53fc57e8b5cd2de571ad5f1119c90ac8082f7a Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <superm1@gmail.com>
-Date: Tue, 15 Jun 2021 08:10:06 -0500
-Subject: [PATCH 1/2] Revert "meson.build: Change python version check order"
-
-This reverts commit 1b396215d9396680b1b6b5c14c6f57f2226ff0a9.
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 1f89e6070..0ae12a1a7 100644
---- a/meson.build
-+++ b/meson.build
-@@ -252,7 +252,7 @@ libm = cc.find_library('m', required: false)
- libgcab = dependency('libgcab-1.0', version : '>= 1.0', fallback : ['gcab', 'gcab_dep'])
- gcab = find_program('gcab', required : get_option('tests'))
- bashcomp = dependency('bash-completion', required: false)
--python3 = find_program('python3.8', 'python3', 'python3.9')
-+python3 = find_program('python3')
-
- if get_option('gnutls')
- gnutls = dependency('gnutls', version : '>= 3.6.0')
-
-From f4ef486da80a3b5916f8a58f10a70f30cf05f756 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <superm1@gmail.com>
-Date: Tue, 15 Jun 2021 08:13:17 -0500
-Subject: [PATCH 2/2] trivial: fix a regression in Gentoo detecting python
- versions
-
----
- meson.build | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 0ae12a1a7..6e09ac69b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -252,7 +252,11 @@ libm = cc.find_library('m', required: false)
- libgcab = dependency('libgcab-1.0', version : '>= 1.0', fallback : ['gcab', 'gcab_dep'])
- gcab = find_program('gcab', required : get_option('tests'))
- bashcomp = dependency('bash-completion', required: false)
--python3 = find_program('python3')
-+if host_machine.system() != 'freebsd'
-+ python3 = find_program('python3')
-+else
-+ python3 = find_program('python3.8', 'python3', 'python3.9')
-+endif
-
- if get_option('gnutls')
- gnutls = dependency('gnutls', version : '>= 3.6.0')
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/
@ 2023-10-27 7:11 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2023-10-27 7:11 UTC (permalink / raw
To: gentoo-commits
commit: cb323cd4f3ff55b1d9c0a7ba555ef0b141c8b875
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Oct 27 05:23:48 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 07:10:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb323cd4
sys-apps/fwupd: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33535
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
.../fwupd/files/fwupd-1.8.13-installed_tests.patch | 406 ---------------------
.../fwupd/files/fwupd-1.9.4-fragile_tests.patch | 24 --
.../fwupd/files/fwupd-1.9.5-parallel_build.patch | 16 -
3 files changed, 446 deletions(-)
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
deleted file mode 100644
index f97343be5224..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch
+++ /dev/null
@@ -1,406 +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/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/files/fwupd-1.9.4-fragile_tests.patch b/sys-apps/fwupd/files/fwupd-1.9.4-fragile_tests.patch
deleted file mode 100644
index 95105177499b..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.9.4-fragile_tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-umockdev-based tests appear not to play nicely with the sandbox,
-often they work but on some systems they persistently fail.
-
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -60,6 +60,7 @@
- option('systemd_root_prefix', type: 'string', value: '', description: 'Directory to base systemd’s installation directories on')
- option('elogind', type : 'feature', description : 'elogind support', deprecated: {'true': 'enabled', 'false': 'disabled'})
- option('tests', type : 'boolean', value : true, description : 'enable tests')
-+option('test-full', type : 'boolean', value : false, description : 'enable tests known to be fragile when called from Gentoo ebuilds')
- option('curl', type : 'feature', description : 'libcurl support', deprecated: {'true': 'enabled', 'false': 'disabled'})
- option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
- option('efi_os_dir', type: 'string', description : 'the hardcoded name of OS directory in ESP, e.g. fedora')
---- a/plugins/thunderbolt/meson.build
-+++ b/plugins/thunderbolt/meson.build
-@@ -19,7 +19,7 @@
- plugin_builtins += plugin_builtin_thunderbolt
-
- # we use functions from 2.52 in the tests
--if get_option('tests') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52')
-+if get_option('tests') and get_option('test-full') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52')
- env = environment()
- env.set('G_TEST_SRCDIR', meson.current_source_dir())
- env.set('G_TEST_BUILDDIR', meson.current_build_dir())
diff --git a/sys-apps/fwupd/files/fwupd-1.9.5-parallel_build.patch b/sys-apps/fwupd/files/fwupd-1.9.5-parallel_build.patch
deleted file mode 100644
index fb9d3562841e..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.9.5-parallel_build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From 085a89ce3f7734fd9bc0527df7f0bb05e27fbaef Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Tue, 12 Sep 2023 07:42:23 +0100
-Subject: [PATCH] trivial: Fix parallel build, harder still
-
-Fixes https://github.com/fwupd/fwupd/issues/6175
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -17,6 +17,7 @@ engine_dep = [
- polkit,
- sqlite,
- cbor,
-+ fwupdplugin_rs_dep,
- ]
-
- if get_option('passim').allowed()
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-27 7:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-29 22:42 [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2023-10-27 7:11 Florian Schmaus
2019-11-08 2:44 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox