From 4ae8bb96baf55e522b8b4cc6a2927371d30f082f Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Mon, 5 May 2025 15:40:55 +1200 Subject: [PATCH] Release B.02.20-7 Update lshw to upstream latest(98b74f64e76) Resolves: RHEL-84043 Signed-off-by: Tao Liu --- 0001-merge-Github-PR-103.patch | 151 +++++++++++++++++++++++++++++++++ lshw.spec | 6 +- 2 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 0001-merge-Github-PR-103.patch diff --git a/0001-merge-Github-PR-103.patch b/0001-merge-Github-PR-103.patch new file mode 100644 index 0000000..b7cfc5c --- /dev/null +++ b/0001-merge-Github-PR-103.patch @@ -0,0 +1,151 @@ +From 98b74f64e769fb1f317d68e9f421880d998ad5b3 Mon Sep 17 00:00:00 2001 +From: Lyonel Vincent +Date: Thu, 5 Dec 2024 11:15:54 +0100 +Subject: [PATCH] merge Github PR#103 + +cf. https://github.com/lyonel/lshw/pull/103 +--- + src/core/network.cc | 96 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 96 insertions(+) + +diff --git a/src/core/network.cc b/src/core/network.cc +index b38a032..d4094e5 100644 +--- a/src/core/network.cc ++++ b/src/core/network.cc +@@ -188,11 +188,35 @@ struct ethtool_value + #define SUPPORTED_1000baseKX_Full (1 << 17) + #define SUPPORTED_10000baseKX4_Full (1 << 18) + #define SUPPORTED_10000baseKR_Full (1 << 19) ++#define SUPPORTED_10000baseR_FEC (1 << 20) ++#define SUPPORTED_20000baseMLD2_Full (1 << 21) ++#define SUPPORTED_20000baseKR2_Full (1 << 22) + #define SUPPORTED_40000baseKR4_Full (1 << 23) + #define SUPPORTED_40000baseCR4_Full (1 << 24) + #define SUPPORTED_40000baseSR4_Full (1 << 25) + #define SUPPORTED_40000baseLR4_Full (1 << 26) ++#define SUPPORTED_56000baseKR4_Full (1 << 27) ++#define SUPPORTED_56000baseCR4_Full (1 << 28) ++#define SUPPORTED_56000baseSR4_Full (1 << 29) ++#define SUPPORTED_56000baseLR4_Full (1 << 30) + #define SUPPORTED_25000baseCR_Full (1 << 31) ++#define SUPPORTED_25000baseKR_Full (1 << 32) ++#define SUPPORTED_25000baseSR_Full (1 << 33) ++#define SUPPORTED_50000baseCR2_Full (1 << 34) ++#define SUPPORTED_50000baseKR2_Full (1 << 35) ++#define SUPPORTED_100000baseKR4_Full (1 << 36) ++#define SUPPORTED_100000baseSR4_Full (1 << 37) ++#define SUPPORTED_100000baseCR4_Full (1 << 38) ++#define SUPPORTED_100000baseLR4_ER4_Full (1 << 39) ++#define SUPPORTED_50000baseSR2_Full (1 << 40) ++#define SUPPORTED_1000baseX_Full (1 << 41) ++#define SUPPORTED_10000baseCR_Full (1 << 42) ++#define SUPPORTED_10000baseSR_Full (1 << 43) ++#define SUPPORTED_10000baseLR_Full (1 << 44) ++#define SUPPORTED_10000baseLRM_Full (1 << 45) ++#define SUPPORTED_10000baseER_Full (1 << 46) ++#define SUPPORTED_2500baseT_Full (1 << 47) ++#define SUPPORTED_5000baseT_Full (1 << 48) + + /* Indicates what features are supported by the interface, + * in the second word of the extended bitmap. */ +@@ -542,6 +566,16 @@ static void updateCapabilities(hwNode & interface, u32 supported, u32 supported2 + interface.addCapability("2500bx-fd", _("2.5Gbit/s (full duplex)")); + interface.setCapacity(2500000000ULL); + } ++ if(supported & SUPPORTED_2500baseT_Full) ++ { ++ interface.addCapability("2500bt-fd", _("2500Mbit/s (full duplex)")); ++ interface.setCapacity(2500000000ULL); ++ } ++ if(supported & SUPPORTED_5000baseT_Full) ++ { ++ interface.addCapability("5000bt-fd", _("5Gbit/s (full duplex)")); ++ interface.setCapacity(5000000000ULL); ++ } + if(supported2 & SUPPORTED2_2500baseT_Full) + { + interface.addCapability("2500bt-fd", _("2.5Gbit/s (full duplex)")); +@@ -564,18 +598,80 @@ static void updateCapabilities(hwNode & interface, u32 supported, u32 supported2 + interface.addCapability("10000bx-fd", _("10Gbit/s (full duplex)")); + interface.setCapacity(10000000000ULL); + } ++ if(supported & SUPPORTED_10000baseR_FEC) ++ { ++ interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)")); ++ interface.setCapacity(10000000000ULL); ++ } ++ if(supported & SUPPORTED_10000baseCR_Full) ++ { ++ interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)")); ++ interface.setCapacity(10000000000ULL); ++ } ++ if(supported & SUPPORTED_10000baseSR_Full) ++ { ++ interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)")); ++ interface.setCapacity(10000000000ULL); ++ } ++ if(supported & SUPPORTED_10000baseLR_Full) ++ { ++ interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)")); ++ interface.setCapacity(10000000000ULL); ++ } ++ if(supported & SUPPORTED_10000baseLRM_Full) ++ { ++ interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)")); ++ interface.setCapacity(10000000000ULL); ++ } ++ if(supported & SUPPORTED_10000baseER_Full) ++ { ++ interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)")); ++ interface.setCapacity(10000000000ULL); ++ } ++ if(supported & SUPPORTED_20000baseMLD2_Full) ++ { ++ interface.addCapability("20000bt-fd", _("20Gbit/s (full duplex)")); ++ interface.setCapacity(20000000000ULL); ++ } ++ if(supported & SUPPORTED_20000baseKR2_Full) ++ { ++ interface.addCapability("20000bt-fd", _("20Gbit/s (full duplex)")); ++ interface.setCapacity(20000000000ULL); ++ } + if((supported & SUPPORTED_25000baseCR_Full) || + (supported2 & (SUPPORTED2_25000baseKR_Full | SUPPORTED2_25000baseSR_Full))) + { + interface.addCapability("25000bx-fd", _("25Gbit/s (full duplex)")); + interface.setCapacity(25000000000ULL); + } ++ if(supported & SUPPORTED_25000baseKR_Full) ++ { ++ interface.addCapability("25000bt-fd", _("25Gbit/s (full duplex)")); ++ interface.setCapacity(25000000000ULL); ++ } ++ if(supported & SUPPORTED_25000baseSR_Full) ++ { ++ interface.addCapability("25000bt-fd", _("25Gbit/s (full duplex)")); ++ interface.setCapacity(25000000000ULL); ++ } + if(supported & (SUPPORTED_40000baseKR4_Full | SUPPORTED_40000baseCR4_Full | + SUPPORTED_40000baseSR4_Full | SUPPORTED_40000baseLR4_Full)) + { + interface.addCapability("40000bx-fd", _("40Gbit/s (full duplex)")); + interface.setCapacity(40000000000ULL); + } ++ if(supported & (SUPPORTED_50000baseCR2_Full | SUPPORTED_50000baseKR2_Full | ++ SUPPORTED_50000baseSR2_Full)) ++ { ++ interface.addCapability("50000bt-fd", _("50Gbit/s (full duplex)")); ++ interface.setCapacity(50000000000ULL); ++ } ++ if(supported & (SUPPORTED_56000baseCR4_Full | SUPPORTED_56000baseSR4_Full | ++ SUPPORTED_56000baseLR4_Full | SUPPORTED_56000baseKR4_Full)) ++ { ++ interface.addCapability("56000bt-fd", _("56Gbit/s (full duplex)")); ++ interface.setCapacity(56000000000ULL); ++ } + if(supported2 & (SUPPORTED2_100000baseKR4_Full | SUPPORTED2_100000baseSR4_Full | + SUPPORTED2_100000baseCR4_Full | SUPPORTED2_100000baseLR4_ER4_Full)) + { +-- +2.47.0 + diff --git a/lshw.spec b/lshw.spec index 07cc271..b252602 100644 --- a/lshw.spec +++ b/lshw.spec @@ -5,7 +5,7 @@ Summary: Hardware lister Name: lshw Version: B.02.20 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL-2.0-only URL: http://ezix.org/project/wiki/HardwareLiSter Source0: http://www.ezix.org/software/files/lshw-%{version}.tar.gz @@ -17,6 +17,7 @@ Patch4: 0002-update-data-files.patch Patch5: 0003-update-changelog.patch Patch6: 0004-escape-in-JSON-output.patch Patch7: 0005-merge-Github-PR-101.patch +Patch8: 0001-merge-Github-PR-103.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc @@ -109,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata %endif %changelog +* Mon May 5 2025 Tao Liu - B.02.20-7 +- Rebase to upstream 98b74f64e76 + * Tue Oct 29 2024 Troy Dawson - B.02.20-6 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018