diff --git a/enhancement-add-huawei-SP686C-RAID-and-SP186-HBA-inf.patch b/enhancement-add-huawei-SP686C-RAID-and-SP186-HBA-inf.patch deleted file mode 100644 index 73fdf9b6b04c86f311bada967e016aa3c95345f8..0000000000000000000000000000000000000000 --- a/enhancement-add-huawei-SP686C-RAID-and-SP186-HBA-inf.patch +++ /dev/null @@ -1,39 +0,0 @@ -From be3c4af6e22964b8253bda3ac4341e8ae6459dfa Mon Sep 17 00:00:00 2001 -From: zhangzikang -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 - diff --git a/enhancement-update-Hi1822-info-in-pci-ids.patch b/enhancement-update-Hi1822-info-in-pci-ids.patch deleted file mode 100644 index 725ce5b19613ec63aecbcc5e28be2a1ac8ed4ff4..0000000000000000000000000000000000000000 --- a/enhancement-update-Hi1822-info-in-pci-ids.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3c7cabf4d47ceff8dd85f27568d9c7fbd03e1b50 Mon Sep 17 00:00:00 2001 -From: kangenbo -Date: Mon, 28 Jan 2019 11:21:50 -0500 -Subject: [PATCH] enhancement-update-Hi1822-info-in-pci-ids - ---- - pci.ids | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -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 @@ - 19e5 d139 Hi1822 SP572 (2*100GE) - 19e5 d13d Hi1822 SC371 (2*100GE) - 19e5 d147 Hi1822 SP573 (2*100GE) -+ 0201 Hi1822 Family (2*100GE) - 0202 Hi1822 Family (2*32G FC) - 19e5 d149 Hi1822 SP528 (2*32G FC) - 19e5 d302 Hi1822 SP521 (2*32G FC) -@@ -23405,12 +23406,17 @@ - 19e5 d148 Hi1822 SP527 (2*16G FC) - 19e5 d301 Hi1822 SP520 (2*16G FC) - 19e5 d305 Hi1822 SP525 (2*16G FC) -+ 0204 Hi1822 Family (4*10GE) - 0205 Hi1822 Family (2*100GE) - 19e5 df27 Hi1822 MZ731 MEZZ (2*100GE) - 0206 Hi1822 Family (2*25GE) - 19e5 d138 Hi1822 SP582 (2*25GE) - 19e5 d13a Hi1822 SC381 (2*25GE) - 19e5 d145 Hi1822 SP586 (2*25GE) -+ 0208 Hi1822 Family (2*100GE) -+ 020B Hi1822 Family (4*25GE) -+ 020C Hi1822 Family (4*32G FC) -+ 020D Hi1822 Family (2*40GE) - 0210 Hi1822 Family (4*25GE) - 19e5 df2e Hi1822 MZ532 MEZZ (4*25GE) - 0211 Hi1822 Family (4*25GE) diff --git a/hwdata-0.316-vs-0.337.yaml b/hwdata-0.316-vs-0.337.yaml deleted file mode 100644 index d9b65680ca2ba88dd932d60affcd30471a228a39..0000000000000000000000000000000000000000 --- a/hwdata-0.316-vs-0.337.yaml +++ /dev/null @@ -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厂商的显示，对使用者影响很小' \ No newline at end of file diff --git a/hwdata.spec b/hwdata.spec index cc3043d5a0941c8ff365114b5ea15dc85fbf7736..7a9e8a921aa85ec216ca5cb5770cfaea97445988 100644 --- a/hwdata.spec +++ b/hwdata.spec @@ -1,15 +1,13 @@ Name: hwdata Summary: Hardware identification and configuration data -Version: 0.372 -Release: 2 +Version: 0.388 +Release: 1 License: GPL-2.0-or-later 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-inf.patch %description hwdata contains various hardware identification and configuration data, such as the pci.ids and usb.ids databases. @@ -21,18 +19,19 @@ such as the pci.ids and usb.ids databases. %configure %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_prefix}/lib +%make_install libdir=%{_prefix}/lib %files -%license COPYING -%doc LICENSE +%license COPYING LICENSE %dir %{_datadir}/%{name} %{_prefix}/lib/modprobe.d/dist-blacklist.conf %{_datadir}/%{name}/* %{_datadir}/pkgconfig/%{name}.pc %changelog +* Wed Oct 02 2024 Funda Wang - 0.388-1 +- update to 0.388 + * Fri Mar 15 2024 zhangzikang - 0.372-2 - Add Huawei SP686C RAID and SP186 HBA info in pci.ids diff --git a/hwdata.yaml b/hwdata.yaml index 83bb8739c623e5748029e74989a0b641bbeac4ad..e14bfba39dcb00b9c44a69aeddca853f103da0cc 100644 --- a/hwdata.yaml +++ b/hwdata.yaml @@ -1,5 +1,4 @@ version_control: github -src_repo: vcrhonec/hwdata +src_repo: vcrhonek/hwdata tag_prefix: "^v" separator: "." - diff --git a/v0.372.tar.gz b/v0.372.tar.gz deleted file mode 100644 index dc6c7f1e7a9233b0bdea2b0583fdce47b6559a39..0000000000000000000000000000000000000000 Binary files a/v0.372.tar.gz and /dev/null differ diff --git a/v0.388.tar.gz b/v0.388.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f69cc27ed383be8fc551d9b72d73c24f7d62a557 Binary files /dev/null and b/v0.388.tar.gz differ