!11 【LTS升级】hwdata升级到最新版本

Merge pull request !11 from xinghe/openEuler-20.03-LTS

bugfix-rename-some-pci-name.patch

@@ -7,11 +7,10 @@ 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
+diff -Naur a/pci.ids b/pci.ids
-index 00e958d..fd8a42b 100644
+--- a/pci.ids	2020-06-20 17:35:54.786057979 +0800
---- a/pci.ids
++++ b/pci.ids	2020-06-20 17:40:50.076585490 +0800
-+++ b/pci.ids
+@@ -22356,7 +22356,7 @@
-@@ -21182,7 +21182,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
-

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
+diff -Naur a/pci.ids b/pci.ids
-index 35bbbfb..0dcd0b0 100644
+--- a/pci.ids	2020-06-01 07:56:07.000000000 +0000
---- a/pci.ids
++++ b/pci.ids	2020-07-20 11:47:23.212000000 +0000
-+++ b/pci.ids
+@@ -22103,6 +22103,7 @@
-@@ -30698,3 +30698,20 @@ C 12  Processing accelerators
+ 		19e5 d139  Hi1822 SP572 (2*100GE)
- C 13  Non-Essential Instrumentation
+ 		19e5 d13d  Hi1822 SC371 (2*100GE)
- C 40  Coprocessor
+ 		19e5 d147  Hi1822 SP573 (2*100GE)
- C ff  Unassigned class
-+19e5  Huawei Technologies Co., Ltd.
-+	1822  Hi1822 Family (4*25GE)
 +	0201  Hi1822 Family (2*100GE)
-+	0202  Hi1822 Family (2*32G FC)
+ 	0202  Hi1822 Family (2*32G FC)
-+	0203  Hi1822 Family (2*16G 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)
+ 	0210  Hi1822 Family (4*25GE)
-+	0211  Hi1822 Family (4*25GE)
+ 		19e5 df2e  Hi1822 MZ532 MEZZ (4*25GE)
-+	0212  Hi1822 Family (2*8G FC)
+ 	0211  Hi1822 Family (4*25GE)
-+	375e  Hi1822 Family Virtual Function
-+	379e  Hi1822 Family Virtual Function
-+	371e  Hi1822 Family Virtual Bridge
--- 
-1.8.3.1
-

hwdata.spec

@@ -1,19 +1,18 @@
-Name: 		hwdata
+Name: hwdata
-Version: 	0.316
+Summary: Hardware identification and configuration data
-Release: 	3
+Version: 0.337
-Summary: 	Record hardware identification and configuration data
+Release: 1
-License: 	GPLv2+
+License: GPLv2+
-Source: 	https://github.com/vcrhonek/hwdata/archive/v%{version}.tar.gz
+Source: https://github.com/vcrhonek/hwdata/archive/v%{version}.tar.gz
-URL:    	https://github.com/vcrhonek/hwdata
+URL:    https://github.com/vcrhonek/hwdata
-BuildArch: 	noarch
+BuildArch: noarch
 
-Patch9000:	enhancement-update-Hi1822-info-in-pci-ids.patch
+Patch9000:      enhancement-update-Hi1822-info-in-pci-ids.patch
-Patch9001:	bugfix-rename-some-pci-name.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,
+hwdata contains various hardware identification and configuration data,
-such as the pnp.ids, usb.ids and pci.ids databases.
+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
+* Sat Aug 15 2020 xinghe <xinghe1@huawei.com> - 0.337-1
+- update to 0.337
+
 * Mon Dec 23 2019 wangbin224<wangbin224@huawei.com> - 0.316-3
 - Type:enhancement
 - ID:NA