bugfix-rename-some-pci-name.patch

@@ -10,12 +10,12 @@ Subject: [PATCH] bugfix-rename-some-pci-name.patch
 diff -Naur a/pci.ids b/pci.ids
 --- a/pci.ids	2020-06-20 17:35:54.786057979 +0800
 +++ b/pci.ids	2020-06-20 17:40:50.076585490 +0800
-@@ -23739,7 +23745,7 @@
+@@ -22356,7 +22356,7 @@
  	3003  ioMemory Mezzanine
  1aee  Caustic Graphics Inc.
  # nee Qumranet, Inc.
 -1af4  Red Hat, Inc.
 +1af4  Virtio:
  	1000  Virtio network device
-		01de fffb  Propolis Virtio network device
  	1001  Virtio block device
+ 	1002  Virtio memory balloon

enhancement-add-huawei-SP686C-RAID-and-SP186-HBA-inf.patch

@@ -1,39 +0,0 @@
-From be3c4af6e22964b8253bda3ac4341e8ae6459dfa Mon Sep 17 00:00:00 2001
-From: zhangzikang <zhangzikang@kylinos.cn>
-Date: Fri, 15 Mar 2024 10:20:43 +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 4da453d..2800ad3 100644
---- a/pci.ids
-+++ b/pci.ids
-@@ -23747,10 +23747,21 @@
- 		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
- 	375f  Hi1822 Family Virtual Function
- 	379e  Hi1822 Family Virtual Function
- 	379f  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.33.0
-

enhancement-update-Hi1822-info-in-pci-ids.patch

@@ -10,7 +10,7 @@ Subject: [PATCH] enhancement-update-Hi1822-info-in-pci-ids
 diff -Naur a/pci.ids b/pci.ids
 --- a/pci.ids	2020-06-01 07:56:07.000000000 +0000
 +++ b/pci.ids	2020-07-20 11:47:23.212000000 +0000
-@@ -23397,6 +23397,7 @@
+@@ -22103,6 +22103,7 @@
  		19e5 d139  Hi1822 SP572 (2*100GE)
  		19e5 d13d  Hi1822 SC371 (2*100GE)
  		19e5 d147  Hi1822 SP573 (2*100GE)
@@ -18,7 +18,7 @@ diff -Naur a/pci.ids b/pci.ids
  	0202  Hi1822 Family (2*32G FC)
  		19e5 d149  Hi1822 SP528 (2*32G FC)
  		19e5 d302  Hi1822 SP521 (2*32G FC)
-@@ -23405,12 +23406,17 @@
+@@ -22111,12 +22112,17 @@
  		19e5 d148  Hi1822 SP527 (2*16G FC)
  		19e5 d301  Hi1822 SP520 (2*16G FC)
  		19e5 d305  Hi1822 SP525 (2*16G FC)

hwdata.spec

@@ -1,6 +1,6 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.372
+Version: 0.353
 Release: 2
 License: GPL-2.0-or-later
 Source: https://github.com/vcrhonek/hwdata/archive/v%{version}.tar.gz
@@ -9,7 +9,7 @@ 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-inf.patch
+
 %description
 hwdata contains various hardware identification and configuration data,
 such as the pci.ids and usb.ids databases.
@@ -30,24 +30,8 @@ make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_prefix}/lib
 %dir %{_datadir}/%{name}
 %{_prefix}/lib/modprobe.d/dist-blacklist.conf
 %{_datadir}/%{name}/*
-%{_datadir}/pkgconfig/%{name}.pc
 
 %changelog
-* Fri Mar 15 2024 zhangzikang <zhangzikang@kylinos.cn> - 0.372-2
-- Add Huawei SP686C RAID and SP186 HBA info in pci.ids
-
-* Tue Feb 27 2024 zhangnaichuan <zhangnaichuan@huawei.com> - 0.372-1
-- degrade to version v0.372
-
-* Tue Oct 31 2023 li weigang <weigangli@gmail.com> - 0.375-1
-- update to version v0.375
-
-* Sat May 20 2023 kiritakekumi <root@niconiconi.us> - 0.370-1
-- Update to 0.370
-
-* Sun Jan 29 2023 chenhaixiang <chenhaixiang3@huawei.com> - 0.366-1
-- Update to hwdata-v0.366
-
 * Wed Aug 03 2022 liukuo <liukuo@kylinos.cn> - 0.353-2
 - License compliance rectification
 

hwdata.yaml

@@ -1,5 +1,5 @@
 version_control: github
 src_repo: vcrhonec/hwdata
 tag_prefix: "^v"
-separator: "."
+seperator: "."