From abe76d193172e81909a43d5dd27b7647fe5ecaca Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Mon, 16 Jan 2023 14:36:42 -0600 Subject: [PATCH] Backport a patch to fix the autopkgtest failure on s390x. --- debian/changelog | 6 ++ ...nstall-dmi-data-into-installed-tests.patch | 56 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 63 insertions(+) create mode 100644 debian/patches/0001-trivial-install-dmi-data-into-installed-tests.patch diff --git a/debian/changelog b/debian/changelog index 80fb1d841..d44f0a33a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fwupd (1.8.9-3) unstable; urgency=medium + + * Backport a patch to fix the autopkgtest failure on s390x. + + -- Mario Limonciello Mon, 16 Jan 2023 14:36:18 -0600 + fwupd (1.8.9-2) unstable; urgency=medium * Backport a patch to fix FTBFS on s390x. diff --git a/debian/patches/0001-trivial-install-dmi-data-into-installed-tests.patch b/debian/patches/0001-trivial-install-dmi-data-into-installed-tests.patch new file mode 100644 index 000000000..22f3ec345 --- /dev/null +++ b/debian/patches/0001-trivial-install-dmi-data-into-installed-tests.patch @@ -0,0 +1,56 @@ +From c2a494e8711dd4d5813d72aed126091fe6a3434f Mon Sep 17 00:00:00 2001 +From: Mario Limonciello +Date: Tue, 10 Jan 2023 21:17:18 -0600 +Subject: [PATCH] trivial: install dmi data into installed-tests + +fixes: #5402 +--- + contrib/fwupd.spec.in | 1 + + libfwupdplugin/meson.build | 19 +++++++++++++++++++ + 2 files changed, 20 insertions(+) + +diff --git a/contrib/fwupd.spec.in b/contrib/fwupd.spec.in +index 3fefe3a32..694369dcc 100644 +--- a/contrib/fwupd.spec.in ++++ b/contrib/fwupd.spec.in +@@ -463,6 +463,7 @@ done + %if 0%{?have_uefi} + %{_datadir}/installed-tests/fwupd/efi + %endif ++%{_datadir}/installed-tests/fwupd/dmi + %{_datadir}/fwupd/device-tests/*.json + %{_libexecdir}/installed-tests/fwupd/* + %dir %{_sysconfdir}/fwupd/remotes.d +diff --git a/libfwupdplugin/meson.build b/libfwupdplugin/meson.build +index 1c57b2c47..4c8152388 100644 +--- a/libfwupdplugin/meson.build ++++ b/libfwupdplugin/meson.build +@@ -361,6 +361,25 @@ if get_option('tests') + ], + ) + test('fwupdplugin-self-test', e, is_parallel: false, timeout: 180, env: env) ++ ++ install_data([ ++ 'tests/dmi/class/chassis_type', ++ 'tests/dmi/class/sys_vendor', ++ ], ++ install_dir: join_paths(installed_test_datadir, 'dmi/class'), ++ ) ++ install_data([ ++ 'tests/dmi/tables/DMI', ++ 'tests/dmi/tables/smbios_entry_point', ++ ], ++ install_dir: join_paths(installed_test_datadir, 'dmi/tables'), ++ ) ++ install_data([ ++ 'tests/dmi/tables64/DMI', ++ 'tests/dmi/tables64/smbios_entry_point', ++ ], ++ install_dir: join_paths(installed_test_datadir, 'dmi/tables64'), ++ ) + endif + + fwupdplugin_incdir = include_directories('.') +-- +2.34.1 + diff --git a/debian/patches/series b/debian/patches/series index 599fd9b1b..83c20f384 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-mtd-Use-dummy-SMBIOS-data-to-fix-self-test-on-s390x.patch +0001-trivial-install-dmi-data-into-installed-tests.patch