nixpkgs/pkgs/by-name/fw/fwupd/installed-tests-path.patch

diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build
index dfce86b1c..5e34c4fa6 100644
--- a/data/installed-tests/meson.build
+++ b/data/installed-tests/meson.build
@@ -86,5 +86,5 @@ configure_file(
   output: 'fwupd-tests.conf',
   configuration: con2,
   install: true,
-  install_dir: join_paths(datadir, 'fwupd', 'remotes.d'),
+  install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
 )
diff --git a/meson.build b/meson.build
index ca6ccdf92..36b1b47b0 100644
--- a/meson.build
+++ b/meson.build
@@ -188,8 +188,8 @@ else
   datadir = join_paths(prefix, get_option('datadir'))
   sysconfdir = join_paths(prefix, get_option('sysconfdir'))
   localstatedir = join_paths(prefix, get_option('localstatedir'))
-  installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name())
-  installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name())
+  installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
+  installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
   daemon_dir = join_paths(libexecdir, 'fwupd')
 endif
 mandir = join_paths(prefix, get_option('mandir'))
@@ -497,6 +497,7 @@ gnome = import('gnome')
 i18n = import('i18n')
 
 conf.set_quoted('FWUPD_PREFIX', prefix)
+conf.set_quoted('FWUPD_INSTALLED_TEST_PREFIX', get_option('installed_test_prefix'))
 conf.set_quoted('FWUPD_BINDIR', bindir)
 conf.set_quoted('FWUPD_LIBDIR', libdir)
 conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir)
diff --git a/meson_options.txt b/meson_options.txt
index 877891126..bfc5d1afd 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -452,6 +452,10 @@ option('elogind',
     'false': 'disabled',
   },
 )
