From 30402febe525923945bebc617cf7e639af4c6728 Mon Sep 17 00:00:00 2001 From: sxt1001 Date: Mon, 20 Jul 2020 18:00:04 +0800 Subject: [PATCH] delete two patch file --- bugfix-rename-some-pci-name.patch | 10 ++++----- ...ncement-update-1822-PCIe-information.patch | 21 ------------------ ...cement-update-Hi1822-info-in-pci-ids.patch | Bin 14082 -> 0 bytes hwdata.spec | 15 +++++++++---- 4 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 enhancement-update-1822-PCIe-information.patch delete mode 100644 enhancement-update-Hi1822-info-in-pci-ids.patch diff --git a/bugfix-rename-some-pci-name.patch b/bugfix-rename-some-pci-name.patch index 82620cb..c507599 100644 --- a/bugfix-rename-some-pci-name.patch +++ b/bugfix-rename-some-pci-name.patch @@ -1,21 +1,21 @@ From 39e2f74eade1a0876beb36a131633900e7f44cbc Mon Sep 17 00:00:00 2001 From: kangenbo Date: Sat, 26 Jan 2019 10:18:33 -0500 -Subject: [PATCH] bugfix-rename-some-pci-name.patch +Subject: [PATCH] bugfix-rename-some-pci-name.patch --- pci.ids | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - + 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 +--- a/pci.ids 2020-07-20 11:52:00.372695507 +0800 ++++ b/pci.ids 2020-07-20 14:04:11.293770253 +0800 @@ -22340,7 +22340,7 @@ 3003 ioMemory Mezzanine 1aee Caustic Graphics Inc. # nee Qumranet, Inc. -1af4 Red Hat, Inc. -+1af4 Virtio: ++1af4 Virtio 1000 Virtio network device 1001 Virtio block device 1002 Virtio memory balloon diff --git a/enhancement-update-1822-PCIe-information.patch b/enhancement-update-1822-PCIe-information.patch deleted file mode 100644 index e3a8f69..0000000 --- a/enhancement-update-1822-PCIe-information.patch +++ /dev/null @@ -1,21 +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 -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 deleted file mode 100644 index 6064ba43b9c70831b751e69e2968ad53df14fc6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14082 zcmeI3J#X7a7{@Oe0$6~PqFFOs5(H^2k-9tbESkt**tMOYiH9Ke6a=8fvqeBAWs-uD zDW9T4hvtK1&(sglxpUFIV;@qabLN}uG01b^1HS$5PW;_H1SH+x4^B_1ap=us>J6XI zy@d+sNpa9K4CC_Z8s8c*gK^j>b6mz?Gg(<^pE->6`u+Z8?KQy!RM<2GqkQCA+!eMt zvZZt^Tk@j9_BJ)xfYCl5@J+hC-RpBl2)gf`2h$JqCwoK4gT0@jUAipLB&YOwa786H zIAc|rXpmXrfbQ>JZO&@Y@y)uoqqt&vpKE{}saoqJQdKM%)g5QSgI-x_V*NX=W-J8|HjDfgo1 z>lt7!Q@~6XGnmNQS&<9cl^Z04UaOuJjyaN2ZZXN6T2|yKal(#YyrLu1CQyDLWct^? z@18z;K#q?HiK8gZF0U$ToES>kCkA6&bclzO=v)nxN$`H|g=rL?^!MaSfF@$C#sXc`;Zo3Lt(FH})NY^9Rqb93UDfLA z&_x|45na{Aj_g5e?NMTV_wal&a9D(J4I*rs}GFVKxrT zz)!%sP#hJuh2pGg$ziT!CKpl)A;I{edw5!E*siq9%&j0Rb_Gi~QVcBGUmk$x2h2Ql zmvTUN7=^}OlBh5Zz|`>~OwxFM4rgBO?EsMt(`+}I#nD(LNfc-Gz?DRgLN7^zvrzeT zJcUCr2W_crRF^iTH)=cyqiJ*&s06B;1Nt)c&0dy|ImW6@=+dDAf)zfZrJ`dv^Io8l zj)_r9S|?a3XrHI0qJ6%Xiq^C#1s&;EN?Oyn5Oi6Ca$sGqprxRRXlV!n#r3>Exp4LC MGyl}9U&_7z0T88gmjD0& diff --git a/hwdata.spec b/hwdata.spec index 6e46cf5..2e4b270 100644 --- a/hwdata.spec +++ b/hwdata.spec @@ -1,15 +1,13 @@ Name: hwdata Summary: Hardware identification and configuration data Version: 0.336 -Release: 1%{?dist} +Release: 2 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 contains various hardware identification and configuration data, @@ -33,8 +31,17 @@ make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_prefix}/lib %{_datadir}/%{name}/* %changelog +* Mon Jul 20 2020 shixuantong -0.336-2 +- Type:NA +- ID:NA +- SUG:NA +- DESC:change patch file + * Sat Jun 20 2020 shixuantong -0.336-1 -- Update to 0.336 +- Type:NA +- ID:NA +- SUG:NA +- DESC:update to 0.336-1 * Mon Dec 23 2019 wangbin224 - 0.316-3 - Type:enhancement