pool/lshw
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to version B.02.18+git.20190613 (fate#326432 jsc#SLE-7715):

Browse Source 
* devtree: Add DIMM running speed
  * spd: Print dimm rank information
  * Display proper logical name of network device
- Drop no longer needed lswh-logical-name-iface.patc

OBS-URL: https://build.opensuse.org/package/show/hardware/lshw?expand=0&rev=29
This commit is contained in:
Martin Pluskal 2019-10-24 14:52:40 +00:00 committed by Git OBS Bridge
parent cfe9690692
commit 491fd965c0
9 changed files with 34 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/lyonel/lshw.git</param>
<param name="changesrevision">6cc0581bc805c8bf7ea057c065c3c36caf744ef3</param></service></servicedata>
<param name="changesrevision">9567d10e4eb1c561030444dd3b7fe50ebb755f3e</param></service></servicedata>

3
lshw-B.02.18+git.20190324.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:48026633a64f4d52db59b94e0de4913d06937195b6a956018af8da55a12d09e1
size 1695468

3
lshw-B.02.18+git.20190613.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:21711d339382ab834e242622bee7c040a75c499811d3159575acc8bfa9a876c9
size 1695448

8
lshw-display-latest-version.patch
View File

@ -14,10 +14,10 @@ Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
src/lshw.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lshw.cc b/src/lshw.cc
index 219a008..be233eb 100644
--- a/src/lshw.cc
+++ b/src/lshw.cc
Index: lshw-B.02.18+git.20190613/src/lshw.cc
===================================================================
--- lshw-B.02.18+git.20190613.orig/src/lshw.cc
+++ lshw-B.02.18+git.20190613/src/lshw.cc
@@ -121,7 +121,7 @@ char **argv)
printf("%s\n", getpackageversion());
if(latest)

18
lshw-help-man.patch
View File

@ -15,11 +15,11 @@ Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
src/lshw.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lshw.1 b/src/lshw.1
index 43239da..79c3619 100644
--- a/src/lshw.1
+++ b/src/lshw.1
@@ -53,7 +53,7 @@ Outputs the device tree showing hardware paths, very much like the output of HP-
Index: lshw-B.02.18+git.20190613/src/lshw.1
===================================================================
--- lshw-B.02.18+git.20190613.orig/src/lshw.1
+++ lshw-B.02.18+git.20190613/src/lshw.1
@@ -53,7 +53,7 @@ Outputs the device tree showing hardware
Outputs the device list showing bus information, detailing SCSI, USB, IDE and PCI addresses.
.TP
\fB-dump \fIfilename\fB\fR
@ -28,10 +28,10 @@ index 43239da..79c3619 100644
.TP
\fB-class \fIclass\fB\fR
Only show the given class of hardware. \fIclass\fR can be found using \fBlshw -short\fR or \fBlshw -businfo\fR\&.
diff --git a/src/lshw.cc b/src/lshw.cc
index 5fc8ade..219a008 100644
--- a/src/lshw.cc
+++ b/src/lshw.cc
Index: lshw-B.02.18+git.20190613/src/lshw.cc
===================================================================
--- lshw-B.02.18+git.20190613.orig/src/lshw.cc
+++ lshw-B.02.18+git.20190613/src/lshw.cc
@@ -35,7 +35,7 @@ void usage(const char *progname)
fprintf(stderr, _("\t-X use graphical interface\n"));
fprintf(stderr, _("\noptions can be\n"));

12
lshw-modified-time.patch
View File

