enhancement-add-huawei-SP686C-RAID-and-SP186-HBA-info-in-pci-ids.patch

@@ -1,36 +0,0 @@
-From fabf1369360048fd7243bdae336a184df10dbc73 Mon Sep 17 00:00:00 2001
-From: zhangzikang <zhangzikang@kylinos.cn>
-Date: Fri, 8 Mar 2024 17:20:09 +0800
-Subject: [PATCH] enhancement-add-huawei-SP686C-RAID-and-SP186-HBA-info-in-pci-ids
-
----
- pci.ids | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/pci.ids b/pci.ids
-index b8efd0e..20b8250 100644
---- a/pci.ids
-+++ b/pci.ids
-@@ -22929,8 +22929,19 @@
- 		19e5 6213  NVMe SSD ES3500P V6 3840GB 2.5" U.2
- 		19e5 6214  NVMe SSD ES3500P V6 7680GB 2.5" U.2
- 		19e5 6215  NVMe SSD ES3500P V6 15360GB 2.5" U.2
-+	3758  Huawei Server SP686C RAID Controller Card
-+		19e5 0185  RAID SP686C-M-16i 2G
-+		19e5 01a4  RAID SP686C-M-16i 4G
-+		19e5 01a8  RAID SP686C-MH-32i 4G
-+		19e5 01a1  RAID SP686C-M-40i 2G
-+		19e5 01ad  RAID SP686C-M-40i 4G
- 	375e  Hi1822 Family Virtual Function
- 	379e  Hi1822 Family Virtual Function
-+	3858  Huawei Server SP186 HBA Controller Card
-+		19e5 0188  HBA SP186-M-8i
-+		19e5 0180  HBA SP186-M-16i
-+		19e5 0120  HBA SP186-M-32i
-+		19e5 0125  HBA SP186-M-40i
- 	a120  HiSilicon PCIe Root Port with Gen4
- 	a121  HiSilicon PCI-PCI Bridge
- 	a122  HiSilicon Embedded DMA Engine
--- 
-2.23.0
-

hwdata-0.316-vs-0.337.yaml

@@ -1,13 +0,0 @@
-name: hwdata
-old_version: 0.316
-new_version: 0.337
-interface_differences:
-- type: 'config file'
-  item: pci.ids usb.ids
-  diff: 更新了pci，usb，供应商ID和hwdb文件
-  influence: 厂商名称有增加，也有更新
-- type: 'CLI'
-  item: check-usb-ids.sh
-  diff: 删除对docker.sock的检查，不再跳过对USB ID的检查
-  influence: 功能优化
-remark: '影响PCI厂商的显示，对使用者影响很小'

hwdata.spec

@@ -1,15 +1,15 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.353
-Release: 3
-License: GPL-2.0-or-later
+Version: 0.337
+Release: 1
+License: GPLv2+
 Source: https://github.com/vcrhonek/hwdata/archive/v%{version}.tar.gz
 URL:    https://github.com/vcrhonek/hwdata
 BuildArch: noarch
 
 Patch9000:      enhancement-update-Hi1822-info-in-pci-ids.patch
 Patch9001:      bugfix-rename-some-pci-name.patch
-Patch9002:      enhancement-add-huawei-SP686C-RAID-and-SP186-HBA-info-in-pci-ids.patch
+
 %description
 hwdata contains various hardware identification and configuration data,
 such as the pci.ids and usb.ids databases.
@@ -32,18 +32,6 @@ make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_prefix}/lib
 %{_datadir}/%{name}/*
 
 %changelog
-* Fri Mar 08 2024 zhangzikang <zhangzikang@kylinos.cn> - 0.353-3
-- Add Huawei SP686C RAID and SP186 HBA info in pci.ids
-
-* Wed Aug 03 2022 liukuo <liukuo@kylinos.cn> - 0.353-2
-- License compliance rectification
-
-* Tue Nov 30 2021 zhouwenpei <zhouwenpei1@huawei.com> - 0.353-1
-- update to 0.353
-
-* Sat Jan 30 2021 xinghe <xinghe1@huawei.com> - 0.343-1
-- update to 0.343
-
 * Thu Jul 23 2020 jinzhimin <jinzhimin2@huawei.com> - 0.337-1
 - update to 0.337