+option('installed_test_prefix',
+  type: 'string',
+  description: 'Prefix for installed tests'
+)
 option('tests',
   type: 'boolean',
   value: true,
fwupd: 1.4.6 → 1.5.1 * https://github.com/fwupd/fwupd/releases/tag/1.5.0 * https://github.com/fwupd/fwupd/releases/tag/1.5.1 * The changelog mentions removed dependency on efivar but we still need the package because it also contains efiboot required dependency. https://github.com/fwupd/fwupd/pull/2485 * Blacklist options were renamed. * Test firmware was moved to a separate repo. We need to install it or some tests will be skipped. https://github.com/fwupd/fwupd/pull/2330 * Initially, there was an option to configure dbx but in the end, it was removed in favour of bespoke dbxtool. https://github.com/fwupd/fwupd/pull/2061, https://github.com/fwupd/fwupd/pull/2318, https://github.com/fwupd/fwupd/pull/2329 * Fwupd now checks hashes of plug-ins and will complain loudly that it is tainted when “invalid” plug-in is loaded (during testing). * Installed tests complain about not being able to access cdn, even though we are not setting CI_NETWORK env var. We need a patch to fix that. 2020-10-27 06:29:44 +00:00			`diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build`
fwupd: 1.9.5 -> 1.9.6 Changelog: https://github.com/fwupd/fwupd/releases/tag/1.9.6 2023-10-06 12:52:59 +00:00			`index dfce86b1c..5e34c4fa6 100644`
fwupd: fix installed tests 2019-01-27 23:15:00 +00:00			`--- a/data/installed-tests/meson.build`
			`+++ b/data/installed-tests/meson.build`
fwupd: 1.9.5 -> 1.9.6 Changelog: https://github.com/fwupd/fwupd/releases/tag/1.9.6 2023-10-06 12:52:59 +00:00			`@@ -86,5 +86,5 @@ configure_file(`
fwupd: 1.8.4 -> 1.8.9 2023-01-22 02:16:58 +00:00			`output: 'fwupd-tests.conf',`
			`configuration: con2,`
fwupd: fix installed tests 2019-01-27 23:15:00 +00:00			`install: true,`
fwupd: 1.9.12 -> 1.9.13 Changelog: https://github.com/fwupd/fwupd/releases/tag/1.9.13 2024-02-09 11:38:29 +00:00			`- install_dir: join_paths(datadir, 'fwupd', 'remotes.d'),`
fwupd: 1.3.9 → 1.4.0 https://github.com/fwupd/fwupd/releases/tag/1.4.0 2020-04-15 19:22:43 +00:00			`+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),`
fwupd: fix installed tests 2019-01-27 23:15:00 +00:00			`)`
fwupd: 1.4.6 → 1.5.1 * https://github.com/fwupd/fwupd/releases/tag/1.5.0 * https://github.com/fwupd/fwupd/releases/tag/1.5.1 * The changelog mentions removed dependency on efivar but we still need the package because it also contains efiboot required dependency. https://github.com/fwupd/fwupd/pull/2485 * Blacklist options were renamed. * Test firmware was moved to a separate repo. We need to install it or some tests will be skipped. https://github.com/fwupd/fwupd/pull/2330 * Initially, there was an option to configure dbx but in the end, it was removed in favour of bespoke dbxtool. https://github.com/fwupd/fwupd/pull/2061, https://github.com/fwupd/fwupd/pull/2318, https://github.com/fwupd/fwupd/pull/2329 * Fwupd now checks hashes of plug-ins and will complain loudly that it is tainted when “invalid” plug-in is loaded (during testing). * Installed tests complain about not being able to access cdn, even though we are not setting CI_NETWORK env var. We need a patch to fix that. 2020-10-27 06:29:44 +00:00			`diff --git a/meson.build b/meson.build`
fwupd: 1.9.5 -> 1.9.6 Changelog: https://github.com/fwupd/fwupd/releases/tag/1.9.6 2023-10-06 12:52:59 +00:00			`index ca6ccdf92..36b1b47b0 100644`
fwupd: 1.4.6 → 1.5.1 * https://github.com/fwupd/fwupd/releases/tag/1.5.0 * https://github.com/fwupd/fwupd/releases/tag/1.5.1 * The changelog mentions removed dependency on efivar but we still need the package because it also contains efiboot required dependency. https://github.com/fwupd/fwupd/pull/2485 * Blacklist options were renamed. * Test firmware was moved to a separate repo. We need to install it or some tests will be skipped. https://github.com/fwupd/fwupd/pull/2330 * Initially, there was an option to configure dbx but in the end, it was removed in favour of bespoke dbxtool. https://github.com/fwupd/fwupd/pull/2061, https://github.com/fwupd/fwupd/pull/2318, https://github.com/fwupd/fwupd/pull/2329 * Fwupd now checks hashes of plug-ins and will complain loudly that it is tainted when “invalid” plug-in is loaded (during testing). * Installed tests complain about not being able to access cdn, even though we are not setting CI_NETWORK env var. We need a patch to fix that. 2020-10-27 06:29:44 +00:00			`--- a/meson.build`
			`+++ b/meson.build`
fwupd: 1.9.5 -> 1.9.6 Changelog: https://github.com/fwupd/fwupd/releases/tag/1.9.6 2023-10-06 12:52:59 +00:00			`@@ -188,8 +188,8 @@ else`
fwupd: 1.4.6 → 1.5.1 * https://github.com/fwupd/fwupd/releases/tag/1.5.0 * https://github.com/fwupd/fwupd/releases/tag/1.5.1 * The changelog mentions removed dependency on efivar but we still need the package because it also contains efiboot required dependency. https://github.com/fwupd/fwupd/pull/2485 * Blacklist options were renamed. * Test firmware was moved to a separate repo. We need to install it or some tests will be skipped. https://github.com/fwupd/fwupd/pull/2330 * Initially, there was an option to configure dbx but in the end, it was removed in favour of bespoke dbxtool. https://github.com/fwupd/fwupd/pull/2061, https://github.com/fwupd/fwupd/pull/2318, https://github.com/fwupd/fwupd/pull/2329 * Fwupd now checks hashes of plug-ins and will complain loudly that it is tainted when “invalid” plug-in is loaded (during testing). * Installed tests complain about not being able to access cdn, even though we are not setting CI_NETWORK env var. We need a patch to fix that. 2020-10-27 06:29:44 +00:00			`datadir = join_paths(prefix, get_option('datadir'))`
			`sysconfdir = join_paths(prefix, get_option('sysconfdir'))`
			`localstatedir = join_paths(prefix, get_option('localstatedir'))`
			`- installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name())`
			`- installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name())`
			`+ installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())`
			`+ installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())`
fwupd: 1.8.0 -> 1.8.1 - https://github.com/fwupd/fwupd/releases/tag/1.8.1 2022-06-07 14:44:49 +00:00			`daemon_dir = join_paths(libexecdir, 'fwupd')`
fwupd: 1.4.6 → 1.5.1 * https://github.com/fwupd/fwupd/releases/tag/1.5.0 * https://github.com/fwupd/fwupd/releases/tag/1.5.1 * The changelog mentions removed dependency on efivar but we still need the package because it also contains efiboot required dependency. https://github.com/fwupd/fwupd/pull/2485 * Blacklist options were renamed. * Test firmware was moved to a separate repo. We need to install it or some tests will be skipped. https://github.com/fwupd/fwupd/pull/2330 * Initially, there was an option to configure dbx but in the end, it was removed in favour of bespoke dbxtool. https://github.com/fwupd/fwupd/pull/2061, https://github.com/fwupd/fwupd/pull/2318, https://github.com/fwupd/fwupd/pull/2329 * Fwupd now checks hashes of plug-ins and will complain loudly that it is tainted when “invalid” plug-in is loaded (during testing). * Installed tests complain about not being able to access cdn, even though we are not setting CI_NETWORK env var. We need a patch to fix that. 2020-10-27 06:29:44 +00:00			`endif`
			`mandir = join_paths(prefix, get_option('mandir'))`
fwupd: 1.9.5 -> 1.9.6 Changelog: https://github.com/fwupd/fwupd/releases/tag/1.9.6 2023-10-06 12:52:59 +00:00			`@@ -497,6 +497,7 @@ gnome = import('gnome')`
fwupd: use upstream install detection patch https://github.com/fwupd/fwupd/commit/5bc546221331feae9cedc1892219a25d8837955f attempts to fix the need to patch the redfish test ourselves. But it is actually not sufficient since we install the installed tests into a separate prefix, so we need to adjust the installed tests patch. 2022-03-08 16:39:30 +00:00			`i18n = import('i18n')`

			`conf.set_quoted('FWUPD_PREFIX', prefix)`
			`+conf.set_quoted('FWUPD_INSTALLED_TEST_PREFIX', get_option('installed_test_prefix'))`
			`conf.set_quoted('FWUPD_BINDIR', bindir)`
			`conf.set_quoted('FWUPD_LIBDIR', libdir)`
			`conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir)`
fwupd: 1.4.6 → 1.5.1 * https://github.com/fwupd/fwupd/releases/tag/1.5.0 * https://github.com/fwupd/fwupd/releases/tag/1.5.1 * The changelog mentions removed dependency on efivar but we still need the package because it also contains efiboot required dependency. https://github.com/fwupd/fwupd/pull/2485 * Blacklist options were renamed. * Test firmware was moved to a separate repo. We need to install it or some tests will be skipped. https://github.com/fwupd/fwupd/pull/2330 * Initially, there was an option to configure dbx but in the end, it was removed in favour of bespoke dbxtool. https://github.com/fwupd/fwupd/pull/2061, https://github.com/fwupd/fwupd/pull/2318, https://github.com/fwupd/fwupd/pull/2329 * Fwupd now checks hashes of plug-ins and will complain loudly that it is tainted when “invalid” plug-in is loaded (during testing). * Installed tests complain about not being able to access cdn, even though we are not setting CI_NETWORK env var. We need a patch to fix that. 2020-10-27 06:29:44 +00:00			`diff --git a/meson_options.txt b/meson_options.txt`
fwupd: 1.9.5 -> 1.9.6 Changelog: https://github.com/fwupd/fwupd/releases/tag/1.9.6 2023-10-06 12:52:59 +00:00			`index 877891126..bfc5d1afd 100644`
fwupd: 1.3.9 → 1.4.0 https://github.com/fwupd/fwupd/releases/tag/1.4.0 2020-04-15 19:22:43 +00:00			`--- a/meson_options.txt`
			`+++ b/meson_options.txt`
fwupd: 1.9.5 -> 1.9.6 Changelog: https://github.com/fwupd/fwupd/releases/tag/1.9.6 2023-10-06 12:52:59 +00:00			`@@ -452,6 +452,10 @@ option('elogind',`
			`'false': 'disabled',`
			`},`
			`)`
			`+option('installed_test_prefix',`
			`+ type: 'string',`
			`+ description: 'Prefix for installed tests'`
			`+)`
			`option('tests',`
			`type: 'boolean',`
			`value: true,`