diff --git a/bugfix-rename-some-pci-name.patch b/bugfix-rename-some-pci-name.patch index e6c9aff57440ee28759a875f67a3d7cd159605e8..5bc76690fb648e765ee1d60a369c254abfae2786 100644 --- a/bugfix-rename-some-pci-name.patch +++ b/bugfix-rename-some-pci-name.patch @@ -6,12 +6,11 @@ Subject: [PATCH] bugfix-rename-some-pci-name.patch --- pci.ids | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pci.ids b/pci.ids -index 00e958d..fd8a42b 100644 ---- a/pci.ids -+++ b/pci.ids -@@ -21182,7 +21182,7 @@ + +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 +@@ -22356,7 +22356,7 @@ 3003 ioMemory Mezzanine 1aee Caustic Graphics Inc. # nee Qumranet, Inc. @@ -20,6 +19,3 @@ index 00e958d..fd8a42b 100644 1000 Virtio network device 1001 Virtio block device 1002 Virtio memory balloon --- -1.8.3.1 - diff --git a/enhancement-update-1822-PCIe-information.patch b/enhancement-update-1822-PCIe-information.patch deleted file mode 100644 index f8afca4916b7c63af967de751fc432b1e1867823..0000000000000000000000000000000000000000 --- a/enhancement-update-1822-PCIe-information.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e3714631b283088dd8b3fe65c39a404929a210a5 Mon Sep 17 00:00:00 2001 -From: wangbin224 -Date: Tue, 19 Nov 2019 21:45:15 +0800 -Subject: [PATCH] hwdata: update 1822 PCIe information - -Update 1822 PCIe information. ---- - pci.ids | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/pci.ids b/pci.ids -index bb4999c..7ddf566 100644 ---- a/pci.ids -+++ b/pci.ids -@@ -20975,7 +20975,7 @@ - 19e5 3033 NVMe SSD ES3600C V3 1200GB HHHL AIC - 19e5 3034 NVMe SSD ES3600C V3 1600GB HHHL AIC - 19e5 3036 NVMe SSD ES3600C V3 3200GB HHHL AIC -- 0200 Hi1822 Family (2*25GE) -+ 0200 Hi1822 Family (2*100GE) - 0201 Hi1822 Family (2*100GE) - 1710 iBMA Virtual Network Adapter - 1711 Hi1710 [iBMC Intelligent Management system chip w/VGA support] -@@ -30711,6 +30711,7 @@ C ff Unassigned class - 020D Hi1822 Family (2*40GE) - 0210 Hi1822 Family (4*25GE) - 0211 Hi1822 Family (4*25GE) -+ 0206 Hi1822 Family (2*25GE) - 0212 Hi1822 Family (2*8G FC) - 375e Hi1822 Family Virtual Function - 379e Hi1822 Family Virtual Function --- -2.19.1 - diff --git a/enhancement-update-Hi1822-info-in-pci-ids.patch b/enhancement-update-Hi1822-info-in-pci-ids.patch index da20aa123c8c0878320683e9a70b313fb80a5e4b..0a36ef0b6db5731aa4751d2133de379487bd9ee0 100644 --- a/enhancement-update-Hi1822-info-in-pci-ids.patch +++ b/enhancement-update-Hi1822-info-in-pci-ids.patch @@ -7,31 +7,32 @@ Subject: [PATCH] enhancement-update-Hi1822-info-in-pci-ids pci.ids | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -diff --git a/pci.ids b/pci.ids -index 35bbbfb..0dcd0b0 100644 ---- a/pci.ids -+++ b/pci.ids -@@ -30698,3 +30698,20 @@ C 12 Processing accelerators - C 13 Non-Essential Instrumentation - C 40 Coprocessor - C ff Unassigned class -+19e5 Huawei Technologies Co., Ltd. -+ 1822 Hi1822 Family (4*25GE) +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 +@@ -22103,6 +22103,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) -+ 0203 Hi1822 Family (2*16G FC) + 0202 Hi1822 Family (2*32G FC) + 19e5 d149 Hi1822 SP528 (2*32G FC) + 19e5 d302 Hi1822 SP521 (2*32G FC) +@@ -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) + 0204 Hi1822 Family (4*10GE) -+ 0205 Hi1822 Family (2*100GE) + 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) -+ 0211 Hi1822 Family (4*25GE) -+ 0212 Hi1822 Family (2*8G FC) -+ 375e Hi1822 Family Virtual Function -+ 379e Hi1822 Family Virtual Function -+ 371e Hi1822 Family Virtual Bridge --- -1.8.3.1 - + 0210 Hi1822 Family (4*25GE) + 19e5 df2e Hi1822 MZ532 MEZZ (4*25GE) + 0211 Hi1822 Family (4*25GE) diff --git a/hwdata.spec b/hwdata.spec index 62ebf350faa778c0af9c692911c220badeec3ffd..75c92b52801b4961b8a7ff056eb56dfbaad6ded1 100644 --- a/hwdata.spec +++ b/hwdata.spec @@ -1,6 +1,6 @@ Name: hwdata -Version: 0.316 -Release: 3 +Version: 0.337 +Release: 1 Summary: Record hardware identification and configuration data License: GPLv2+ Source: https://github.com/vcrhonek/hwdata/archive/v%{version}.tar.gz @@ -9,11 +9,10 @@ BuildArch: noarch Patch9000: enhancement-update-Hi1822-info-in-pci-ids.patch Patch9001: bugfix-rename-some-pci-name.patch -Patch9002: enhancement-update-1822-PCIe-information.patch %description -hwdata is used to record many hardware identification and configuration data, -such as the pnp.ids, usb.ids and pci.ids databases. +hwdata contains various hardware identification and configuration data, +such as the pci.ids and usb.ids databases. %prep %autosetup -n %{name}-%{version} -p1 @@ -22,14 +21,20 @@ such as the pnp.ids, usb.ids and pci.ids databases. %configure %install -%make_install libdir=%{_prefix}/lib +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_prefix}/lib %files -%doc LICENSE COPYING +%license COPYING +%doc LICENSE +%dir %{_datadir}/%{name} %{_prefix}/lib/modprobe.d/dist-blacklist.conf %{_datadir}/%{name}/* %changelog +* Thu Aug 13 2020 xinghe - 0.337-1 +- update version to 0.337 + * Mon Dec 23 2019 wangbin224 - 0.316-3 - Type:enhancement - ID:NA diff --git a/v0.316.tar.gz b/v0.316.tar.gz deleted file mode 100644 index b668997d63712fbade47389ad747820f11d2509d..0000000000000000000000000000000000000000 Binary files a/v0.316.tar.gz and /dev/null differ diff --git a/v0.337.tar.gz b/v0.337.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ebc30553e799899718d3d25d2abe7f19bc89a0a0 Binary files /dev/null and b/v0.337.tar.gz differ