Hello community, here is the log from the commit of package lshw for openSUSE:Factory checked in at 2019-10-24 23:11:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lshw (Old) and /work/SRC/openSUSE:Factory/.lshw.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lshw" Thu Oct 24 23:11:00 2019 rev:10 rq:742629 version:B.02.18+git.20190613 Changes: -------- --- /work/SRC/openSUSE:Factory/lshw/lshw.changes 2019-05-02 19:21:56.637860347 +0200 +++ /work/SRC/openSUSE:Factory/.lshw.new.2990/lshw.changes 2019-10-24 23:11:11.848664671 +0200 @@ -1,0 +2,9 @@ +Thu Oct 24 14:25:29 UTC 2019 - Martin Pluskal <[email protected]> + +- 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.patch + +------------------------------------------------------------------- Old: ---- lshw-B.02.18+git.20190324.tar.xz lswh-logical-name-iface.patch New: ---- lshw-B.02.18+git.20190613.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lshw.spec ++++++ --- /var/tmp/diff_new_pack.kKkCBC/_old 2019-10-24 23:11:12.328665231 +0200 +++ /var/tmp/diff_new_pack.kKkCBC/_new 2019-10-24 23:11:12.332665236 +0200 @@ -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 @@ 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 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -96,7 +93,7 @@ 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}" \ ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.kKkCBC/_old 2019-10-24 23:11:12.368665278 +0200 +++ /var/tmp/diff_new_pack.kKkCBC/_new 2019-10-24 23:11:12.368665278 +0200 @@ -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> \ No newline at end of file + <param name="changesrevision">9567d10e4eb1c561030444dd3b7fe50ebb755f3e</param></service></servicedata> \ No newline at end of file ++++++ lshw-B.02.18+git.20190324.tar.xz -> lshw-B.02.18+git.20190613.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lshw-B.02.18+git.20190324/src/core/device-tree.cc new/lshw-B.02.18+git.20190613/src/core/device-tree.cc --- old/lshw-B.02.18+git.20190324/src/core/device-tree.cc 2019-03-24 11:18:57.000000000 +0100 +++ new/lshw-B.02.18+git.20190613/src/core/device-tree.cc 2019-06-13 22:23:04.000000000 +0200 @@ -863,6 +863,7 @@ close(fd); if (dimminfo[2] >= 9) { + int rank_offset; double ns; char vendor[5]; const char *type, *mod_type; @@ -879,6 +880,7 @@ partno_offset = 0x149; bus_width_offset = 0x0d; serial_offset = 0x145; + rank_offset = 0xc; /* * There is no other valid values for the medium- and fine- timebase @@ -897,6 +899,7 @@ partno_offset = 0x80; serial_offset = 0x7a; bus_width_offset = 0x08; + rank_offset = 0x7; ns = (dimminfo[0xc] / 2) * (dimminfo[0xa] / (float) dimminfo[0xb]); snprintf(vendor, sizeof(vendor), "%x%x", dimminfo[0x76], dimminfo[0x75]); @@ -914,6 +917,9 @@ break; } + // Add DIMM rank + bank.setConfig("rank", ((dimminfo[rank_offset] >> 3) & 0x7) + 1); + bank.setClock(1000000000 / ns); bank.setVendor(jedec_resolve(vendor)); @@ -1038,6 +1044,10 @@ if (exists("spd")) add_memory_bank_spd(path + "/" + name + "/spd", bank); + // Parse Memory SPD data + if (exists("frequency")) + bank.setClock(get_u32("frequency")); + memory->addChild(bank); } else if(name.substr(0, 4) == "dimm") { hwNode bank("bank", hw::memory); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lshw-B.02.18+git.20190324/src/core/hw.cc new/lshw-B.02.18+git.20190613/src/core/hw.cc --- old/lshw-B.02.18+git.20190324/src/core/hw.cc 2019-03-24 11:18:57.000000000 +0100 +++ new/lshw-B.02.18+git.20190613/src/core/hw.cc 2019-06-13 22:23:04.000000000 +0200 @@ -1284,8 +1284,8 @@ 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 == "") ++++++ lshw-display-latest-version.patch ++++++ --- /var/tmp/diff_new_pack.kKkCBC/_old 2019-10-24 23:11:12.908665908 +0200 +++ /var/tmp/diff_new_pack.kKkCBC/_new 2019-10-24 23:11:12.912665912 +0200 @@ -14,10 +14,10 @@ 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) ++++++ lshw-help-man.patch ++++++ --- /var/tmp/diff_new_pack.kKkCBC/_old 2019-10-24 23:11:12.952665959 +0200 +++ /var/tmp/diff_new_pack.kKkCBC/_new 2019-10-24 23:11:12.952665959 +0200 @@ -15,11 +15,11 @@ 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 @@ .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")); ++++++ lshw-modified-time.patch ++++++ --- /var/tmp/diff_new_pack.kKkCBC/_old 2019-10-24 23:11:12.956665964 +0200 +++ /var/tmp/diff_new_pack.kKkCBC/_new 2019-10-24 23:11:12.960665969 +0200 @@ -12,11 +12,11 @@ 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 @@ 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));
