nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 03:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
110b8ad1ef
nixpkgs/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

60 lines
3.1 KiB
Diff
Raw Normal View History

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: 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
index b8ec916f0..38209b363 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: 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
@@ -83,5 +83,5 @@ configure_file(
fwupd: fix installed tests
2019-01-27 23:15:00 +00:00
output : 'fwupd-tests.conf',
configuration : con2,
install: true,
- install_dir: join_paths(sysconfdir, '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.7.7 → 1.8.0 https://github.com/fwupd/fwupd/releases/tag/1.8.0 https://blogs.gnome.org/hughsie/2022/04/28/fwupd-1-8-0-and-50-million-updates/ - Switch to feature type for meson configure flags. - flashrom program has not actually been used for a while now, it was replaced by libflashrom: https://github.com/fwupd/fwupd/commit/13fd21d8064bc3a06ca33f22605616e9cbde6178
2022-04-29 15:49:42 +00:00
index d8bd9fdc7..ff924d373 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.7.7 → 1.8.0 https://github.com/fwupd/fwupd/releases/tag/1.8.0 https://blogs.gnome.org/hughsie/2022/04/28/fwupd-1-8-0-and-50-million-updates/ - Switch to feature type for meson configure flags. - flashrom program has not actually been used for a while now, it was replaced by libflashrom: https://github.com/fwupd/fwupd/commit/13fd21d8064bc3a06ca33f22605616e9cbde6178
2022-04-29 15:49:42 +00:00
@@ -187,8 +187,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())
endif
mandir = join_paths(prefix, get_option('mandir'))
localedir = join_paths(prefix, get_option('localedir'))
fwupd: 1.7.7 → 1.8.0 https://github.com/fwupd/fwupd/releases/tag/1.8.0 https://blogs.gnome.org/hughsie/2022/04/28/fwupd-1-8-0-and-50-million-updates/ - Switch to feature type for meson configure flags. - flashrom program has not actually been used for a while now, it was replaced by libflashrom: https://github.com/fwupd/fwupd/commit/13fd21d8064bc3a06ca33f22605616e9cbde6178
2022-04-29 15:49:42 +00:00
@@ -487,6 +487,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.7.7 → 1.8.0 https://github.com/fwupd/fwupd/releases/tag/1.8.0 https://blogs.gnome.org/hughsie/2022/04/28/fwupd-1-8-0-and-50-million-updates/ - Switch to feature type for meson configure flags. - flashrom program has not actually been used for a while now, it was replaced by libflashrom: https://github.com/fwupd/fwupd/commit/13fd21d8064bc3a06ca33f22605616e9cbde6178
2022-04-29 15:49:42 +00:00
index d00038dbc..be1c45b40 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.7.7 → 1.8.0 https://github.com/fwupd/fwupd/releases/tag/1.8.0 https://blogs.gnome.org/hughsie/2022/04/28/fwupd-1-8-0-and-50-million-updates/ - Switch to feature type for meson configure flags. - flashrom program has not actually been used for a while now, it was replaced by libflashrom: https://github.com/fwupd/fwupd/commit/13fd21d8064bc3a06ca33f22605616e9cbde6178
2022-04-29 15:49:42 +00:00
@@ -56,6 +56,7 @@ option('systemd', type : 'feature', description : 'systemd support', deprecated:
option('systemd_unit_user', type : 'string', description : 'User account to use for fwupd-refresh.service (empty for DynamicUser)')
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
option('systemd_root_prefix', type: 'string', value: '', description: 'Directory to base systemd’s installation directories on')
fwupd: 1.7.7 → 1.8.0 https://github.com/fwupd/fwupd/releases/tag/1.8.0 https://blogs.gnome.org/hughsie/2022/04/28/fwupd-1-8-0-and-50-million-updates/ - Switch to feature type for meson configure flags. - flashrom program has not actually been used for a while now, it was replaced by libflashrom: https://github.com/fwupd/fwupd/commit/13fd21d8064bc3a06ca33f22605616e9cbde6178
2022-04-29 15:49:42 +00:00
option('elogind', type : 'feature', description : 'elogind support', deprecated: {'true': 'enabled', 'false': 'disabled'})
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
+option('installed_test_prefix', type: 'string', description: 'Prefix for installed tests')
option('tests', type : 'boolean', value : true, description : 'enable tests')
fwupd: 1.7.7 → 1.8.0 https://github.com/fwupd/fwupd/releases/tag/1.8.0 https://blogs.gnome.org/hughsie/2022/04/28/fwupd-1-8-0-and-50-million-updates/ - Switch to feature type for meson configure flags. - flashrom program has not actually been used for a while now, it was replaced by libflashrom: https://github.com/fwupd/fwupd/commit/13fd21d8064bc3a06ca33f22605616e9cbde6178
2022-04-29 15:49:42 +00:00
option('soup_session_compat', type : 'boolean', value : true, description : 'enable SoupSession runtime compatibility support')
option('curl', type : 'feature', description : 'libcurl support', deprecated: {'true': 'enabled', 'false': 'disabled'})
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
diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c
fwupd: 1.7.7 → 1.8.0 https://github.com/fwupd/fwupd/releases/tag/1.8.0 https://blogs.gnome.org/hughsie/2022/04/28/fwupd-1-8-0-and-50-million-updates/ - Switch to feature type for meson configure flags. - flashrom program has not actually been used for a while now, it was replaced by libflashrom: https://github.com/fwupd/fwupd/commit/13fd21d8064bc3a06ca33f22605616e9cbde6178
2022-04-29 15:49:42 +00:00
index 4d19e560f..91cfaa616 100644
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
--- a/plugins/redfish/fu-self-test.c
+++ b/plugins/redfish/fu-self-test.c
@@ -27,7 +27,7 @@ fu_test_is_installed_test(void)
const gchar *builddir = g_getenv("G_TEST_BUILDDIR");
if (builddir == NULL)
return FALSE;
- return g_str_has_prefix(builddir, FWUPD_PREFIX);
+ return g_str_has_prefix(builddir, FWUPD_INSTALLED_TEST_PREFIX);
}
static void
Reference in New Issue Copy Permalink