@ -12,11 +12,11 @@ Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
src/core/volumes.cc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/core/volumes.cc b/src/core/volumes.cc
index 07a253b..456809a 100644
--- a/src/core/volumes.cc
+++ b/src/core/volumes.cc
@@ -651,8 +651,10 @@ static bool detect_hfsx(hwNode & n, source & s)
Index: lshw-B.02.18+git.20190613/src/core/volumes.cc
===================================================================
--- lshw-B.02.18+git.20190613.orig/src/core/volumes.cc
+++ lshw-B.02.18+git.20190613/src/core/volumes.cc
@@ -651,8 +651,10 @@ static bool detect_hfsx(hwNode & n, sour
wtime = (time_t)(be_long(&vol->modifyDate) - HFSTIMEOFFSET);
n.setConfig("created", datetime(mkfstime, false)); // creation time uses local time
if (enabled("output:time"))
@ -28,7 +28,7 @@ index 07a253b..456809a 100644
return true;
}
@@ -742,7 +744,7 @@ static bool detect_hfs(hwNode & n, source & s)
@@ -742,7 +744,7 @@ static bool detect_hfs(hwNode & n, sourc
n.setConfig("created", datetime(mkfstime - HFSTIMEOFFSET, false)); // all dates use local time
if(dumptime)
n.setConfig("backup", datetime(dumptime - HFSTIMEOFFSET, false));

9
lshw.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Oct 24 14:25:29 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
- Update to version B.02.18+git.20190613 (fate#326432 jsc#SLE-7715):
* devtree: Add DIMM running speed
* spd: Print dimm rank information
* Display proper logical name of network device
- Drop no longer needed lswh-logical-name-iface.patc
-------------------------------------------------------------------
Thu May 2 09:56:21 UTC 2019 - Martin Pluskal <mpluskal@suse.com>

7
lshw.spec
View File

@ -18,7 +18,7 @@
Name: lshw
Version: B.02.18+git.20190324
Version: B.02.18+git.20190613
Release: 0
Summary: HardWare LiSter
License: GPL-2.0-only
@ -27,8 +27,6 @@ URL: https://www.ezix.org/project/wiki/HardwareLiSter
Source: lshw-%{version}.tar.xz
Source1: lshw.desktop.in
Source2: lshw.png
# PATCH-FIX-UPSTREAM lswh-logical-name-iface.patch bsc#1133923
Patch0: lswh-logical-name-iface.patch
# PATCH-FIX-UPSTREAM lshw-display-latest-version.patch lshw-help-man.patch lshw-modified-time.patch bsc##1130818
Patch1: lshw-display-latest-version.patch
Patch2: lshw-help-man.patch
@ -82,7 +80,6 @@ http://www.ezix.org/software/lshw.html
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
@ -96,7 +93,7 @@ make \
all gui
%install
%make_install install-gui
%make_install install-gui VERSION="%{version}"
install -d "%{buildroot}%{_datadir}/applications"
sed 's,@@EXEC@@,%{_sbindir}/gtk-lshw,g' < "%{SOURCE1}" \

46
lswh-logical-name-iface.patch
View File

@ -1,46 +0,0 @@
From 85edb6a1a5734078a58bad21a5e6918e07f360bc Mon Sep 17 00:00:00 2001
From: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
Date: Tue, 30 Apr 2019 17:24:50 +0530
Subject: [PATCH] Display proper logical name of network device
This patch adds support to display proper logical name of
network devices.
Test results:
*-l-lan
description: Ethernet interface
physical id: 2
bus info: vio@30000002
logical name: /proc/device-tree/vdevice/l-lan@30000002
With patch:
*-l-lan
description: Ethernet interface
physical id: 2
bus info: vio@30000002
logical name: /proc/device-tree/vdevice/l-lan@30000002
logical name: eth0
Signed-off-by: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
Signed-off-by: Shivaprasad G Bhat <sbhat@linux.ibm.com>
---
src/core/hw.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/hw.cc b/src/core/hw.cc
index f136383..4522c1a 100644
--- a/src/core/hw.cc
+++ b/src/core/hw.cc
@@ -1284,8 +1284,8 @@ void hwNode::merge(const hwNode & node)
This->handle = node.getHandle();
if (This->description == "")
This->description = node.getDescription();
- if (This->logicalnames.size() == 0)
- This->logicalnames = node.getLogicalNames();
+ for (unsigned int i = 0; i < node.This->logicalnames.size(); i++)
+ setLogicalName(node.This->logicalnames[i]);
if (This->businfo == "")
This->businfo = node.getBusInfo();
if (This->physid == "")