mirror of
https://git.proxmox.com/git/fwupd
synced 2025-08-15 10:29:47 +00:00
Backport a patch to fix the autopkgtest failure on s390x.
This commit is contained in:
parent
a3734ba3a4
commit
abe76d1931
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,3 +1,9 @@
|
||||
fwupd (1.8.9-3) unstable; urgency=medium
|
||||
|
||||
* Backport a patch to fix the autopkgtest failure on s390x.
|
||||
|
||||
-- Mario Limonciello <superm1@gmail.com> Mon, 16 Jan 2023 14:36:18 -0600
|
||||
|
||||
fwupd (1.8.9-2) unstable; urgency=medium
|
||||
|
||||
* Backport a patch to fix FTBFS on s390x.
|
||||
|
56
debian/patches/0001-trivial-install-dmi-data-into-installed-tests.patch
vendored
Normal file
56
debian/patches/0001-trivial-install-dmi-data-into-installed-tests.patch
vendored
Normal file
@ -0,0 +1,56 @@
|
||||
From c2a494e8711dd4d5813d72aed126091fe6a3434f Mon Sep 17 00:00:00 2001
|
||||
From: Mario Limonciello <mario.limonciello@amd.com>
|
||||
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
|
||||
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user