From c7927ffd3fa875722b5b41b044550ae6d32fd259 Mon Sep 17 00:00:00 2001 From: xiaochuannan Date: Tue, 15 Oct 2024 09:23:14 +0800 Subject: [PATCH] Fix bug that the raid test cannot identify PM8222-SHBA (cherry picked from commit fac8aac4e6ff63acac7645bf6a96b69d2c3490cf) --- ...x-bug-raid-test-cannot-identify-PM8222-SHBA.patch | 12 ++++++++++++ oec-hardware.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 oec-hardware-1.1.6-1-fix-bug-raid-test-cannot-identify-PM8222-SHBA.patch diff --git a/oec-hardware-1.1.6-1-fix-bug-raid-test-cannot-identify-PM8222-SHBA.patch b/oec-hardware-1.1.6-1-fix-bug-raid-test-cannot-identify-PM8222-SHBA.patch new file mode 100644 index 0000000..2b6a8f9 --- /dev/null +++ b/oec-hardware-1.1.6-1-fix-bug-raid-test-cannot-identify-PM8222-SHBA.patch @@ -0,0 +1,12 @@ +diff -Naur rpm/hwcompatible/compatibility.py oech/hwcompatible/compatibility.py +--- rpm/hwcompatible/compatibility.py 2024-09-25 15:21:01.000000000 +0800 ++++ oech/hwcompatible/compatibility.py 2024-10-15 08:48:21.768690626 +0800 +@@ -341,6 +341,8 @@ + sort_devices["disk"] = [empty_device] + if "RAID" in device.get_property("ID_PCI_SUBCLASS_FROM_DATABASE") or \ + ("SCSI" in device.get_property("ID_PCI_SUBCLASS_FROM_DATABASE") and ++ "SHBA" in device.get_property("ID_MODEL_FROM_DATABASE")) or \ ++ ("SCSI" in device.get_property("ID_PCI_SUBCLASS_FROM_DATABASE") and + "HBA" not in device.get_property("ID_MODEL_FROM_DATABASE")): + if "raid" in sort_devices.keys(): + sort_devices["raid"].extend([device]) diff --git a/oec-hardware.spec b/oec-hardware.spec index 4856004..ee0ca70 100644 --- a/oec-hardware.spec +++ b/oec-hardware.spec @@ -6,13 +6,14 @@ Name: oec-hardware Summary: openEuler Hardware Compatibility Test Suite Version: 1.1.6 -Release: 0 +Release: 1 Group: Development/Tools License: Mulan PSL v2 URL: https://gitee.com/openeuler/oec-hardware Source0: https://gitee.com/openeuler/oec-hardware/repository/archive/v%{version}.tar.gz # patch fix issue +Patch0001: oec-hardware-1.1.6-1-fix-bug-raid-test-cannot-identify-PM8222-SHBA.patch Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gcc @@ -36,6 +37,7 @@ openEuler Hardware Compatibility Test Server %prep %setup -q -c +%patch1 -p1 %build %ifarch x86_64 aarch64 @@ -83,6 +85,9 @@ sed -i 's#grep openeulerversion /etc/openEuler-latest#grep %{vendor_lowercase}ve rm -rf /var/lock/oech.lock %changelog +* Tue Oct 15 2024 xiaochn - 1.1.6-1 +- Fix bug that the raid test cannot identify PM8222-SHBA + * Tue Sep 24 2024 wangshuai - 1.1.6-0 - Add new test suite srpm and intel - Add virtual branch of test suite -- Gitee