From 8bacfb17293ab22832310012211b1b681df7ce24 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Wed, 3 Feb 2021 06:12:58 +0000
Subject: [PATCH] import lshw-B.02.19.2-5.el8

---
 ...rt-correct-memory-size-on-SMBIOS-2.7.patch | 36 +++++++++++++++++++
 SOURCES/0001-devtree-Add-UUID-property.patch  | 28 +++++++++++++++
 SPECS/lshw.spec                               | 10 +++++-
 3 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/0001-Report-correct-memory-size-on-SMBIOS-2.7.patch
 create mode 100644 SOURCES/0001-devtree-Add-UUID-property.patch

diff --git a/SOURCES/0001-Report-correct-memory-size-on-SMBIOS-2.7.patch b/SOURCES/0001-Report-correct-memory-size-on-SMBIOS-2.7.patch
new file mode 100644
index 0000000..4c5d93f
--- /dev/null
+++ b/SOURCES/0001-Report-correct-memory-size-on-SMBIOS-2.7.patch
@@ -0,0 +1,36 @@
+From 5c4bfb1a4baae1bea11cc9f629bc48ee12e733a7 Mon Sep 17 00:00:00 2001
+From: Lyonel Vincent <lyonel@ezix.org>
+Date: Sun, 10 Jan 2021 00:38:10 +0100
+Subject: [PATCH] Report correct memory size on SMBIOS < 2.7
+
+Github PR#60
+
+---
+ src/core/dmi.cc | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/core/dmi.cc b/src/core/dmi.cc
+index 30b3ab3b995c..d33d4879bdca 100644
+--- a/src/core/dmi.cc
++++ b/src/core/dmi.cc
+@@ -1567,10 +1567,13 @@ int dmiversionrev)
+ 
+ // size
+           u = data[0x0D] << 8 | data[0x0C];
+-          if(u == 0x7FFF) {
+-             unsigned long long extendsize = (data[0x1F] << 24) | (data[0x1E] << 16) | (data[0x1D] << 8) | data[0x1C];
+-             extendsize &= 0x7FFFFFFFUL;
+-             size = extendsize * 1024ULL * 1024ULL;
++          if ((dmiversionmaj > 2)
++            || ((dmiversionmaj == 2) && (dmiversionmin >= 7))) {
++             if(u == 0x7FFF) {
++                unsigned long long extendsize = (data[0x1F] << 24) | (data[0x1E] << 16) | (data[0x1D] << 8) | data[0x1C];
++                extendsize &= 0x7FFFFFFFUL;
++                size = extendsize * 1024ULL * 1024ULL;
++             }
+           }
+ 	  else
+           if (u != 0xFFFF)
+-- 
+2.17.1
+
diff --git a/SOURCES/0001-devtree-Add-UUID-property.patch b/SOURCES/0001-devtree-Add-UUID-property.patch
new file mode 100644
index 0000000..a69051e
--- /dev/null
+++ b/SOURCES/0001-devtree-Add-UUID-property.patch
@@ -0,0 +1,28 @@
+From 9c5c2f0706db330114ff4624e0931ac40c1d6fe2 Mon Sep 17 00:00:00 2001
+From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
+Date: Wed, 20 Jan 2021 11:28:47 +0530
+Subject: [PATCH] devtree: Add UUID property
+
+Add UUID property to PowerVM LPAR.
+
+Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
+---
+ src/core/device-tree.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/core/device-tree.cc b/src/core/device-tree.cc
+index d3188c6a8a27..7df6a4ee074c 100644
+--- a/src/core/device-tree.cc
++++ b/src/core/device-tree.cc
+@@ -1503,6 +1503,8 @@ bool scan_device_tree(hwNode & n)
+       scan_devtree_bootrom(*core);
+       if (exists(DEVICETREE "/ibm,lpar-capable")) {
+         n.setDescription("pSeries LPAR");
++        if (exists( DEVICETREE "/ibm,partition-uuid"))
++          n.setConfig("uuid", get_string(DEVICETREE "/ibm,partition-uuid"));
+         scan_devtree_cpu_power(*core);
+       }
+       else {
+-- 
+2.17.1
+
diff --git a/SPECS/lshw.spec b/SPECS/lshw.spec
index e7113d4..10fe40c 100644
--- a/SPECS/lshw.spec
+++ b/SPECS/lshw.spec
@@ -1,7 +1,7 @@
 Summary:       Hardware lister
 Name:          lshw
 Version:       B.02.19.2
-Release:       4%{?dist}
+Release:       5%{?dist}
 License:       GPLv2
 Group:         Applications/System
 URL:           http://ezix.org/project/wiki/HardwareLiSter
@@ -46,6 +46,8 @@ Patch37:       0016-Update-docs-TODO.patch
 Patch38:       0017-update-man-page.patch
 Patch39:       0018-fix-man-page-after-previous-update.patch
 Patch40:       rhelonly-cleanup-remove-unused-support.c-support.h-generated-.patch
+Patch41:       0001-Report-correct-memory-size-on-SMBIOS-2.7.patch
+Patch42:       0001-devtree-Add-UUID-property.patch
 
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
@@ -121,6 +123,8 @@ format.
 %patch38 -p1
 %patch39 -p1
 %patch40 -p1
+%patch41 -p1
+%patch42 -p1
 
 %build
 mkdir build && pushd build
@@ -168,6 +172,10 @@ src/lshw -json \
 %{_datadir}/polkit-1/actions/org.ezix.lshw.gui.policy
 
 %changelog
+* Tue Feb 02 2021 Lianbo Jiang <lijiang@redhat.com> - B.02.19.2-5
+- Fix the wrong memory information in azure m or mv2 series
+- Add UUID property to PowerVM LPAR
+
 * Wed Dec 16 2020 Lianbo Jiang <lijiang@redhat.com> - B.02.19.2-4
 - Fix the gtk3 dependency for lshw-gui instead of lshw
 - Resolves: rhbz#1905816