diff --git a/bugfix-rename-some-pci-name.patch b/bugfix-rename-some-pci-name.patch index e6c9aff57440ee28759a875f67a3d7cd159605e8..82620cb603e566f416d24c199a830e7b42ab017c 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 +@@ -22340,7 +22340,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 index f8afca4916b7c63af967de751fc432b1e1867823..e3a8f696abbdd6ab2d1e47a6960e4d537dc11f93 100644 --- a/enhancement-update-1822-PCIe-information.patch +++ b/enhancement-update-1822-PCIe-information.patch @@ -7,28 +7,15 @@ 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 -Naur a/pci.ids b/pci.ids +--- a/pci.ids 2020-06-20 17:43:56.606937676 +0800 ++++ b/pci.ids 2020-06-20 17:46:12.217193001 +0800 +@@ -32865,6 +32865,7 @@ + 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 diff --git a/enhancement-update-Hi1822-info-in-pci-ids.patch b/enhancement-update-Hi1822-info-in-pci-ids.patch index da20aa123c8c0878320683e9a70b313fb80a5e4b..6064ba43b9c70831b751e69e2968ad53df14fc6e 100644 Binary files a/enhancement-update-Hi1822-info-in-pci-ids.patch and b/enhancement-update-Hi1822-info-in-pci-ids.patch differ diff --git a/hwdata.spec b/hwdata.spec index 62ebf350faa778c0af9c692911c220badeec3ffd..6e46cf56fff76ea13701645f4e57b5a47bf79657 100644 --- a/hwdata.spec +++ b/hwdata.spec @@ -1,19 +1,19 @@ -Name: hwdata -Version: 0.316 -Release: 3 -Summary: Record hardware identification and configuration data -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-update-1822-PCIe-information.patch +Name: hwdata +Summary: Hardware identification and configuration data +Version: 0.336 +Release: 1%{?dist} +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-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 +22,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 +* Sat Jun 20 2020 shixuantong -0.336-1 +- Update to 0.336 + * 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.336.tar.gz b/v0.336.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..88a7838992e2063c64fd10eb0429f5ea9f901bf2 Binary files /dev/null and b/v0.336.tar.gz differ