rpms
/
lshw
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update lshw to upstream latest(a2b731e7ecf) 

Resolves: bz2032177

Signed-off-by: Tao Liu <ltao@redhat.com>
This commit is contained in:
Tao Liu 2021-12-24 11:29:48 +08:00
parent 7ec3ac3b76
commit 590477acba
64 changed files with 10021 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
0003-report-CPU-family-model-stepping.patch Normal file
View File

@ -0,0 +1,96 @@
From f914f225975bb4a146792c2b0181b8d0e01ff3a6 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Sat, 28 Mar 2020 11:54:10 +0100
Subject: [PATCH 03/65] report CPU family/model/stepping
---
src/core/cpuinfo.cc | 21 +++++++++++++++++++--
src/core/hw.cc | 20 ++++++++++++++++++++
src/core/hw.h | 1 +
3 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/src/core/cpuinfo.cc b/src/core/cpuinfo.cc
index 33085fd..eceb83a 100644
--- a/src/core/cpuinfo.cc
+++ b/src/core/cpuinfo.cc
@@ -463,6 +463,14 @@ string value)
}
if (id == "model name")
cpu->setProduct(value);
+ if (id == "microcode")
+ cpu->setConfig(id, stoll(value, NULL, 0));
+ if (id == "cpu family")
+ cpu->addHint(id, stoll(value, NULL, 0));
+ if (id == "model")
+ cpu->addHint(id, stoll(value, NULL, 0));
+ if (id == "stepping")
+ cpu->addHint(id, stoll(value, NULL, 0));
//if ((id == "cpu MHz") && (cpu->getSize() == 0))
//{
//cpu->setSize((long long) (1000000L * atof(value.c_str())));
@@ -667,8 +675,17 @@ bool scan_cpuinfo(hwNode & n)
}
hwNode *cpu = getcpu(n, 0);
- if(cpu && (n.getWidth()==0))
- n.setWidth(cpu->getWidth());
+ if(cpu)
+ {
+ hw::value family, model, stepping;
+ family = cpu->getHint("cpu family");
+ model = cpu->getHint("model");
+ stepping = cpu->getHint("stepping");
+ if(family.defined() && model.defined() && stepping.defined())
+ cpu->setVersion(tostring(family.asInteger())+"."+tostring(model.asInteger())+"."+tostring(stepping.asInteger()));
+ if(n.getWidth()==0)
+ n.setWidth(cpu->getWidth());
+ }
return true;
}
diff --git a/src/core/hw.cc b/src/core/hw.cc
index 4522c1a..a592730 100644
--- a/src/core/hw.cc
+++ b/src/core/hw.cc
@@ -2432,6 +2432,26 @@ string value::asString() const
}
+long long value::asInteger() const
+{
+ if(!This) return 0;
+
+ switch(This->type)
+ {
+ case hw::text:
+ return stoll(This->s, NULL, 0);
+ case hw::integer:
+ return This->ll;
+ case hw::boolean:
+ return This->b?1:0;
+ case hw::nil:
+ return 0;
+ };
+
+ return 0;
+}
+
+
bool value::defined() const
{
if(!This) return false;
diff --git a/src/core/hw.h b/src/core/hw.h
index 3cb782b..451e9b3 100644
--- a/src/core/hw.h
+++ b/src/core/hw.h
@@ -79,6 +79,7 @@ namespace hw
bool operator ==(const value &) const;
string asString() const;
+ long long asInteger() const;
bool defined() const;
private:
--
2.33.1

53
0004-move-PnP-devices-to-the-ISA-LPC-bridge.patch Normal file
View File

@ -0,0 +1,53 @@
From 126bc4387648fabf0478d0b869fe6bc52676b447 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Sun, 29 Mar 2020 19:25:39 +0200
Subject: [PATCH 04/65] move PnP devices to the ISA/LPC bridge
---
src/core/pnp.cc | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/core/pnp.cc b/src/core/pnp.cc
index 8c92adf..6a39185 100644
--- a/src/core/pnp.cc
+++ b/src/core/pnp.cc
@@ -165,6 +165,11 @@ hw::hwClass pnp_class(const string & pnpid)
return hw::generic;
}
+static bool ISAbridge(const hwNode & n)
+{
+ return n.getClass()==hw::bridge && n.isCapable("isa");
+}
+
bool scan_pnp(hwNode & n)
{
vector < sysfs::entry > entries = sysfs::entries_by_bus("pnp");
@@ -172,11 +177,12 @@ bool scan_pnp(hwNode & n)
if (entries.empty())
return false;
- hwNode *core = n.getChild("core");
- if (!core)
+ hwNode *isapnpbridge = n.findChild(ISAbridge);
+ if (!isapnpbridge) isapnpbridge = n.getChild("core");
+ if (!isapnpbridge)
{
n.addChild(hwNode("core", hw::bus));
- core = n.getChild("core");
+ isapnpbridge = n.getChild("core");
}
for (vector < sysfs::entry >::iterator it = entries.begin();
@@ -208,7 +214,7 @@ bool scan_pnp(hwNode & n)
device.setProduct("PnP device " + pnpid);
device.claim();
- core->addChild(device);
+ isapnpbridge->addChild(device);
}
return true;
}
--
2.33.1

33
0005-correctly-format-SMBIOS-UUID.patch Normal file
View File

@ -0,0 +1,33 @@
From bb82dda52da2029a527577a796daffcbc97d8e83 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Mon, 30 Mar 2020 23:36:15 +0200
Subject: [PATCH 05/65] correctly format SMBIOS UUID
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
cf. https://en.wikipedia.org/wiki/Universally_unique_identifier (RFC 4122 Section 3 requires that the characters be generated in lower case, while being case-insensitive on input.)
cf. https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf §7.2.1
---
src/core/dmi.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/dmi.cc b/src/core/dmi.cc
index c4c01e0..30b3ab3 100644
--- a/src/core/dmi.cc
+++ b/src/core/dmi.cc
@@ -195,8 +195,8 @@ static string dmi_uuid(const u8 * p)
return string(REMOVED);
snprintf(buffer, sizeof(buffer),
- "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X",
- p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[8], p[9], p[10],
+ "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+ p[3], p[2], p[1], p[0], p[5], p[4], p[7], p[6], p[8], p[9], p[10],
p[11], p[12], p[13], p[14], p[15]);
return hw::strip(string(buffer));
--
2.33.1

27
0006-cosmetic-clean-up.patch Normal file
View File

@ -0,0 +1,27 @@
From aea375aeb4f58a35afd1ec2998a04060bc8fccfa Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Tue, 31 Mar 2020 23:27:36 +0200
Subject: [PATCH 06/65] cosmetic clean-up
---
src/core/mmc.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/mmc.cc b/src/core/mmc.cc
index 96c2c49..1385e11 100644
--- a/src/core/mmc.cc
+++ b/src/core/mmc.cc
@@ -327,8 +327,8 @@ bool scan_mmc(hwNode & n)
device->setDescription("MMC Host");
device->setModalias(e.modalias());
- vector < sysfs::entry > namespaces = e.devices();
- for(vector < sysfs::entry >::iterator i = namespaces.begin(); i != namespaces.end(); ++i)
+ vector < sysfs::entry > devices = e.devices();
+ for(vector < sysfs::entry >::iterator i = devices.begin(); i != devices.end(); ++i)
{
const sysfs::entry & d = *i;
--
2.33.1

222
0007-begin-work-on-input-devices.patch Normal file
View File

@ -0,0 +1,222 @@
From 691ed58e2838ca3e50e899f013e259ea84f6bfe9 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Wed, 1 Apr 2020 00:43:15 +0200
Subject: [PATCH 07/65] begin work on input devices
still missing:
* capabilities
* properties
* report at least as much information as /proc/bus/input/devices
---
src/core/hw.cc | 2 +-
src/core/input.cc | 146 ++++++++++++++++++++++++++++++++++++++++++++++
src/core/input.h | 8 +++
src/core/main.cc | 4 ++
5 files changed, 160 insertions(+), 2 deletions(-)
create mode 100644 src/core/input.cc
create mode 100644 src/core/input.h
diff --git a/src/core/hw.cc b/src/core/hw.cc
index a592730..f7da370 100644
--- a/src/core/hw.cc
+++ b/src/core/hw.cc
@@ -1083,7 +1083,7 @@ void hwNode::setLogicalName(const string & name)
This->logicalnames.push_back("/dev/" + n);
}
else
- This->logicalnames.push_back(n);
+ This->logicalnames.push_back(basename(n.c_str()));
if(This->dev == "")
This->dev = get_devid(n);
diff --git a/src/core/input.cc b/src/core/input.cc
new file mode 100644
index 0000000..1f14fa9
--- /dev/null
+++ b/src/core/input.cc
@@ -0,0 +1,146 @@
+#include "version.h"
+#include "hw.h"
+#include "sysfs.h"
+#include "osutils.h"
+#include "input.h"
+#include "disk.h"
+#include "heuristics.h"
+
+#include <vector>
+#include <iostream>
+
+__ID("@(#) $Id$");
+
+#define BUS_PCI 0x01
+#define BUS_ISAPNP 0x02
+#define BUS_USB 0x03
+#define BUS_HIL 0x04
+#define BUS_BLUETOOTH 0x05
+#define BUS_VIRTUAL 0x06
+
+#define BUS_ISA 0x10
+#define BUS_I8042 0x11
+#define BUS_XTKBD 0x12
+#define BUS_RS232 0x13
+#define BUS_GAMEPORT 0x14
+#define BUS_PARPORT 0x15
+#define BUS_AMIGA 0x16
+#define BUS_ADB 0x17
+#define BUS_I2C 0x18
+#define BUS_HOST 0x19
+#define BUS_GSC 0x1A
+#define BUS_ATARI 0x1B
+#define BUS_SPI 0x1C
+#define BUS_RMI 0x1D
+#define BUS_CEC 0x1E
+#define BUS_INTEL_ISHTP 0x1F
+
+using namespace std;
+
+bool scan_input(hwNode & n)
+{
+ vector < sysfs::entry > entries = sysfs::entries_by_class("input");
+
+ if (entries.empty())
+ return false;
+
+ for (vector < sysfs::entry >::iterator it = entries.begin();
+ it != entries.end(); ++it)
+ {
+ const sysfs::entry & e = *it;
+
+ if(!e.hassubdir("id")) continue;
+
+ hwNode *device = n.findChildByBusInfo(e.leaf().businfo());
+ if(!device)
+ device = n.addChild(hwNode("input", hw::input));
+ else
+ {
+ if(device->getClass() == hw::generic)
+ device->setClass(hw::input);
+ }
+ device->claim();
+ device->setLogicalName("input/"+e.name());
+ device->setProduct(e.string_attr("name"));
+ device->setModalias(e.modalias());
+ switch(e.hex_attr("id/bustype"))
+ {
+ case BUS_PCI:
+ device->addCapability("pci", "PCI");
+ break;
+ case BUS_ISAPNP:
+ device->addCapability("isa", "ISA");
+ device->addCapability("pnp", "PnP");
+ break;
+ case BUS_USB:
+ device->addCapability("usb", "USB");
+ break;
+ case BUS_HIL:
+ device->addCapability("hil", "HP-HIL");
+ break;
+ case BUS_BLUETOOTH:
+ device->addCapability("bt", "Bluetooth");
+ break;
+ case BUS_VIRTUAL:
+ device->addCapability("virtual");
+ break;
+ case BUS_ISA:
+ device->addCapability("isa", "ISA bus");
+ break;
+ case BUS_I8042:
+ device->addCapability("i8042", "i8042 PC AT keyboard controller");
+ break;
+ case BUS_XTKBD:
+ device->addCapability("xtkbd", "XT keyboard controller");
+ break;
+ case BUS_RS232:
+ device->addCapability("rs232", "RS-232 serial");
+ break;
+ case BUS_GAMEPORT:
+ device->addCapability("gameport", "game port");
+ break;
+ case BUS_PARPORT:
+ device->addCapability("parport", "parallel port");
+ break;
+ case BUS_AMIGA:
+ device->addCapability("amiga", "Amiga bus");
+ break;
+ case BUS_ADB:
+ device->addCapability("adb", "Apple Desktop Bus");
+ break;
+ case BUS_I2C:
+ device->addCapability("i2c", "I²C bus");
+ break;
+ case BUS_HOST:
+ device->addCapability("host");
+ break;
+ case BUS_GSC:
+ device->addCapability("gsc", "GSC bus");
+ break;
+ case BUS_ATARI:
+ device->addCapability("atari", "Atari bus");
+ break;
+ case BUS_SPI:
+ device->addCapability("spi", "SPI");
+ break;
+ case BUS_RMI:
+ device->addCapability("rmi", "RMI");
+ break;
+ case BUS_CEC:
+ device->addCapability("cec", "CEC");
+ break;
+ case BUS_INTEL_ISHTP:
+ device->addCapability("intelishtp", "Intel Integrated Sensor Hub");
+ break;
+ }
+
+ vector < sysfs::entry > events = e.devices();
+ for(vector < sysfs::entry >::iterator i = events.begin(); i != events.end(); ++i)
+ {
+ const sysfs::entry & d = *i;
+ device->setLogicalName("input/"+d.name());
+ }
+ }
+
+ return true;
+}
diff --git a/src/core/input.h b/src/core/input.h
new file mode 100644
index 0000000..1bf2383
--- /dev/null
+++ b/src/core/input.h
@@ -0,0 +1,8 @@
+#ifndef _INPUT_H_
+#define _INPUT_H_
+
+#include "hw.h"
+
+bool scan_input(hwNode &);
+
+#endif
diff --git a/src/core/main.cc b/src/core/main.cc
index d0d7f10..ad0e586 100644
--- a/src/core/main.cc
+++ b/src/core/main.cc
@@ -45,6 +45,7 @@
#include "vio.h"
#include "nvme.h"
#include "mmc.h"
+#include "input.h"
#include "smp.h"
#include "abi.h"
#include "s390.h"
@@ -140,6 +141,9 @@ bool scan_system(hwNode & system)
status("MMC");
if (enabled("mmc"))
scan_mmc(computer);
+ status("input");
+ if (enabled("input"))
+ scan_input(computer);
status("S/390 devices");
if (enabled("s390"))
scan_s390_devices(computer);
--
2.33.1

34
0008-cosmetic-fixes.patch Normal file
View File

@ -0,0 +1,34 @@
From 7edaa09faa5755e44f2c6226f3447536658300af Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Thu, 2 Apr 2020 13:21:58 +0200
Subject: [PATCH 08/65] cosmetic fixes
---
src/core/input.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/input.cc b/src/core/input.cc
index 1f14fa9..a8d8eaf 100644
--- a/src/core/input.cc
+++ b/src/core/input.cc
@@ -79,7 +79,7 @@ bool scan_input(hwNode & n)
device->addCapability("hil", "HP-HIL");
break;
case BUS_BLUETOOTH:
- device->addCapability("bt", "Bluetooth");
+ device->addCapability("bluetooth", "Bluetooth");
break;
case BUS_VIRTUAL:
device->addCapability("virtual");
@@ -112,7 +112,7 @@ bool scan_input(hwNode & n)
device->addCapability("i2c", "I²C bus");
break;
case BUS_HOST:
- device->addCapability("host");
+ device->addCapability("platform");
break;
case BUS_GSC:
device->addCapability("gsc", "GSC bus");
--
2.33.1

141
0009-detect-sound-devices.patch Normal file
View File

@ -0,0 +1,141 @@
From 1cc52cac74ea735faae92dc963d10292608d7a4d Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Thu, 2 Apr 2020 13:39:42 +0200
Subject: [PATCH 09/65] detect sound devices
---
src/core/main.cc | 4 ++++
src/core/sound.cc | 53 +++++++++++++++++++++++++++++++++++++++++++++++
src/core/sound.h | 8 +++++++
src/core/sysfs.cc | 5 +++++
src/core/sysfs.h | 1 +
6 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 src/core/sound.cc
create mode 100644 src/core/sound.h
diff --git a/src/core/main.cc b/src/core/main.cc
index ad0e586..e35258c 100644
--- a/src/core/main.cc
+++ b/src/core/main.cc
@@ -46,6 +46,7 @@
#include "nvme.h"
#include "mmc.h"
#include "input.h"
+#include "sound.h"
#include "smp.h"
#include "abi.h"
#include "s390.h"
@@ -141,6 +142,9 @@ bool scan_system(hwNode & system)
status("MMC");
if (enabled("mmc"))
scan_mmc(computer);
+ status("sound");
+ if (enabled("sound"))
+ scan_sound(computer);
status("input");
if (enabled("input"))
scan_input(computer);
diff --git a/src/core/sound.cc b/src/core/sound.cc
new file mode 100644
index 0000000..05edf23
--- /dev/null
+++ b/src/core/sound.cc
@@ -0,0 +1,53 @@
+#include "version.h"
+#include "hw.h"
+#include "sysfs.h"
+#include "osutils.h"
+#include "sound.h"
+#include "heuristics.h"
+
+#include <vector>
+#include <iostream>
+
+__ID("@(#) $Id$");
+
+using namespace std;
+
+bool scan_sound(hwNode & n)
+{
+ vector < sysfs::entry > entries = sysfs::entries_by_class("sound");
+
+ if (entries.empty())
+ return false;
+
+ for (vector < sysfs::entry >::iterator it = entries.begin();
+ it != entries.end(); ++it)
+ {
+ const sysfs::entry & e = *it;
+ string id = e.string_attr("id");
+ if(id!="")
+ {
+ hwNode *device = n.findChildByBusInfo(e.leaf().businfo());
+ if(!device)
+ device = n.addChild(hwNode("sound", hw::multimedia));
+ device->claim();
+ if(device->getDescription() == "") device->setDescription(id);
+ //device->setPhysId(e.hex_attr("number"));
+ //device->setBusInfo("sound@"+e.string_attr("number"));
+ device->setLogicalName("snd/"+e.name());
+ if(device->getProduct() == "") device->setProduct(e.string_attr("name"));
+ device->setModalias(e.modalias());
+
+ vector < sysfs::entry > events = e.devices();
+ for(vector < sysfs::entry >::iterator i = events.begin(); i != events.end(); ++i)
+ {
+ const sysfs::entry & d = *i;
+ if(d.subsystem() == "sound")
+ {
+ device->setLogicalName("snd/"+d.name());
+ }
+ }
+ }
+ }
+
+ return true;
+}
diff --git a/src/core/sound.h b/src/core/sound.h
new file mode 100644
index 0000000..c2caf04
--- /dev/null
+++ b/src/core/sound.h
@@ -0,0 +1,8 @@
+#ifndef _SOUND_H_
+#define _SOUND_H_
+
+#include "hw.h"
+
+bool scan_sound(hwNode &);
+
+#endif
diff --git a/src/core/sysfs.cc b/src/core/sysfs.cc
index 32d6564..ee8b1da 100644
--- a/src/core/sysfs.cc
+++ b/src/core/sysfs.cc
@@ -343,6 +343,11 @@ string entry::classname() const
return basename(dirname(This->devpath).c_str());
}
+string entry::subsystem() const
+{
+ return basename(realpath(This->devpath+"/subsystem").c_str());
+}
+
bool entry::isvirtual() const
{
return string(basename(dirname(dirname(This->devpath)).c_str())) == "virtual";
diff --git a/src/core/sysfs.h b/src/core/sysfs.h
index 9cc1b2b..c25430b 100644
--- a/src/core/sysfs.h
+++ b/src/core/sysfs.h
@@ -26,6 +26,7 @@ namespace sysfs
bool hassubdir(const string &) const;
string name() const;
string classname() const;
+ string subsystem() const;
bool isvirtual() const;
string businfo() const;
string driver() const;
--
2.33.1

102
0010-detect-framebuffers.patch Normal file
View File

@ -0,0 +1,102 @@
From 755371fc1590e752380822ffdb320484e3b6851f Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Thu, 2 Apr 2020 14:54:03 +0200
Subject: [PATCH 10/65] detect framebuffers
---
src/core/graphics.cc | 44 ++++++++++++++++++++++++++++++++++++++++++++
src/core/graphics.h | 8 ++++++++
src/core/main.cc | 4 ++++
4 files changed, 57 insertions(+), 1 deletion(-)
create mode 100644 src/core/graphics.cc
create mode 100644 src/core/graphics.h
diff --git a/src/core/graphics.cc b/src/core/graphics.cc
new file mode 100644
index 0000000..a8d490c
--- /dev/null
+++ b/src/core/graphics.cc
@@ -0,0 +1,44 @@
+#include "version.h"
+#include "hw.h"
+#include "sysfs.h"
+#include "osutils.h"
+#include "graphics.h"
+#include "heuristics.h"
+
+#include <vector>
+#include <iostream>
+
+__ID("@(#) $Id$");
+
+using namespace std;
+
+bool scan_graphics(hwNode & n)
+{
+ vector < sysfs::entry > entries = sysfs::entries_by_class("graphics");
+
+ if (entries.empty())
+ return false;
+
+ for (vector < sysfs::entry >::iterator it = entries.begin();
+ it != entries.end(); ++it)
+ {
+ const sysfs::entry & e = *it;
+ string dev = e.string_attr("dev");
+ if(dev!="")
+ {
+ hwNode *device = n.findChildByBusInfo(e.leaf().businfo());
+ if(!device)
+ device = n.addChild(hwNode("graphics", hw::display));
+ device->claim();
+ device->setLogicalName(e.name());
+ device->addCapability("fb", "framebuffer");
+ if(device->getProduct() == "") device->setProduct(e.string_attr("name"));
+ string resolution = e.string_attr("virtual_size");
+ string depth = e.string_attr("bits_per_pixel");
+ if(resolution != "") device->setConfig("resolution", resolution);
+ if(depth != "") device->setConfig("depth", depth);
+ }
+ }
+
+ return true;
+}
diff --git a/src/core/graphics.h b/src/core/graphics.h
new file mode 100644
index 0000000..c30f0bf
--- /dev/null
+++ b/src/core/graphics.h
@@ -0,0 +1,8 @@
+#ifndef _GRAPHICS_H_
+#define _GRAPHICS_H_
+
+#include "hw.h"
+
+bool scan_graphics(hwNode &);
+
+#endif
diff --git a/src/core/main.cc b/src/core/main.cc
index e35258c..ac2fba0 100644
--- a/src/core/main.cc
+++ b/src/core/main.cc
@@ -47,6 +47,7 @@
#include "mmc.h"
#include "input.h"
#include "sound.h"
+#include "graphics.h"
#include "smp.h"
#include "abi.h"
#include "s390.h"
@@ -145,6 +146,9 @@ bool scan_system(hwNode & system)
status("sound");
if (enabled("sound"))
scan_sound(computer);
+ status("graphics");
+ if (enabled("graphics"))
+ scan_graphics(computer);
status("input");
if (enabled("input"))
scan_input(computer);
--
2.33.1

29
0011-try-to-connect-input-devices-to-the-right-parent.patch Normal file
View File

@ -0,0 +1,29 @@
From f6138333811f7f2bf01551c70f5726f7c556dd36 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Fri, 3 Apr 2020 22:42:21 +0200
Subject: [PATCH 11/65] try to connect input devices to the right parent
---
src/core/input.cc | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/core/input.cc b/src/core/input.cc
index a8d8eaf..ab37d37 100644
--- a/src/core/input.cc
+++ b/src/core/input.cc
@@ -52,6 +52,12 @@ bool scan_input(hwNode & n)
if(!e.hassubdir("id")) continue;
hwNode *device = n.findChildByBusInfo(e.leaf().businfo());
+ if(!device)
+ {
+ device = n.findChildByBusInfo(e.leaf().parent().businfo());
+ if(device)
+ device = device->addChild(hwNode("input", hw::input));
+ }
if(!device)
device = n.addChild(hwNode("input", hw::input));
else
--
2.33.1

39
0012-devtree-Add-chip-id-from-the-dimm-module.patch Normal file
View File

@ -0,0 +1,39 @@
From 4c19563dae05d3a730bb67917f1810eb33a54613 Mon Sep 17 00:00:00 2001
From: Shivaprasad G Bhat <sbhat@linux.ibm.com>
Date: Fri, 6 Mar 2020 04:41:33 -0600
Subject: [PATCH 12/65] devtree: Add chip-id from the dimm module
Add chip-id from dimm module into the configuration if available. DIMM's are
behind the CHIP on Power systems. By adding chip-id it helps to map what dimm
is sitting behind which chip.
Sample output:
*-bank:0
description: 16GB CDIMM
product: 41T9571 FRU# 41T9571
physical id: 0
.....
configuration: chip-id=0
Signed-off-by: Shivaprasad G Bhat <sbhat@linux.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 490e197..f43d34f 100644
--- a/src/core/device-tree.cc
+++ b/src/core/device-tree.cc
@@ -1031,6 +1031,8 @@ static void add_memory_bank(string name, string path, hwNode & core)
if(exists("description"))
description = hw::strip(get_string("description"));
bank.setDescription(description);
+ if (exists("ibm,chip-id"))
+ bank.setConfig("chip-id", get_u32("ibm,chip-id"));
if(exists("ibm,loc-code"))
bank.setSlot(hw::strip(get_string("ibm,loc-code")));
--
2.33.1

40
0013-devtree-Add-chip-id-from-CPU-node.patch Normal file
View File

@ -0,0 +1,40 @@
From 872b0996df37aae586575ca8021c2509c05067b0 Mon Sep 17 00:00:00 2001
From: Shivaprasad G Bhat <sbhat@linux.ibm.com>
Date: Fri, 6 Mar 2020 04:41:33 -0600
Subject: [PATCH 13/65] devtree: Add chip-id from CPU node
Add chip-id from CPU node into the configuration if available. CPU's are
behind the CHIP on Power systems. By adding chip-id it helps to map what cpus
are sitting behind which chip.
Sample output:
*-cpu:10
description: POWER8E (raw), altivec supported
product: 00FX746 FRU# 00FX522
physical id: 176
bus info: cpu@10
version: 2.1 (pvr 004b 0201)
...
configuration: chip-id=1 threads=8
Signed-off-by: Shivaprasad G Bhat <sbhat@linux.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 f43d34f..af665a4 100644
--- a/src/core/device-tree.cc
+++ b/src/core/device-tree.cc
@@ -492,6 +492,8 @@ static void fill_core_vpd(hwNode & cpu, string & basepath,
return;
chip_id = get_u32(basepath + "/ibm,chip-id");
+ cpu.setConfig("chip-id", chip_id);
+
data = chip_vpd[chip_id];
xscom_path = xscoms[chip_id];
--
2.33.1

4
lshw-fix-segfault-in-apfs-volume-code.patch → 0014-volumes-fix-segfault-in-apfs-volume-code.patch
View File

@ -1,7 +1,7 @@
From 82df4fa7d3705f2f61282ed5b22074d4e0a6efc4 Mon Sep 17 00:00:00 2001
From: Harry Mallon <hjmallon@gmail.com>
Date: Thu, 23 Apr 2020 21:18:47 +0100
Subject: [PATCH] volumes: fix segfault in apfs volume code
Subject: [PATCH 14/65] volumes: fix segfault in apfs volume code
---
src/core/volumes.cc | 3 ++-
@ -26,4 +26,6 @@ index e703523..6fce2ee 100644
if(readlogicalblocks(apfsvolume, buffer, 0, 1)!=1)
return false;
--
2.33.1

58
0015-merge-Github-PR-53.patch Normal file
View File

@ -0,0 +1,58 @@
From 89759485f86a48526b4f508a10f7478c76a3f71e Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Fri, 15 May 2020 16:00:08 +0200
Subject: [PATCH 15/65] merge Github PR #53
---
src/core/cpuinfo.cc | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/core/cpuinfo.cc b/src/core/cpuinfo.cc
index eceb83a..49f3052 100644
--- a/src/core/cpuinfo.cc
+++ b/src/core/cpuinfo.cc
@@ -446,6 +446,7 @@ string value)
if (cpu)
{
+ hw::value family, model, stepping;
// x86 CPUs are assumed to be 32 bits per default
if(cpu->getWidth()==0) cpu->setWidth(32);
@@ -471,6 +472,13 @@ string value)
cpu->addHint(id, stoll(value, NULL, 0));
if (id == "stepping")
cpu->addHint(id, stoll(value, NULL, 0));
+
+ family = cpu->getHint("cpu family");
+ model = cpu->getHint("model");
+ stepping = cpu->getHint("stepping");
+ if(family.defined() && model.defined() && stepping.defined())
+ cpu->setVersion(tostring(family.asInteger())+"."+tostring(model.asInteger())+"."+tostring(stepping.asInteger()));
+
//if ((id == "cpu MHz") && (cpu->getSize() == 0))
//{
//cpu->setSize((long long) (1000000L * atof(value.c_str())));
@@ -675,17 +683,8 @@ bool scan_cpuinfo(hwNode & n)
}
hwNode *cpu = getcpu(n, 0);
- if(cpu)
- {
- hw::value family, model, stepping;
- family = cpu->getHint("cpu family");
- model = cpu->getHint("model");
- stepping = cpu->getHint("stepping");
- if(family.defined() && model.defined() && stepping.defined())
- cpu->setVersion(tostring(family.asInteger())+"."+tostring(model.asInteger())+"."+tostring(stepping.asInteger()));
- if(n.getWidth()==0)
- n.setWidth(cpu->getWidth());
- }
+ if(cpu && (n.getWidth()==0))
+ n.setWidth(cpu->getWidth());
return true;
}
--
2.33.1

96
0016-devtree-Add-capabilites-to-the-OPAL-Firmware.patch Normal file
View File

@ -0,0 +1,96 @@
From 29f69ac618fd5ace9ed9aae7839b5cfdc1fb5130 Mon Sep 17 00:00:00 2001
From: Shivaprasad G Bhat <sbhat@linux.ibm.com>
Date: Wed, 1 Apr 2020 09:25:52 -0500
Subject: [PATCH 16/65] devtree: Add capabilites to the OPAL Firmware
On OpenPower systems, the presence of the "/ibm,opal" entry in the device tree
signifies machines are running under OPAL firmware (i.e skiboot). Under this
node OPAL exports certain available interfaces. And also this node have a
compatible property listing "ibm,opal-v<X> which denotes the OPAL compatability.
This change adds a function to parse information about those OPAL firmware
capabilities and add it to skiboot firmware node. With a current OpenPower
machine, we get something like this:
*-firmware:0
description: skiboot
product: OPAL firmware
physical id: 2
version: 5.4.3-35bf9d9
capabilities: opal-v2 opal-v3 prd ipmi
Signed-off-by: Pridhiviraj Paidipeddi <ppaidipe@linux.vnet.ibm.com>
Signed-off-by: Shivaprasad G Bhat <sbhat@linux.ibm.com>
---
src/core/device-tree.cc | 42 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/src/core/device-tree.cc b/src/core/device-tree.cc
index af665a4..e7227e1 100644
--- a/src/core/device-tree.cc
+++ b/src/core/device-tree.cc
@@ -219,11 +219,48 @@ static void scan_devtree_bootrom(hwNode & core)
}
}
+static hwNode *add_base_opal_node(hwNode & core)
+{
+ vector < string >:: iterator it;
+ vector < string > compat;
+ string basepath = DEVICETREE "/ibm,opal";
+ hwNode opal("firmware");
+
+ if (!exists(basepath))
+ return NULL;
+
+ pushd(basepath);
+
+ opal.setProduct("OPAL firmware");
+ opal.setDescription("skiboot");
+
+ compat = get_strings(basepath + "/compatible");
+ for (it = compat.begin(); it != compat.end(); ++it) {
+ if (matches(*it, "^ibm,opal-v"))
+ opal.addCapability((*it).erase(0,4));
+ }
+
+ if (exists(basepath + "/ipmi/compatible") &&
+ matches(get_string(basepath + "/ipmi/compatible"), "^ibm,opal-ipmi"))
+ opal.addCapability("ipmi");
+
+ if (exists(basepath + "/diagnostics/compatible") &&
+ matches(get_string(basepath + "/diagnostics/compatible"), "^ibm,opal-prd"))
+ opal.addCapability("prd");
+
+ popd();
+
+ opal.claim();
+ return core.addChild(opal);
+}
+
static void scan_devtree_firmware_powernv(hwNode & core)
{
int n;
struct dirent **namelist;
+ hwNode *opal = add_base_opal_node(core);
+
if (!exists(DEVICETREE "/ibm,firmware-versions"))
return;
@@ -245,6 +282,11 @@ static void scan_devtree_firmware_powernv(hwNode & core)
fwnode.setDescription(sname);
fwnode.setVersion(hw::strip(get_string(fullpath)));
fwnode.claim();
+ if (opal && sname == "skiboot") {
+ opal->merge(fwnode);
+ free(namelist[i]);
+ continue;
+ }
core.addChild(fwnode);
}
free(namelist[i]);
--
2.33.1

29
0017-fix-issue-with-logical-names-being-truncated-dev-sda.patch Normal file
View File

@ -0,0 +1,29 @@
From 4348e283f8a0bdd40b97c5d0b6e12354576b3113 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Mon, 25 May 2020 09:31:05 +0200
Subject: [PATCH 17/65] =?UTF-8?q?fix=20issue=20with=20logical=20names=20be?=
=?UTF-8?q?ing=20truncated=20(`/dev/sda`=20=E2=86=92=20`sda`)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/core/hw.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/hw.cc b/src/core/hw.cc
index f7da370..aca424c 100644
--- a/src/core/hw.cc
+++ b/src/core/hw.cc
@@ -1083,7 +1083,7 @@ void hwNode::setLogicalName(const string & name)
This->logicalnames.push_back("/dev/" + n);
}
else
- This->logicalnames.push_back(basename(n.c_str()));
+ This->logicalnames.push_back((n[0]=='/')?n:basename(n.c_str()));
if(This->dev == "")
This->dev = get_devid(n);
--
2.33.1

23
lshw-fix-mmc.patch → 0018-code-clean-up-for-read-3.patch
View File

@ -1,25 +1,20 @@
From 2524bb3def3009e53a78e600bbea2c4639dc1e99 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Fri, 24 Apr 2020 15:02:44 +0200
Subject: [PATCH] Fix type used for read to ssize_t.
From 37c3f3934b9d03be2d0ec70caf3779e03c003c5a Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Mon, 25 May 2020 15:24:38 +0200
Subject: [PATCH 18/65] code clean-up for read(3)
Function declaration:
ssize_t read(int fd, void *buf, size_t count);
With size_t the following expression is always true:
while ((count = read(cpuinfo, buffer, sizeof(buffer))) > 0)
and bad things happen.
use ssize_t instead of size_t
cf. Github PR #52
---
src/core/cpuinfo.cc | 2 +-
src/core/osutils.cc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/core/cpuinfo.cc b/src/core/cpuinfo.cc
index eceb83a..3dbdd0c 100644
index 49f3052..9e41a42 100644
--- a/src/core/cpuinfo.cc
+++ b/src/core/cpuinfo.cc
@@ -589,7 +589,7 @@ bool scan_cpuinfo(hwNode & n)
@@ -597,7 +597,7 @@ bool scan_cpuinfo(hwNode & n)
if (core)
{
char buffer[1024];
@ -50,4 +45,6 @@ index f023a46..a53ed89 100644
memset(buffer, 0, sizeof(buffer));
result = "";
--
2.33.1

49
0019-JSON-output-clean-up-list-object.patch Normal file
View File

@ -0,0 +1,49 @@
From 2b1c730b493d647bbab4854713571458e82a81e7 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Tue, 26 May 2020 01:00:37 +0200
Subject: [PATCH 19/65] JSON output clean-up (list/object)
---
src/core/hw.cc | 5 ++---
src/lshw.cc | 1 +
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/core/hw.cc b/src/core/hw.cc
index aca424c..ab345fe 100644
--- a/src/core/hw.cc
+++ b/src/core/hw.cc
@@ -1400,7 +1400,7 @@ string hwNode::asJSON(unsigned level)
config = getConfigKeys();
resources = getResources("\" value=\"");
- if (level == 0)
+ if (::enabled("output:list") && level == 0)
{
out << "[" << endl;
}
@@ -1665,9 +1665,8 @@ string hwNode::asJSON(unsigned level)
out << "}";
}
- if (level == 0)
+ if (::enabled("output:list") && level == 0)
{
- out.seekp(-2, std::ios_base::end);
out << endl << "]" << endl;
}
diff --git a/src/lshw.cc b/src/lshw.cc
index 219a008..571b1c3 100644
--- a/src/lshw.cc
+++ b/src/lshw.cc
@@ -84,6 +84,7 @@ char **argv)
disable("isapnp");
+ disable("output:list");
disable("output:json");
disable("output:db");
disable("output:xml");
--
2.33.1

62
0020-clean-up-JSON-output.patch Normal file
View File

@ -0,0 +1,62 @@
From 15565229509455527de9ce7cbb9530e2b31d043b Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Wed, 27 May 2020 01:07:16 +0200
Subject: [PATCH 20/65] clean-up JSON output
---
src/core/hw.cc | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/core/hw.cc b/src/core/hw.cc
index ab345fe..6aea7cf 100644
--- a/src/core/hw.cc
+++ b/src/core/hw.cc
@@ -1650,13 +1650,20 @@ string hwNode::asJSON(unsigned level)
resources.clear();
}
- for (unsigned int i = 0; i < countChildren(); i++)
+ if(!::enabled("output:list") && countChildren()>0)
{
- out << getChild(i)->asJSON(visible(getClassName()) ? level + 2 : 1);
- if (visible(getChild(i)->getClassName()))
+ out << "," << endl;
+ out << spaces(2*level+2);
+ out << "\"children\" : [";
+ for (unsigned int i = 0; i < countChildren(); i++)
{
- out << "," << endl;
+ out << getChild(i)->asJSON(visible(getClassName()) ? level + 2 : 1);
+ if (visible(getChild(i)->getClassName()) && i<countChildren()-1)
+ {
+ out << "," << endl;
+ }
}
+ out << "]";
}
if(visible(getClassName()))
@@ -1665,6 +1672,20 @@ string hwNode::asJSON(unsigned level)
out << "}";
}
+ if(::enabled("output:list") && countChildren()>0)
+ {
+ bool needcomma = visible(getClassName());
+ for (unsigned int i = 0; i < countChildren(); i++)
+ {
+ string json = getChild(i)->asJSON(visible(getClassName()) ? level + 2 : 1);
+
+ if(needcomma && strip(json)!="")
+ out << "," << endl;
+ out << getChild(i)->asJSON(visible(getClassName()) ? level + 2 : 1);
+ needcomma |= strip(json)!="";
+ }
+ }
+
if (::enabled("output:list") && level == 0)
{
out << endl << "]" << endl;
--
2.33.1

26
0021-report-product-model-on-Power-systems.patch Normal file
View File

@ -0,0 +1,26 @@
From 3775782808e8b9b8aa72ed2ce23e145433e193cf Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Wed, 27 May 2020 01:16:20 +0200
Subject: [PATCH 21/65] report product model on Power systems
Github PR #54
---
src/core/device-tree.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/device-tree.cc b/src/core/device-tree.cc
index e7227e1..027ad16 100644
--- a/src/core/device-tree.cc
+++ b/src/core/device-tree.cc
@@ -1396,7 +1396,7 @@ static void get_ibm_model(hwNode & n)
{
if (ibm_model_defs[i].model == machinetype || ibm_model_defs[i].model == model)
{
- n.setProduct(ibm_model_defs[i].modelname);
+ n.setProduct(n.getProduct() + " (" + ibm_model_defs[i].modelname + ")");
n.addHint("icon", string(ibm_model_defs[i].icon));
n.setConfig("chassis", ibm_model_defs[i].chassis);
return;
--
2.33.1

149
0022-Fix-few-memory-leaks.patch Normal file
View File

@ -0,0 +1,149 @@
From 71cf63b7bb7bb212580cc7c8e6c75a4f645d79f1 Mon Sep 17 00:00:00 2001
From: Shivaprasad G Bhat <sbhat@linux.ibm.com>
Date: Wed, 20 May 2020 06:27:05 -0500
Subject: [PATCH 22/65] Fix few memory leaks
Valgrind showed some leaks with scandir usage in sysfs.cc.
Patch audits all the scandir usage and fixes where required.
Signed-off-by: Shivaprasad G Bhat <sbhat@linux.ibm.com>
---
src/core/parisc.cc | 10 ++++++----
src/core/spd.cc | 4 ++++
src/core/sysfs.cc | 32 ++++++++++++++++++++++++++++----
3 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/src/core/parisc.cc b/src/core/parisc.cc
index 80344d2..1e531e3 100644
--- a/src/core/parisc.cc
+++ b/src/core/parisc.cc
@@ -561,11 +561,13 @@ static bool scan_device(hwNode & node, string name = "")
else
{
for (int i = 0; i < n; i++)
- if(matches(namelist[i]->d_name, "^[0-9]+(:[0-9]+)*$"))
{
- pushd(namelist[i]->d_name);
- scan_device(curnode?*curnode:node, namelist[i]->d_name);
- popd();
+ if(matches(namelist[i]->d_name, "^[0-9]+(:[0-9]+)*$"))
+ {
+ pushd(namelist[i]->d_name);
+ scan_device(curnode?*curnode:node, namelist[i]->d_name);
+ popd();
+ }
free(namelist[i]);
}
free(namelist);
diff --git a/src/core/spd.cc b/src/core/spd.cc
index 061d0fd..a304d06 100644
--- a/src/core/spd.cc
+++ b/src/core/spd.cc
@@ -192,8 +192,12 @@ static bool scan_eeproms(hwNode & memory)
return false;
for (int i = 0; i < n; i++)
+ {
if (scan_eeprom(memory, namelist[i]->d_name))
current_bank++;
+ free(namelist[i]);
+ }
+ free(namelist);
return true;
}
diff --git a/src/core/sysfs.cc b/src/core/sysfs.cc
index ee8b1da..4e2df1c 100644
--- a/src/core/sysfs.cc
+++ b/src/core/sysfs.cc
@@ -83,7 +83,7 @@ static string sysfs_getbustype(const string & path)
{
struct dirent **namelist;
int i, n;
- string devname;
+ string bustype = "";
/*
to determine to which kind of bus a device is connected:
@@ -96,17 +96,28 @@ static string sysfs_getbustype(const string & path)
n = scandir(".", &namelist, selectdir, alphasort);
popd();
+ if (n <= 0)
+ return "";
+
for (i = 0; i < n; i++)
{
- devname =
+ string devname =
string(fs.path + "/bus/") + string(namelist[i]->d_name) +
"/devices/" + basename(path.c_str());
if (samefile(devname, path))
- return string(namelist[i]->d_name);
+ {
+ bustype = string(namelist[i]->d_name);
+ break;
+ }
+ free(namelist[i]);
}
- return "";
+ for (int j = i; j < n; j++)
+ free(namelist[j]);
+ free(namelist);
+
+ return bustype;
}
@@ -405,7 +416,11 @@ vector < entry > entry::devices() const
entry e = sysfs::entry(This->devpath + "/" + string(namelist[i]->d_name));
if(e.hassubdir("subsystem"))
result.push_back(e);
+ free(namelist[i]);
}
+ if (namelist)
+ free(namelist);
+
if(pushd("block"))
{
int count = scandir(".", &namelist, selectdir, alphasort);
@@ -414,7 +429,10 @@ vector < entry > entry::devices() const
entry e = sysfs::entry(This->devpath + "/block/" + string(namelist[i]->d_name));
if(e.hassubdir("subsystem"))
result.push_back(e);
+ free(namelist[i]);
}
+ if (namelist)
+ free(namelist);
popd();
}
popd();
@@ -435,8 +453,11 @@ vector < entry > sysfs::entries_by_bus(const string & busname)
{
entry e = sysfs::entry::byBus(busname, namelist[i]->d_name);
result.push_back(e);
+ free(namelist[i]);
}
popd();
+ if (namelist)
+ free(namelist);
return result;
}
@@ -454,8 +475,11 @@ vector < entry > sysfs::entries_by_class(const string & classname)
{
entry e = sysfs::entry::byClass(classname, namelist[i]->d_name);
result.push_back(e);
+ free(namelist[i]);
}
popd();
+ if (namelist)
+ free(namelist);
return result;
}
--
2.33.1

49
0023-Build-against-gtk3-instead-of-gtk2.patch Normal file
View File

@ -0,0 +1,49 @@
From ad4ecfd29c29f6895aaf02092e6574299a2b5aa9 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Fri, 10 Jul 2020 03:12:51 +0200
Subject: [PATCH 23/65] Build against gtk3 instead of gtk2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Since gtk2 is on life support, it makes sense to build the gui code with
gtk3 nowadays.
I went for 3.24 because that’s the version I have available on my
system, but it is probable that previous versions would also work, I
don’t know.
---
lshw.spec.in | 4 ++--
src/gui/gtk-lshw.ui | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lshw.spec.in b/lshw.spec.in
index e837fd4..f6884ab 100644
--- a/lshw.spec.in
+++ b/lshw.spec.in
@@ -31,8 +31,8 @@ http://lshw.ezix.org/
Summary: HardWare LiSter (GUI version)
Group: Applications/System
Requires: %{name} >= %{version}
-Requires: gtk2 >= 2.4
-BuildRequires: gtk2-devel >= 2.4
+Requires: gtk3 >= 3.24
+BuildRequires: gtk3-devel >= 3.24
%description gui
lshw (Hardware Lister) is a small tool to provide detailed informaton on
diff --git a/src/gui/gtk-lshw.ui b/src/gui/gtk-lshw.ui
index 73fc08a..25ab1ad 100644
--- a/src/gui/gtk-lshw.ui
+++ b/src/gui/gtk-lshw.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.22"/>
+ <requires lib="gtk+" version="3.24"/>
<object class="GtkDialog" id="aboutlshw">
<property name="can_focus">False</property>
<property name="title" translatable="yes">About</property>
--
2.33.1

27
0024-Remove-deprecated-stock-messages.patch Normal file
View File

@ -0,0 +1,27 @@
From b79101ccdbb609e3dccfe097952ab2d3d7b55951 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Fri, 10 Jul 2020 03:39:46 +0200
Subject: [PATCH 24/65] Remove deprecated stock messages
---
src/gui/gtk-lshw.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gui/gtk-lshw.c b/src/gui/gtk-lshw.c
index 50dfb83..9ac525c 100644
--- a/src/gui/gtk-lshw.c
+++ b/src/gui/gtk-lshw.c
@@ -31,8 +31,8 @@ main (int argc, char *argv[])
GTK_BUTTONS_NONE,
"Executing this program as a normal user will give incomplete and maybe erroneous information.");
gtk_dialog_add_buttons(GTK_DIALOG(dialog),
- GTK_STOCK_QUIT, GTK_RESPONSE_CANCEL,
- GTK_STOCK_EXECUTE, GTK_RESPONSE_ACCEPT,
+ "_Quit", GTK_RESPONSE_CANCEL,
+ "_Execute", GTK_RESPONSE_ACCEPT,
NULL);
proceed = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT);
--
2.33.1

44
0025-Remove-hack-which-is-apparently-not-useful-anymore.patch Normal file
View File

@ -0,0 +1,44 @@
From 8d696376c0f044507575e933b3e438e104f3ecd2 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Fri, 10 Jul 2020 03:40:04 +0200
Subject: [PATCH 25/65] Remove hack which is apparently not useful anymore
---
src/gui/stock.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/gui/stock.c b/src/gui/stock.c
index 08675db..46dfbe7 100644
--- a/src/gui/stock.c
+++ b/src/gui/stock.c
@@ -89,7 +89,6 @@ lshw_gtk_stock_init(void)
static int stock_initted = 0;
GtkIconFactory *icon_factory;
int i;
- GtkWidget *win;
if (stock_initted)
return;
@@ -101,10 +100,6 @@ lshw_gtk_stock_init(void)
gtk_icon_factory_add_default(icon_factory);
-/* Er, yeah, a hack, but it works. :) */
- win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_widget_realize(win);
-
for (i = 0; i < G_N_ELEMENTS(stock_icons); i++)
{
GdkPixbuf *pixbuf;
@@ -128,8 +123,6 @@ lshw_gtk_stock_init(void)
}
}
- gtk_widget_destroy(win);
-
/* register logo icon size */
gtk_icon_size_register(LSHW_ICON_SIZE_LOGO, LSHW_DEFAULT_ICON_SIZE, LSHW_DEFAULT_ICON_SIZE);
--
2.33.1

59
0026-Use-GtkFileChooserNative-instead-of-GtkFileChooserDi.patch Normal file
View File

@ -0,0 +1,59 @@
From 41c04d1c5ee84b1f42a9fabf7623a98ff02b9bf1 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Fri, 10 Jul 2020 04:37:55 +0200
Subject: [PATCH 26/65] Use GtkFileChooserNative instead of
GtkFileChooserDialog
This class allows it to work even in containers.
---
src/gui/engine.cc | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/gui/engine.cc b/src/gui/engine.cc
index 2d2e58b..21e446e 100644
--- a/src/gui/engine.cc
+++ b/src/gui/engine.cc
@@ -460,7 +460,7 @@ static void redirect_cout(std::ofstream &out, bool enable = true)
void save_as(GtkWidget *mainwindow)
{
struct utsname buf;
- GtkWidget *dialog = NULL;
+ GtkFileChooserNative *dialog = NULL;
GtkWidget *sanitize = NULL;
GtkFileFilter *filter = NULL;
bool proceed = true;
@@ -469,12 +469,11 @@ void save_as(GtkWidget *mainwindow)
if(!computer) // nothing to save
return;
- dialog = gtk_file_chooser_dialog_new ("Save hardware configuration",
+ dialog = gtk_file_chooser_native_new ("Save hardware configuration",
GTK_WINDOW(mainwindow),
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
- NULL);
+ "_Save",
+ "_Cancel");
//gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
sanitize = gtk_check_button_new_with_label("Anonymize output");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sanitize), enabled("output:sanitize")?TRUE:FALSE);
@@ -511,7 +510,7 @@ void save_as(GtkWidget *mainwindow)
if(uname(&buf)==0)
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), buf.nodename);
- if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+ if (gtk_native_dialog_run (GTK_NATIVE_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
{
char *filename;
@@ -603,5 +602,5 @@ void save_as(GtkWidget *mainwindow)
}
}
- gtk_widget_destroy (dialog);
+ g_object_unref (dialog);
}
--
2.33.1

202
0027-Replace-deprecated-GtkIconFactory-with-GHashTable.patch Normal file
View File

@ -0,0 +1,202 @@
From e342333d936293e82ff889aa6745b93a8c975543 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Fri, 10 Jul 2020 05:04:19 +0200
Subject: [PATCH 27/65] Replace deprecated GtkIconFactory with GHashTable
This removes most warnings. A possible further improvement would be to
use GtkIconTheme instead, but it will require reorganising the SVG files
around.
---
src/gui/engine.cc | 3 ++-
src/gui/print-gui.cc | 19 ++++++++-----------
src/gui/print-gui.h | 2 +-
src/gui/stock.c | 26 ++++++--------------------
src/gui/stock.h | 1 -
5 files changed, 17 insertions(+), 34 deletions(-)
diff --git a/src/gui/engine.cc b/src/gui/engine.cc
index 21e446e..c66279e 100644
--- a/src/gui/engine.cc
+++ b/src/gui/engine.cc
@@ -40,6 +40,7 @@ extern GtkWidget *description;
extern GtkWidget *go_up_button;
extern GtkWidget *save_button;
extern GtkWidget *statusbar;
+extern GHashTable *pixbufs;
enum
{
@@ -224,7 +225,7 @@ static void display(GtkWidget * mainwindow)
create_tags(buffer);
string hwpath = gethwpath(*displayed, container);
- printmarkup(*displayed, GTK_TEXT_VIEW(description), hwpath);
+ printmarkup(*displayed, GTK_TEXT_VIEW(description), hwpath, pixbufs);
}
}
diff --git a/src/gui/print-gui.cc b/src/gui/print-gui.cc
index 861ec4c..4138424 100644
--- a/src/gui/print-gui.cc
+++ b/src/gui/print-gui.cc
@@ -66,15 +66,12 @@ static void printsize(long long value, const hwNode & node, const string & name,
}
-static void inserticon(const string & icon, const string & comment, GtkTextBuffer *buffer, GtkTextIter &iter, GtkTextView * textview)
+static void inserticon(const string & icon, const string & comment, GtkTextBuffer *buffer, GtkTextIter &iter, GHashTable *pixbufs)
{
GdkPixbuf *pixbuf;
GtkTextTag *tag;
- pixbuf = gtk_widget_render_icon(GTK_WIDGET(textview),
- icon.c_str(),
- gtk_icon_size_from_name(LSHW_ICON_SIZE_LOGO), /* size */
- NULL);
+ pixbuf = GDK_PIXBUF(g_hash_table_lookup(pixbufs, icon.c_str()));
if(!GDK_IS_PIXBUF(pixbuf))
return;
@@ -87,7 +84,7 @@ static void inserticon(const string & icon, const string & comment, GtkTextBuff
}
-void printmarkup(const hwNode & node, GtkTextView *textview, const string & hwpath)
+void printmarkup(const hwNode & node, GtkTextView *textview, const string & hwpath, GHashTable *pixbufs)
{
vector < string > config;
vector < string > resources;
@@ -125,13 +122,13 @@ void printmarkup(const hwNode & node, GtkTextView *textview, const string & hwpa
gtk_text_buffer_insert (buffer, &iter, "\n", -1);
if(node.getHint("icon").defined())
- inserticon(string("lshw-") + node.getHint("icon").asString(), "", buffer, iter, textview);
+ inserticon(string("lshw-") + node.getHint("icon").asString(), "", buffer, iter, pixbufs);
if(node.getHint("bus.icon").defined())
- inserticon(string("lshw-") + node.getHint("bus.icon").asString(), "", buffer, iter, textview);
+ inserticon(string("lshw-") + node.getHint("bus.icon").asString(), "", buffer, iter, pixbufs);
if(node.getHint("logo").defined())
- inserticon(string("lshw-") + node.getHint("logo").asString(), "", buffer, iter, textview);
+ inserticon(string("lshw-") + node.getHint("logo").asString(), "", buffer, iter, pixbufs);
gtk_text_buffer_insert (buffer, &iter, "\n\n", -1);
@@ -218,10 +215,10 @@ void printmarkup(const hwNode & node, GtkTextView *textview, const string & hwpa
gtk_text_buffer_insert (buffer, &iter, "\n", -1);
if(!node.claimed())
- inserticon(LSHW_STOCK_DISABLED, _("this device hasn't been claimed\n"), buffer, iter, textview);
+ inserticon(LSHW_STOCK_DISABLED, _("this device hasn't been claimed\n"), buffer, iter, pixbufs);
if(!node.enabled())
- inserticon(LSHW_STOCK_DISABLED, _("this device has been disabled\n"), buffer, iter, textview);
+ inserticon(LSHW_STOCK_DISABLED, _("this device has been disabled\n"), buffer, iter, pixbufs);
(void) &id; // avoid "id defined but not used" warning
}
diff --git a/src/gui/print-gui.h b/src/gui/print-gui.h
index 055f7cd..d419461 100644
--- a/src/gui/print-gui.h
+++ b/src/gui/print-gui.h
@@ -4,7 +4,7 @@
#include "hw.h"
#include <gtk/gtk.h>
-void printmarkup(const hwNode & node, GtkTextView *textview, const string & hwpath);
+void printmarkup(const hwNode & node, GtkTextView *textview, const string & hwpath, GHashTable *pixbufs);
string gethwpath(hwNode & node, hwNode & base);
#endif
diff --git a/src/gui/stock.c b/src/gui/stock.c
index 46dfbe7..9e7c366 100644
--- a/src/gui/stock.c
+++ b/src/gui/stock.c
@@ -16,6 +16,7 @@ GtkWidget *description = NULL;
GtkWidget *go_up_button = NULL;
GtkWidget *save_button = NULL;
GtkWidget *statusbar = NULL;
+GHashTable *pixbufs = NULL;
static struct StockIcon
{
@@ -87,7 +88,6 @@ void
lshw_gtk_stock_init(void)
{
static int stock_initted = 0;
- GtkIconFactory *icon_factory;
int i;
if (stock_initted)
@@ -95,15 +95,12 @@ lshw_gtk_stock_init(void)
stock_initted = 1;
-/* Setup the icon factory. */
- icon_factory = gtk_icon_factory_new();
-
- gtk_icon_factory_add_default(icon_factory);
+/* Setup the icons hash table. */
+ pixbufs = g_hash_table_new(g_str_hash, g_str_equal);
for (i = 0; i < G_N_ELEMENTS(stock_icons); i++)
{
GdkPixbuf *pixbuf;
- GtkIconSet *iconset;
gchar *filename;
filename = find_file(stock_icons[i].filename, "artwork");
@@ -111,23 +108,15 @@ lshw_gtk_stock_init(void)
if (filename == NULL)
continue;
- pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
+ pixbuf = gdk_pixbuf_new_from_file_at_size(filename, LSHW_DEFAULT_ICON_SIZE, LSHW_DEFAULT_ICON_SIZE, NULL);
g_free(filename);
if(pixbuf) /* we managed to load something */
{
- iconset = gtk_icon_set_new_from_pixbuf(pixbuf);
- g_object_unref(G_OBJECT(pixbuf));
- gtk_icon_factory_add(icon_factory, stock_icons[i].name, iconset);
- gtk_icon_set_unref(iconset);
+ g_hash_table_insert(pixbufs, (char*)stock_icons[i].name, pixbuf);
}
}
-/* register logo icon size */
- gtk_icon_size_register(LSHW_ICON_SIZE_LOGO, LSHW_DEFAULT_ICON_SIZE, LSHW_DEFAULT_ICON_SIZE);
-
- g_object_unref(G_OBJECT(icon_factory));
-
(void) &id; /* avoid "id defined but not used" warning */
}
@@ -168,10 +157,7 @@ void lshw_ui_init(void)
gtk_builder_connect_signals( builder, mainwindow );
g_object_unref( G_OBJECT( builder ) );
- icon = gtk_widget_render_icon(GTK_WIDGET(mainwindow),
- "lshw-logo",
- GTK_ICON_SIZE_DIALOG,
- NULL);
+ icon = g_hash_table_lookup(pixbufs, LSHW_STOCK_LOGO);
if(GDK_IS_PIXBUF(icon))
{
gtk_window_set_icon(GTK_WINDOW(mainwindow), icon);
diff --git a/src/gui/stock.h b/src/gui/stock.h
index a0fef5b..58f788e 100644
--- a/src/gui/stock.h
+++ b/src/gui/stock.h
@@ -43,7 +43,6 @@
/**
* For getting the icon size for the logo
*/
-#define LSHW_ICON_SIZE_LOGO "lshw-icon-size-logo"
#define LSHW_DEFAULT_ICON_SIZE 40
void lshw_gtk_stock_init(void);
--
2.33.1

28
0028-Replace-the-last-GtkStock-in-overwrite-dialog.patch Normal file
View File

@ -0,0 +1,28 @@
From 8ff4b056e8fd371dca868f8967b36c6e9a4590ab Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Fri, 10 Jul 2020 05:06:38 +0200
Subject: [PATCH 28/65] Replace the last GtkStock in overwrite dialog
Also add a mnemonic for better keyboard access to the overwrite button.
---
src/gui/engine.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gui/engine.cc b/src/gui/engine.cc
index c66279e..ff06074 100644
--- a/src/gui/engine.cc
+++ b/src/gui/engine.cc
@@ -556,8 +556,8 @@ void save_as(GtkWidget *mainwindow)
"A file named <i><tt>%s</tt></i> already exists in folder <tt>%s</tt>.\n\nDo you want to overwrite it?",
basename(buffer1), dirname(buffer2));
gtk_dialog_add_buttons(GTK_DIALOG(dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- "Overwrite", GTK_RESPONSE_ACCEPT,
+ "_Cancel", GTK_RESPONSE_CANCEL,
+ "_Overwrite", GTK_RESPONSE_ACCEPT,
NULL);
proceed = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT);
gtk_widget_destroy (dialog);
--
2.33.1

48
0029-Remove-deprecated-widgets.patch Normal file
View File

@ -0,0 +1,48 @@
From 0a290c29faa083767698d77b3454ca08fe2a71eb Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Fri, 10 Jul 2020 05:18:25 +0200
Subject: [PATCH 29/65] Remove deprecated widgets
---
src/gui/gtk-lshw.ui | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/gui/gtk-lshw.ui b/src/gui/gtk-lshw.ui
index 25ab1ad..5f21da0 100644
--- a/src/gui/gtk-lshw.ui
+++ b/src/gui/gtk-lshw.ui
@@ -114,9 +114,10 @@
<signal name="delete-event" handler="gtk_main_quit" swapped="no"/>
<signal name="map" handler="on_lshw_map" after="yes" swapped="no"/>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="main-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
<child>
<object class="GtkMenuBar" id="menubar1">
<property name="visible">True</property>
@@ -292,15 +293,17 @@
</packing>
</child>
<child>
- <object class="GtkHPaned" id="hpaned1">
+ <object class="GtkPaned" id="paned">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
<child>
- <object class="GtkHBox" id="hbox3">
+ <object class="GtkBox" id="tree-box">
<property name="width_request">350</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="homogeneous">True</property>
+ <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
--
2.33.1

128
0030-Remove-deprecated-use_action_appearance-property.patch Normal file
View File

@ -0,0 +1,128 @@
From 6cf78e942827dd01b91607704c7bfad9a1a1541d Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Fri, 10 Jul 2020 06:45:43 +0200
Subject: [PATCH 30/65] Remove deprecated use_action_appearance property
---
src/gui/gtk-lshw.ui | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/src/gui/gtk-lshw.ui b/src/gui/gtk-lshw.ui
index 5f21da0..1656f80 100644
--- a/src/gui/gtk-lshw.ui
+++ b/src/gui/gtk-lshw.ui
@@ -27,7 +27,6 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<signal name="activate" handler="on_aboutclose_activate" swapped="no"/>
<signal name="clicked" handler="on_aboutclose_activate" swapped="no"/>
@@ -73,7 +72,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="uri">http://www.ezix.org/</property>
</object>
@@ -126,7 +124,6 @@
<object class="GtkMenuItem" id="menuitem1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_File</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -138,7 +135,6 @@
<property name="label">gtk-save</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="on_save_activate" swapped="no"/>
@@ -148,7 +144,6 @@
<object class="GtkSeparatorMenuItem" id="separatormenuitem1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
</object>
</child>
<child>
@@ -156,7 +151,6 @@
<property name="label">gtk-quit</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="gtk_main_quit" swapped="no"/>
@@ -170,7 +164,6 @@
<object class="GtkMenuItem" id="menuitem3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_View</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -182,7 +175,6 @@
<property name="label">gtk-refresh</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="refresh_display" swapped="no"/>
@@ -196,7 +188,6 @@
<object class="GtkMenuItem" id="menuitem4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -208,7 +199,6 @@
<property name="label">gtk-about</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="on_about1_activate" swapped="no"/>
@@ -235,7 +225,6 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="stock_id">gtk-go-up</property>
<signal name="clicked" handler="go_up" swapped="no"/>
</object>
@@ -249,7 +238,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Rescan the hardware</property>
- <property name="use_action_appearance">False</property>
<property name="stock_id">gtk-refresh</property>
<signal name="clicked" handler="refresh_display" swapped="no"/>
</object>
@@ -263,7 +251,6 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="stock_id">gtk-save</property>
<signal name="clicked" handler="on_savebutton_clicked" swapped="no"/>
</object>
@@ -276,7 +263,6 @@
<object class="GtkToolButton" id="quitbutton">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="stock_id">gtk-quit</property>
<signal name="clicked" handler="gtk_main_quit" swapped="no"/>
</object>
--
2.33.1

98
0031-Move-to-GtkApplication.patch Normal file
View File

@ -0,0 +1,98 @@
From 5fd82e398ba94766f0981f97988c8f14ab4297c5 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Fri, 10 Jul 2020 05:53:57 +0200
Subject: [PATCH 31/65] Move to GtkApplication
This will eventually let us use GActions to build our menus and buttons.
---
src/gui/gtk-lshw.c | 36 ++++++++++++++++++++++--------------
src/gui/gtk-lshw.ui | 3 +--
2 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/gui/gtk-lshw.c b/src/gui/gtk-lshw.c
index 9ac525c..6c0f0bb 100644
--- a/src/gui/gtk-lshw.c
+++ b/src/gui/gtk-lshw.c
@@ -11,17 +11,10 @@ static char *id = "@(#) $Id$";
extern GtkWidget *mainwindow;
-int
-main (int argc, char *argv[])
+static void
+activate (GApplication *app,
+ gpointer user_data)
{
-#ifndef NONLS
- bindtextdomain (PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (PACKAGE, "UTF-8");
- textdomain (PACKAGE);
-#endif
-
- gtk_init (&argc, &argv);
-
if(geteuid() != 0)
{
bool proceed = false;
@@ -39,19 +32,34 @@ main (int argc, char *argv[])
gtk_widget_destroy (dialog);
if(!proceed)
- return -1;
+ return;
}
lshw_gtk_stock_init();
lshw_ui_init();
if(!mainwindow)
- return(1);
+ return;
gtk_widget_show(mainwindow);
- gtk_main ();
+ gtk_application_add_window(GTK_APPLICATION(app), GTK_WINDOW(mainwindow));
+}
+
+int
+main (int argc, char *argv[])
+{
+#ifndef NONLS
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset (PACKAGE, "UTF-8");
+ textdomain (PACKAGE);
+#endif
+
+ GtkApplication *app = gtk_application_new ("org.ezix.gtk-lshw", G_APPLICATION_FLAGS_NONE);
+ g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
+ int status = g_application_run (G_APPLICATION (app), argc, argv);
+ g_object_unref (app);
(void) &id; // avoid warning "id defined but not used"
- return 0;
+ return status;
}
diff --git a/src/gui/gtk-lshw.ui b/src/gui/gtk-lshw.ui
index 1656f80..7504c76 100644
--- a/src/gui/gtk-lshw.ui
+++ b/src/gui/gtk-lshw.ui
@@ -102,14 +102,13 @@
<action-widget response="-7">closebutton1</action-widget>
</action-widgets>
</object>
- <object class="GtkWindow" id="mainwindow">
+ <object class="GtkApplicationWindow" id="mainwindow">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">lshw</property>
<property name="default_width">700</property>
<property name="default_height">480</property>
<property name="startup_id">org.ezix.gtk-lshw</property>
- <signal name="delete-event" handler="gtk_main_quit" swapped="no"/>
<signal name="map" handler="on_lshw_map" after="yes" swapped="no"/>
<child>
<object class="GtkBox" id="main-box">
--
2.33.1

278
0032-Replace-signals-with-GSimpleActions.patch Normal file
View File

@ -0,0 +1,278 @@
From d1690196a9007568bfce3847841ea2b509eb3150 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Fri, 10 Jul 2020 06:28:06 +0200
Subject: [PATCH 32/65] Replace signals with GSimpleActions
This unifies actions pertaining to the application.
---
src/gui/callbacks.c | 62 ++++++++++++++++++++++-----------------------
src/gui/callbacks.h | 35 ++++++++++++++++---------
src/gui/gtk-lshw.c | 14 ++++++++++
src/gui/gtk-lshw.ui | 16 ++++++------
4 files changed, 76 insertions(+), 51 deletions(-)
diff --git a/src/gui/callbacks.c b/src/gui/callbacks.c
index f8aa0cb..eec3e55 100644
--- a/src/gui/callbacks.c
+++ b/src/gui/callbacks.c
@@ -17,17 +17,36 @@ static char *id = "@(#) $Id$";
G_MODULE_EXPORT
void
-refresh_display (GtkMenuItem *menuitem,
-gpointer user_data)
+on_go_up_activated (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer app)
+{
+ go_back(mainwindow);
+}
+
+G_MODULE_EXPORT
+void
+on_refresh_activated (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer app)
{
refresh(mainwindow);
}
+G_MODULE_EXPORT
+void
+on_save_activated (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer app)
+{
+ save_as(mainwindow);
+}
G_MODULE_EXPORT
void
-on_about1_activate (GtkMenuItem *menuitem,
-gpointer user_data)
+on_about_activated (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer app)
{
if(GTK_IS_WIDGET(about))
{
@@ -35,6 +54,14 @@ gpointer user_data)
}
}
+G_MODULE_EXPORT
+void
+on_quit_activated (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer app)
+{
+ g_application_quit(G_APPLICATION(app));
+}
G_MODULE_EXPORT
void
@@ -147,15 +174,6 @@ gpointer user_data)
}
-G_MODULE_EXPORT
-void
-go_up (GtkToolButton *toolbutton,
-gpointer user_data)
-{
- go_back(mainwindow);
-}
-
-
G_MODULE_EXPORT
void
on_lshw_map (GtkWidget *widget,
@@ -163,21 +181,3 @@ gpointer user_data)
{
refresh(mainwindow);
}
-
-G_MODULE_EXPORT
-void
-on_save_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- save_as(mainwindow);
-}
-
-
-G_MODULE_EXPORT
-void
-on_savebutton_clicked (GtkToolButton *toolbutton,
- gpointer user_data)
-{
- on_save_activate(NULL, NULL);
-}
-
diff --git a/src/gui/callbacks.h b/src/gui/callbacks.h
index cc856e4..b9b9141 100644
--- a/src/gui/callbacks.h
+++ b/src/gui/callbacks.h
@@ -1,8 +1,29 @@
#include <gtk/gtk.h>
-void refresh_display (GtkMenuItem * menuitem, gpointer user_data);
+void
+on_go_up_activated (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer app);
+
+void
+on_refresh_activated (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer app);
-void on_about1_activate (GtkMenuItem * menuitem, gpointer user_data);
+void
+on_save_activated (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer app);
+
+void
+on_about_activated (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer app);
+
+void
+on_quit_activated (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer app);
void on_aboutclose_activate (GtkButton * button, gpointer user_data);
@@ -35,14 +56,4 @@ void on_treeview2_cursor_changed (GtkTreeView * treeview, gpointer user_data);
void on_treeview3_cursor_changed (GtkTreeView * treeview, gpointer user_data);
-void go_up (GtkToolButton * toolbutton, gpointer user_data);
-
void on_lshw_map (GtkWidget * widget, gpointer user_data);
-
-void
-on_save_activate (GtkMenuItem *menuitem,
- gpointer user_data);
-
-void
-on_savebutton_clicked (GtkToolButton *toolbutton,
- gpointer user_data);
diff --git a/src/gui/gtk-lshw.c b/src/gui/gtk-lshw.c
index 6c0f0bb..0dc3aff 100644
--- a/src/gui/gtk-lshw.c
+++ b/src/gui/gtk-lshw.c
@@ -6,11 +6,21 @@
#include "config.h"
#include "stock.h"
#include "engine.h"
+#include "callbacks.h"
static char *id = "@(#) $Id$";
extern GtkWidget *mainwindow;
+static GActionEntry app_entries[] =
+{
+ { "go_up", on_go_up_activated, NULL, NULL, NULL },
+ { "refresh", on_refresh_activated, NULL, NULL, NULL },
+ { "save", on_save_activated, NULL, NULL, NULL },
+ { "about", on_about_activated, NULL, NULL, NULL },
+ { "quit", on_quit_activated, NULL, NULL, NULL }
+};
+
static void
activate (GApplication *app,
gpointer user_data)
@@ -35,6 +45,10 @@ activate (GApplication *app,
return;
}
+ g_action_map_add_action_entries (G_ACTION_MAP (app),
+ app_entries, G_N_ELEMENTS (app_entries),
+ app);
+
lshw_gtk_stock_init();
lshw_ui_init();
diff --git a/src/gui/gtk-lshw.ui b/src/gui/gtk-lshw.ui
index 7504c76..d24e05c 100644
--- a/src/gui/gtk-lshw.ui
+++ b/src/gui/gtk-lshw.ui
@@ -136,7 +136,7 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="on_save_activate" swapped="no"/>
+ <property name="action_name">app.save</property>
</object>
</child>
<child>
@@ -152,7 +152,7 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="gtk_main_quit" swapped="no"/>
+ <property name="action_name">app.quit</property>
</object>
</child>
</object>
@@ -176,7 +176,7 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="refresh_display" swapped="no"/>
+ <property name="action_name">app.refresh</property>
</object>
</child>
</object>
@@ -200,7 +200,7 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="on_about1_activate" swapped="no"/>
+ <property name="action_name">app.about</property>
</object>
</child>
</object>
@@ -225,7 +225,7 @@
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="stock_id">gtk-go-up</property>
- <signal name="clicked" handler="go_up" swapped="no"/>
+ <property name="action_name">app.go_up</property>
</object>
<packing>
<property name="expand">False</property>
@@ -238,7 +238,7 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Rescan the hardware</property>
<property name="stock_id">gtk-refresh</property>
- <signal name="clicked" handler="refresh_display" swapped="no"/>
+ <property name="action_name">app.refresh</property>
</object>
<packing>
<property name="expand">False</property>
@@ -251,7 +251,7 @@
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="stock_id">gtk-save</property>
- <signal name="clicked" handler="on_savebutton_clicked" swapped="no"/>
+ <property name="action_name">app.save</property>
</object>
<packing>
<property name="expand">False</property>
@@ -263,7 +263,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock_id">gtk-quit</property>
- <signal name="clicked" handler="gtk_main_quit" swapped="no"/>
+ <property name="action_name">app.quit</property>
</object>
<packing>
<property name="expand">False</property>
--
2.33.1

153
0033-Enable-Disable-GSimpleAction-instead-of-button-sensi.patch Normal file
View File

@ -0,0 +1,153 @@
From a116b319adf51d4eafcb264de027647244340708 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Wed, 15 Jul 2020 17:32:45 +0200
Subject: [PATCH 33/65] Enable/Disable GSimpleAction instead of button
sensitivity
This also fixes the Save menu item not having been disabled properly.
---
src/gui/engine.cc | 24 +++++++-----------------
src/gui/gtk-lshw.c | 7 +++++++
src/gui/gtk-lshw.ui | 2 --
src/gui/stock.c | 4 ----
4 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/src/gui/engine.cc b/src/gui/engine.cc
index ff06074..2962ec8 100644
--- a/src/gui/engine.cc
+++ b/src/gui/engine.cc
@@ -37,10 +37,10 @@ static hwNode *selected3 = NULL;
extern GtkWidget *mainwindow;
extern GtkWidget *list1, *list2, *list3;
extern GtkWidget *description;
-extern GtkWidget *go_up_button;
-extern GtkWidget *save_button;
extern GtkWidget *statusbar;
extern GHashTable *pixbufs;
+extern GSimpleAction *go_up_action;
+extern GSimpleAction *save_action;
enum
{
@@ -251,14 +251,11 @@ void refresh(GtkWidget *mainwindow)
{
hwNode computer("computer", hw::system);
static bool lock = false;
- //GtkWidget * menu = lookup_widget(mainwindow, "menu");
- //GtkWidget * save_menuitem = lookup_widget(menu, "save");
if(lock) return;
lock = true;
- gtk_widget_set_sensitive(save_button, FALSE);
- //gtk_widget_set_sensitive(save_menuitem, FALSE);
+ g_simple_action_set_enabled(save_action, FALSE);
populate_sublist(list1, NULL);
populate_sublist(list2, NULL);
@@ -273,9 +270,8 @@ void refresh(GtkWidget *mainwindow)
status(NULL);
displayed = container.addChild(computer);
- gtk_widget_set_sensitive(go_up_button, FALSE);
- gtk_widget_set_sensitive(save_button, TRUE);
- //gtk_widget_set_sensitive(save_menuitem, TRUE);
+ g_simple_action_set_enabled(go_up_action, FALSE);
+ g_simple_action_set_enabled(save_action, TRUE);
selected1 = NULL;
selected2 = NULL;
@@ -379,10 +375,7 @@ void browse(unsigned list, GtkTreeView *treeview)
break;
}
- if(selected1 && (find_parent(selected1, &container)!= &container))
- gtk_widget_set_sensitive(go_up_button, 1);
- else
- gtk_widget_set_sensitive(go_up_button, 0);
+ g_simple_action_set_enabled(go_up_action, selected1 && (find_parent(selected1, &container)!= &container));
(void) &::id; // avoid warning "id defined but not used"
}
@@ -404,10 +397,7 @@ void go_back(GtkWidget *mainwindow)
displayed = find_parent(displayed, &container);
}
- if(selected1 && (find_parent(selected1, &container)!= &container))
- gtk_widget_set_sensitive(go_up_button, 1);
- else
- gtk_widget_set_sensitive(go_up_button, 0);
+ g_simple_action_set_enabled(go_up_action, selected1 && (find_parent(selected1, &container)!= &container));
display(mainwindow);
}
diff --git a/src/gui/gtk-lshw.c b/src/gui/gtk-lshw.c
index 0dc3aff..7b91ec5 100644
--- a/src/gui/gtk-lshw.c
+++ b/src/gui/gtk-lshw.c
@@ -11,6 +11,8 @@
static char *id = "@(#) $Id$";
extern GtkWidget *mainwindow;
+GSimpleAction *go_up_action;
+GSimpleAction *save_action;
static GActionEntry app_entries[] =
{
@@ -48,6 +50,11 @@ activate (GApplication *app,
g_action_map_add_action_entries (G_ACTION_MAP (app),
app_entries, G_N_ELEMENTS (app_entries),
app);
+ go_up_action = G_SIMPLE_ACTION (g_action_map_lookup_action (G_ACTION_MAP (app), "go_up"));
+ save_action = G_SIMPLE_ACTION (g_action_map_lookup_action (G_ACTION_MAP (app), "save"));
+
+ g_simple_action_set_enabled(go_up_action, FALSE);
+ g_simple_action_set_enabled(save_action, FALSE);
lshw_gtk_stock_init();
lshw_ui_init();
diff --git a/src/gui/gtk-lshw.ui b/src/gui/gtk-lshw.ui
index d24e05c..76fcd19 100644
--- a/src/gui/gtk-lshw.ui
+++ b/src/gui/gtk-lshw.ui
@@ -222,7 +222,6 @@
<child>
<object class="GtkToolButton" id="upbutton">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="stock_id">gtk-go-up</property>
<property name="action_name">app.go_up</property>
@@ -248,7 +247,6 @@
<child>
<object class="GtkToolButton" id="savebutton">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="stock_id">gtk-save</property>
<property name="action_name">app.save</property>
diff --git a/src/gui/stock.c b/src/gui/stock.c
index 9e7c366..fa18f9e 100644
--- a/src/gui/stock.c
+++ b/src/gui/stock.c
@@ -13,8 +13,6 @@ GtkWidget *list1 = NULL;
GtkWidget *list2 = NULL;
GtkWidget *list3 = NULL;
GtkWidget *description = NULL;
-GtkWidget *go_up_button = NULL;
-GtkWidget *save_button = NULL;
GtkWidget *statusbar = NULL;
GHashTable *pixbufs = NULL;
@@ -151,8 +149,6 @@ void lshw_ui_init(void)
list2 = GTK_WIDGET(gtk_builder_get_object( builder, "treeview2"));
list3 = GTK_WIDGET(gtk_builder_get_object( builder, "treeview3"));
description = GTK_WIDGET(gtk_builder_get_object( builder, "description"));
- go_up_button = GTK_WIDGET(gtk_builder_get_object( builder, "upbutton"));
- save_button = GTK_WIDGET(gtk_builder_get_object( builder, "savebutton"));
statusbar = GTK_WIDGET(gtk_builder_get_object( builder, "statusbar"));
gtk_builder_connect_signals( builder, mainwindow );
g_object_unref( G_OBJECT( builder ) );
--
2.33.1

239
0034-Move-from-GtkMenuBar-to-GMenu.patch Normal file
View File

@ -0,0 +1,239 @@
From bc5046d9917fe9cf84dd899f90aef5b90b7d4b04 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Wed, 15 Jul 2020 16:54:27 +0200
Subject: [PATCH 34/65] Move from GtkMenuBar to GMenu
This moves forward with gtk4 support, while also allowing a global menu
for environments which use one, such as GNOME.
I also added shortcuts so that users can press ^Q, ^R and ^S to quit,
refresh and save.
---
src/gui/gtk-lshw.c | 2 +-
src/gui/gtk-lshw.ui | 138 ++++++++++++--------------------------------
src/gui/stock.c | 6 +-
src/gui/stock.h | 4 +-
4 files changed, 47 insertions(+), 103 deletions(-)
diff --git a/src/gui/gtk-lshw.c b/src/gui/gtk-lshw.c
index 7b91ec5..d3e531c 100644
--- a/src/gui/gtk-lshw.c
+++ b/src/gui/gtk-lshw.c
@@ -57,7 +57,7 @@ activate (GApplication *app,
g_simple_action_set_enabled(save_action, FALSE);
lshw_gtk_stock_init();
- lshw_ui_init();
+ lshw_ui_init(GTK_APPLICATION(app));
if(!mainwindow)
return;
diff --git a/src/gui/gtk-lshw.ui b/src/gui/gtk-lshw.ui
index 76fcd19..cf9d678 100644
--- a/src/gui/gtk-lshw.ui
+++ b/src/gui/gtk-lshw.ui
@@ -103,7 +103,6 @@
</action-widgets>
</object>
<object class="GtkApplicationWindow" id="mainwindow">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">lshw</property>
<property name="default_width">700</property>
@@ -115,105 +114,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
- <child>
- <object class="GtkMenuBar" id="menubar1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkMenuItem" id="menuitem1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_File</property>
- <property name="use_underline">True</property>
- <child type="submenu">
- <object class="GtkMenu" id="menu1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkImageMenuItem" id="savemenu">
- <property name="label">gtk-save</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <property name="action_name">app.save</property>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="imagemenuitem5">
- <property name="label">gtk-quit</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <property name="action_name">app.quit</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="menuitem3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_View</property>
- <property name="use_underline">True</property>
- <child type="submenu">
- <object class="GtkMenu" id="menu2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkImageMenuItem" id="refresh1">
- <property name="label">gtk-refresh</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <property name="action_name">app.refresh</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="menuitem4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Help</property>
- <property name="use_underline">True</property>
- <child type="submenu">
- <object class="GtkMenu" id="menu3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkImageMenuItem" id="imagemenuitem10">
- <property name="label">gtk-about</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <property name="action_name">app.about</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<object class="GtkToolbar" id="toolbar1">
<property name="visible">True</property>
@@ -423,4 +323,42 @@
</object>
</child>
</object>
+ <menu id="menubar">
+ <submenu>
+ <attribute name="label" translatable="yes">_File</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Save</attribute>
+ <attribute name="action">app.save</attribute>
+ <attribute name="accel">&lt;Control&gt;s</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Quit</attribute>
+ <attribute name="action">app.quit</attribute>
+ <attribute name="accel">&lt;Control&gt;q</attribute>
+ </item>
+ </section>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_View</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Refresh</attribute>
+ <attribute name="action">app.refresh</attribute>
+ <attribute name="accel">&lt;Control&gt;r</attribute>
+ </item>
+ </section>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_About</attribute>
+ <attribute name="action">app.about</attribute>
+ </item>
+ </section>
+ </submenu>
+ </menu>
</interface>
diff --git a/src/gui/stock.c b/src/gui/stock.c
index fa18f9e..ce0b42a 100644
--- a/src/gui/stock.c
+++ b/src/gui/stock.c
@@ -14,6 +14,7 @@ GtkWidget *list2 = NULL;
GtkWidget *list3 = NULL;
GtkWidget *description = NULL;
GtkWidget *statusbar = NULL;
+GMenuModel *menubar = NULL;
GHashTable *pixbufs = NULL;
static struct StockIcon
@@ -118,7 +119,7 @@ lshw_gtk_stock_init(void)
(void) &id; /* avoid "id defined but not used" warning */
}
-void lshw_ui_init(void)
+void lshw_ui_init(GtkApplication *app)
{
GError *error = NULL;
GtkBuilder *builder = NULL;
@@ -151,6 +152,9 @@ void lshw_ui_init(void)
description = GTK_WIDGET(gtk_builder_get_object( builder, "description"));
statusbar = GTK_WIDGET(gtk_builder_get_object( builder, "statusbar"));
gtk_builder_connect_signals( builder, mainwindow );
+ menubar = G_MENU_MODEL( gtk_builder_get_object( builder, "menubar"));
+ gtk_window_set_application( GTK_WINDOW( mainwindow ), app );
+ gtk_application_set_menubar( app, menubar );
g_object_unref( G_OBJECT( builder ) );
icon = g_hash_table_lookup(pixbufs, LSHW_STOCK_LOGO);
diff --git a/src/gui/stock.h b/src/gui/stock.h
index 58f788e..1c732df 100644
--- a/src/gui/stock.h
+++ b/src/gui/stock.h
@@ -45,6 +45,8 @@
*/
#define LSHW_DEFAULT_ICON_SIZE 40
+typedef struct _GtkApplication GtkApplication;
+
void lshw_gtk_stock_init(void);
-void lshw_ui_init(void);
+void lshw_ui_init(GtkApplication *);
#endif /* _STOCK_H_ */
--
2.33.1

252
0035-Replace-the-about-GtkDialog-with-a-GtkAboutDialog.patch Normal file
View File

@ -0,0 +1,252 @@
From e96f82ce459a6d503f70d6c7b0f762bf0d133edf Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sat, 1 Aug 2020 15:03:23 +0200
Subject: [PATCH 35/65] Replace the about GtkDialog with a GtkAboutDialog
This reduces the amount of code needed for this feature, and integrates
better with the rest of the system.
---
src/gui/callbacks.c | 46 ++++++--------------
src/gui/callbacks.h | 4 --
src/gui/gtk-lshw.ui | 101 --------------------------------------------
src/gui/stock.c | 2 -
4 files changed, 12 insertions(+), 141 deletions(-)
diff --git a/src/gui/callbacks.c b/src/gui/callbacks.c
index eec3e55..b108777 100644
--- a/src/gui/callbacks.c
+++ b/src/gui/callbacks.c
@@ -10,7 +10,6 @@
#include "engine.h"
#include <string.h>
-extern GtkWidget *about;
extern GtkWidget *mainwindow;
static char *id = "@(#) $Id$";
@@ -42,18 +41,6 @@ on_save_activated (GSimpleAction *action,
save_as(mainwindow);
}
-G_MODULE_EXPORT
-void
-on_about_activated (GSimpleAction *action,
- GVariant *parameter,
- gpointer app)
-{
- if(GTK_IS_WIDGET(about))
- {
- gtk_widget_show(about);
- }
-}
-
G_MODULE_EXPORT
void
on_quit_activated (GSimpleAction *action,
@@ -65,25 +52,20 @@ on_quit_activated (GSimpleAction *action,
G_MODULE_EXPORT
void
-on_aboutclose_activate (GtkButton *button,
-gpointer user_data)
+on_about_activated (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer app)
{
- if(GTK_IS_WIDGET(about))
- {
- gtk_widget_hide(about);
- }
-}
-
+ gtk_show_about_dialog(GTK_WINDOW(mainwindow),
+ "program-name", "GTK+ frontend for lshw",
+ "website", "https://www.ezix.org/",
+ "copyright", "© 2004-2011 Lyonel Vincent\n© 2020 Emmanuel Gil Peyrot",
+ "version", getpackageversion(),
+ "license-type", GTK_LICENSE_GPL_2_0,
+ NULL);
-G_MODULE_EXPORT
-void
-on_version_realize (GtkWidget *widget,
-gpointer user_data)
-{
const char *latest = checkupdates();
- gtk_label_set_text(GTK_LABEL(widget), getpackageversion());
-
if(latest)
{
if(strcmp(latest, getpackageversion()) != 0)
@@ -100,18 +82,14 @@ gpointer user_data)
latest);
gtk_window_set_title(GTK_WINDOW(dialog), "Update available");
- /* Destroy the dialog when the user responds to it (e.g. clicks a button) */
- g_signal_connect_swapped (dialog, "response",
- G_CALLBACK (gtk_widget_destroy),
- dialog);
}
- gtk_widget_show(dialog);
+ gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_destroy(dialog);
}
}
}
-
G_MODULE_EXPORT
void
on_treeview1_row_activated (GtkTreeView *treeview,
diff --git a/src/gui/callbacks.h b/src/gui/callbacks.h
index b9b9141..e7636ef 100644
--- a/src/gui/callbacks.h
+++ b/src/gui/callbacks.h
@@ -25,10 +25,6 @@ on_quit_activated (GSimpleAction *action,
GVariant *parameter,
gpointer app);
-void on_aboutclose_activate (GtkButton * button, gpointer user_data);
-
-void on_version_realize (GtkWidget * widget, gpointer user_data);
-
void
on_treeview1_row_activated (GtkTreeView * treeview,
GtkTreePath * path,
diff --git a/src/gui/gtk-lshw.ui b/src/gui/gtk-lshw.ui
index cf9d678..a3c6248 100644
--- a/src/gui/gtk-lshw.ui
+++ b/src/gui/gtk-lshw.ui
@@ -1,107 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.24"/>
- <object class="GtkDialog" id="aboutlshw">
- <property name="can_focus">False</property>
- <property name="title" translatable="yes">About</property>
- <property name="resizable">False</property>
- <property name="window_position">center-on-parent</property>
- <property name="destroy_with_parent">True</property>
- <property name="type_hint">dialog</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="closebutton1">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="on_aboutclose_activate" swapped="no"/>
- <signal name="clicked" handler="on_aboutclose_activate" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="aboutext">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">20</property>
- <property name="ypad">20</property>
- <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;GTK+ front-end for &lt;tt&gt;lshw&lt;/tt&gt;&lt;/b&gt;&lt;/big&gt;
-
-© 2004-2011 Lyonel Vincent
-&lt;tt&gt;lyonel@ezix.org&lt;/tt&gt;</property>
- <property name="use_markup">True</property>
- <property name="justify">center</property>
- <property name="mnemonic_widget">closebutton1</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLinkButton" id="linkbutton1">
- <property name="label" translatable="yes">http://www.ezix.org/</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="relief">none</property>
- <property name="uri">http://www.ezix.org/</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="version">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">VERSION</property>
- <property name="justify">center</property>
- <property name="mnemonic_widget">closebutton1</property>
- <signal name="realize" handler="on_version_realize" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-7">closebutton1</action-widget>
- </action-widgets>
- </object>
<object class="GtkApplicationWindow" id="mainwindow">
<property name="can_focus">False</property>
<property name="title" translatable="yes">lshw</property>
diff --git a/src/gui/stock.c b/src/gui/stock.c
index ce0b42a..c3159b8 100644
--- a/src/gui/stock.c
+++ b/src/gui/stock.c
@@ -8,7 +8,6 @@ static char *id = "@(#) $Id$";
#define UIFILE "gtk-lshw.ui"
GtkWidget *mainwindow = NULL;
-GtkWidget *about = NULL;
GtkWidget *list1 = NULL;
GtkWidget *list2 = NULL;
GtkWidget *list3 = NULL;
@@ -145,7 +144,6 @@ void lshw_ui_init(GtkApplication *app)
g_free(uiname);
mainwindow = GTK_WIDGET( gtk_builder_get_object( builder, "mainwindow" ) );
- about = GTK_WIDGET( gtk_builder_get_object( builder, "aboutlshw" ) );
list1 = GTK_WIDGET(gtk_builder_get_object( builder, "treeview1"));
list2 = GTK_WIDGET(gtk_builder_get_object( builder, "treeview2"));
list3 = GTK_WIDGET(gtk_builder_get_object( builder, "treeview3"));
--
2.33.1

22
0036-Update-docs-TODO.patch Normal file
View File

@ -0,0 +1,22 @@
From 60c906d385b933fb6f5f0f2b14bfc9ea6de43a99 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Fri, 21 Aug 2020 11:38:20 +0200
Subject: [PATCH 36/65] Update 'docs/TODO'
---
docs/TODO | 2 ++
1 file changed, 2 insertions(+)
diff --git a/docs/TODO b/docs/TODO
index 1e74710..ff0f288 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -7,3 +7,5 @@
* use businfo to find CPUs instead of hardcoding cpu:n form
* use sysfs for PCMCIA access
* use MPTABLE for reporting of CPUs
+
+report SSD/rotational devices: /sys/block/DEV/queue/rotational
--
2.33.1

22
0037-Update-docs-TODO.patch Normal file
View File

@ -0,0 +1,22 @@
From 358e65f92dec01f13b632d1d13fb8c76e1d50ca4 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Wed, 26 Aug 2020 23:36:59 +0200
Subject: [PATCH 37/65] Update 'docs/TODO'
---
docs/TODO | 1 +
1 file changed, 1 insertion(+)
diff --git a/docs/TODO b/docs/TODO
index ff0f288..0b33782 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -9,3 +9,4 @@
* use MPTABLE for reporting of CPUs
report SSD/rotational devices: /sys/block/DEV/queue/rotational
+better handle containers
\ No newline at end of file
--
2.33.1

76
0038-update-man-page.patch Normal file
View File

@ -0,0 +1,76 @@
From 2c235e6bf21e30b8e2da4d20f358df1e540a5b69 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Thu, 15 Oct 2020 14:11:58 +0200
Subject: [PATCH 38/65] update man page
add `-notime` option
---
src/lshw.1 | 9 ++++++---
src/lshw.sgml | 5 +++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/lshw.1 b/src/lshw.1
index 79c3619..ae6fa34 100644
--- a/src/lshw.1
+++ b/src/lshw.1
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "LSHW" "1" "28 January 2018" "$Rev$" ""
+.TH "LSHW" "1" "15 October 2020" "$Rev$" ""
.SH NAME
lshw \- list hardware
.SH SYNOPSIS
@@ -10,7 +10,7 @@ lshw \- list hardware
.sp
\fBlshw\fR [ \fB-X\fR ]
.sp
-\fBlshw\fR [ \fB [ -html ] [ -short ] [ -xml ] [ -json ] [ -businfo ] \fR ] [ \fB-dump \fIfilename\fB\fR ] [ \fB-class \fIclass\fB\fR\fI...\fR ] [ \fB-disable \fItest\fB\fR\fI...\fR ] [ \fB-enable \fItest\fB\fR\fI...\fR ] [ \fB-sanitize\fR ] [ \fB-numeric\fR ] [ \fB-quiet\fR ]
+\fBlshw\fR [ \fB [ -html ] [ -short ] [ -xml ] [ -json ] [ -businfo ] \fR ] [ \fB-dump \fIfilename\fB\fR ] [ \fB-class \fIclass\fB\fR\fI...\fR ] [ \fB-disable \fItest\fB\fR\fI...\fR ] [ \fB-enable \fItest\fB\fR\fI...\fR ] [ \fB-sanitize\fR ] [ \fB-numeric\fR ] [ \fB-quiet\fR ] [ \fB-notime\fR ]
.SH "DESCRIPTION"
.PP
@@ -53,7 +53,7 @@ Outputs the device tree showing hardware paths, very much like the output of HP-
Outputs the device list showing bus information, detailing SCSI, USB, IDE and PCI addresses.
.TP
\fB-dump \fIfilename\fB\fR
-Display output and dump collected information into a file (SQLite database).
+Dump collected information into a file (SQLite database).
.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\&.
@@ -74,6 +74,9 @@ Remove potentially sensitive information from output (IP addresses, serial numbe
.TP
\fB-numeric\fR
Also display numeric IDs (for PCI and USB devices).
+.TP
+\fB-notime\fR
+Exclude volatile attributes (timestamps) from output.
.SH "BUGS"
.PP
\fBlshw\fR currently does not detect
diff --git a/src/lshw.sgml b/src/lshw.sgml
index 8c1c49e..5e92cbf 100644
--- a/src/lshw.sgml
+++ b/src/lshw.sgml
@@ -43,6 +43,7 @@ list hardware
<arg choice="opt"><option>-sanitize</option></arg>
<arg choice="opt"><option>-numeric</option></arg>
<arg choice="opt"><option>-quiet</option></arg>
+ <arg choice="opt"><option>-notime</option></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -126,6 +127,10 @@ Remove potentially sensitive information from output (IP addresses, serial numbe
<listitem><para>
Also display numeric IDs (for PCI and USB devices).
</para></listitem></varlistentry>
+<varlistentry><term>-notime</term>
+<listitem><para>
+Exclude volatile attributes (timestamps) from output.
+</para></listitem></varlistentry>
</variablelist>
</para>
--
2.33.1

40
0039-fix-man-page-after-previous-update.patch Normal file
View File

@ -0,0 +1,40 @@
From 56f1de9d1e4d6ff92d98530c0d3d91b353a311b9 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Thu, 15 Oct 2020 14:22:05 +0200
Subject: [PATCH 39/65] fix man page after previous update
SGML source was not in sync with man page
---
src/lshw.1 | 2 +-
src/lshw.sgml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lshw.1 b/src/lshw.1
index ae6fa34..74b0e42 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-
Outputs the device list showing bus information, detailing SCSI, USB, IDE and PCI addresses.
.TP
\fB-dump \fIfilename\fB\fR
-Dump collected information into a file (SQLite database).
+Display output and dump collected information into a file (SQLite database).
.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.sgml b/src/lshw.sgml
index 5e92cbf..d190279 100644
--- a/src/lshw.sgml
+++ b/src/lshw.sgml
@@ -101,7 +101,7 @@ Outputs the device list showing bus information, detailing <productname>SCSI</pr
</para></listitem></varlistentry>
<varlistentry><term>-dump <replaceable class="parameter">filename</replaceable></term>
<listitem><para>
-Dump collected information into a file (SQLite database).
+Display output and dump collected information into a file (SQLite database).
</para></listitem></varlistentry>
<varlistentry><term>-class <replaceable class="parameter">class</replaceable></term>
<listitem><para>
--
2.33.1

35
0040-Report-correct-memory-size-on-SMBIOS-2.7.patch Normal file
View File

@ -0,0 +1,35 @@
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 40/65] 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 30b3ab3..d33d487 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.33.1

25
0041-Add-JEDEC-manufacturer.patch Normal file
View File

@ -0,0 +1,25 @@
From 156a95e949beaaf41650134b34160d7e2bcecae6 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Sun, 10 Jan 2021 00:55:16 +0100
Subject: [PATCH 41/65] Add JEDEC manufacturer
cf. Github PR#59
---
src/core/jedec.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/core/jedec.cc b/src/core/jedec.cc
index dc7fe5e..502bd3d 100644
--- a/src/core/jedec.cc
+++ b/src/core/jedec.cc
@@ -17,6 +17,7 @@ static const char * jedec_id[] = {
"0500", "Elpida",
"07", "Hitachi",
"8007", "Hitachi",
+ "081A", "Xi'an UnilC Semiconductors",
"08", "Inmos",
"8008", "Inmos",
"0B", "Intersil",
--
2.33.1

27
0042-Avoid-crash-on-device-tree-parsing.patch Normal file
View File

@ -0,0 +1,27 @@
From 2017dad4e66ec7c9e6b25d551c6867107b958ddd Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Sun, 10 Jan 2021 00:57:48 +0100
Subject: [PATCH 42/65] Avoid crash on device-tree parsing
cf. Github PR#58
---
src/core/device-tree.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/device-tree.cc b/src/core/device-tree.cc
index 027ad16..d3188c6 100644
--- a/src/core/device-tree.cc
+++ b/src/core/device-tree.cc
@@ -1506,7 +1506,8 @@ bool scan_device_tree(hwNode & n)
scan_devtree_cpu_power(*core);
}
else {
- scan_devtree_cpu(*core);
+ if (exists(DEVICETREE "/cpus"))
+ scan_devtree_cpu(*core);
}
scan_devtree_memory(*core);
scan_devtree_memory_ibm(*core);
--
2.33.1

26
0044-fix-potential-crash.patch Normal file
View File

@ -0,0 +1,26 @@
From ff634c9a714fe25d3394c9713929c80888c0c01d Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Sun, 10 Jan 2021 01:03:50 +0100
Subject: [PATCH 44/65] fix potential crash
cf. Github PR#47
---
src/core/dmi.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/core/dmi.cc b/src/core/dmi.cc
index d33d487..fe6ad39 100644
--- a/src/core/dmi.cc
+++ b/src/core/dmi.cc
@@ -1924,6 +1924,8 @@ static bool scan_dmi_sysfs(hwNode & n)
ifstream ep_stream(SYSFSDMI "/smbios_entry_point",
ifstream::in | ifstream::binary | ifstream::ate);
+ if (!ep_stream)
+ return false;
ifstream::pos_type ep_len = ep_stream.tellg();
vector < u8 > ep_buf(ep_len);
ep_stream.seekg(0, ifstream::beg);
--
2.33.1

120
0045-improve-portability-esp.-musl.patch Normal file
View File

@ -0,0 +1,120 @@
From d3c66a6b2a0799d6982f4dc77b291934fcba80c9 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Sun, 10 Jan 2021 01:19:24 +0100
Subject: [PATCH 45/65] improve portability (esp. musl)
cf. Github PR#56
---
src/core/abi.cc | 4 +---
src/core/sysfs.cc | 21 +++++++++++----------
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/core/abi.cc b/src/core/abi.cc
index adff7b5..76c664c 100644
--- a/src/core/abi.cc
+++ b/src/core/abi.cc
@@ -20,9 +20,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $");
bool scan_abi(hwNode & system)
{
// are we compiled as 32- or 64-bit process ?
- long sc = sysconf(LONG_BIT);
- if(sc==-1) sc = sysconf(_SC_LONG_BIT);
- if(sc!=-1) system.setWidth(sc);
+ system.setWidth(LONG_BIT);
pushd(PROC_SYS);
diff --git a/src/core/sysfs.cc b/src/core/sysfs.cc
index 4e2df1c..d7a20c9 100644
--- a/src/core/sysfs.cc
+++ b/src/core/sysfs.cc
@@ -16,6 +16,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/mount.h>
+#include <libgen.h>
__ID("@(#) $Id$");
@@ -103,7 +104,7 @@ static string sysfs_getbustype(const string & path)
{
string devname =
string(fs.path + "/bus/") + string(namelist[i]->d_name) +
- "/devices/" + basename(path.c_str());
+ "/devices/" + basename(const_cast<char*>(path.c_str()));
if (samefile(devname, path))
{
@@ -151,7 +152,7 @@ static string sysfstobusinfo(const string & path)
if (bustype == "usb")
{
- string name = basename(path.c_str());
+ string name = basename(const_cast<char*>(path.c_str()));
if (matches(name, "^[0-9]+-[0-9]+(\\.[0-9]+)*:[0-9]+\\.[0-9]+$"))
{
size_t colon = name.rfind(":");
@@ -162,7 +163,7 @@ static string sysfstobusinfo(const string & path)
if (bustype == "virtio")
{
- string name = basename(path.c_str());
+ string name = basename(const_cast<char*>(path.c_str()));
if (name.compare(0, 6, "virtio") == 0)
return "virtio@" + name.substr(6);
else
@@ -170,10 +171,10 @@ static string sysfstobusinfo(const string & path)
}
if (bustype == "vio")
- return string("vio@") + basename(path.c_str());
+ return string("vio@") + basename(const_cast<char*>(path.c_str()));
if (bustype == "ccw")
- return string("ccw@") + basename(path.c_str());
+ return string("ccw@") + basename(const_cast<char*>(path.c_str()));
if (bustype == "ccwgroup")
{
@@ -251,7 +252,7 @@ string entry::driver() const
string driverlink = This->devpath + "/driver";
if (!exists(driverlink))
return "";
- return basename(readlink(driverlink).c_str());
+ return basename(const_cast<char*>(readlink(driverlink).c_str()));
}
@@ -339,7 +340,7 @@ string entry::name_in_class(const string & classname) const
string entry::name() const
{
- return basename(This->devpath.c_str());
+ return basename(const_cast<char*>(This->devpath.c_str()));
}
@@ -351,17 +352,17 @@ entry entry::parent() const
string entry::classname() const
{
- return basename(dirname(This->devpath).c_str());
+ return basename(const_cast<char*>(dirname(This->devpath).c_str()));
}
string entry::subsystem() const
{
- return basename(realpath(This->devpath+"/subsystem").c_str());
+ return basename(const_cast<char*>(realpath(This->devpath+"/subsystem").c_str()));
}
bool entry::isvirtual() const
{
- return string(basename(dirname(dirname(This->devpath)).c_str())) == "virtual";
+ return string(basename(const_cast<char*>(dirname(dirname(This->devpath)).c_str()))) == "virtual";
}
string entry::string_attr(const string & name, const string & def) const
--
2.33.1

178
0046-code-clean-up.patch Normal file
View File

@ -0,0 +1,178 @@
From 0140f7f28a09d33dc46531212d095da5e021b027 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Fri, 15 Jan 2021 00:30:13 +0100
Subject: [PATCH 46/65] code clean-up
get rid of the basename() mess
---
src/core/hw.cc | 2 +-
src/core/osutils.cc | 10 ++++++++++
src/core/osutils.h | 1 +
src/core/pci.cc | 5 ++---
src/core/sysfs.cc | 21 ++++++++++-----------
5 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/core/hw.cc b/src/core/hw.cc
index 6aea7cf..1c1dad4 100644
--- a/src/core/hw.cc
+++ b/src/core/hw.cc
@@ -1083,7 +1083,7 @@ void hwNode::setLogicalName(const string & name)
This->logicalnames.push_back("/dev/" + n);
}
else
- This->logicalnames.push_back((n[0]=='/')?n:basename(n.c_str()));
+ This->logicalnames.push_back((n[0]=='/')?n:shortname(n));
if(This->dev == "")
This->dev = get_devid(n);
diff --git a/src/core/osutils.cc b/src/core/osutils.cc
index a53ed89..8cce54c 100644
--- a/src/core/osutils.cc
+++ b/src/core/osutils.cc
@@ -455,6 +455,16 @@ string dirname(const string & path)
return result;
}
+string shortname(const string & path)
+{
+ size_t len = path.length();
+ char *buffer = new char[len + 1];
+ path.copy(buffer, len);
+ buffer[len] = '\0';
+ string result = basename(buffer);
+ delete[] buffer;
+ return result;
+}
string spaces(unsigned int count, const string & space)
{
diff --git a/src/core/osutils.h b/src/core/osutils.h
index 549258e..75c42e3 100644
--- a/src/core/osutils.h
+++ b/src/core/osutils.h
@@ -15,6 +15,7 @@ bool samefile(const std::string & path1, const std::string & path2);
std::string readlink(const std::string & path);
std::string realpath(const std::string & path);
std::string dirname(const std::string & path);
+std::string shortname(const std::string & path);
bool loadfile(const std::string & file, std::vector < std::string > &lines);
size_t splitlines(const std::string & s,
diff --git a/src/core/pci.cc b/src/core/pci.cc
index 21b9033..a1dd5c7 100644
--- a/src/core/pci.cc
+++ b/src/core/pci.cc
@@ -9,7 +9,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <stdint.h>
-#include <libgen.h>
#include <unistd.h>
#include <stdio.h>
#include <string.h>
@@ -1172,9 +1171,9 @@ bool scan_pci(hwNode & n)
string drivername = readlink(string(devices[i]->d_name)+"/driver");
string modulename = readlink(string(devices[i]->d_name)+"/driver/module");
- device->setConfig("driver", basename(const_cast<char *>(drivername.c_str())));
+ device->setConfig("driver", shortname(drivername));
if(exists(modulename))
- device->setConfig("module", basename(const_cast<char *>(modulename.c_str())));
+ device->setConfig("module", shortname(modulename));
if(exists(string(devices[i]->d_name)+"/rom"))
{
diff --git a/src/core/sysfs.cc b/src/core/sysfs.cc
index d7a20c9..fda1e9b 100644
--- a/src/core/sysfs.cc
+++ b/src/core/sysfs.cc
@@ -16,7 +16,6 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/mount.h>
-#include <libgen.h>
__ID("@(#) $Id$");
@@ -104,7 +103,7 @@ static string sysfs_getbustype(const string & path)
{
string devname =
string(fs.path + "/bus/") + string(namelist[i]->d_name) +
- "/devices/" + basename(const_cast<char*>(path.c_str()));
+ "/devices/" + shortname(path);
if (samefile(devname, path))
{
@@ -152,7 +151,7 @@ static string sysfstobusinfo(const string & path)
if (bustype == "usb")
{
- string name = basename(const_cast<char*>(path.c_str()));
+ string name = shortname(path);
if (matches(name, "^[0-9]+-[0-9]+(\\.[0-9]+)*:[0-9]+\\.[0-9]+$"))
{
size_t colon = name.rfind(":");
@@ -163,7 +162,7 @@ static string sysfstobusinfo(const string & path)
if (bustype == "virtio")
{
- string name = basename(const_cast<char*>(path.c_str()));
+ string name = shortname(path);
if (name.compare(0, 6, "virtio") == 0)
return "virtio@" + name.substr(6);
else
@@ -171,10 +170,10 @@ static string sysfstobusinfo(const string & path)
}
if (bustype == "vio")
- return string("vio@") + basename(const_cast<char*>(path.c_str()));
+ return string("vio@") + shortname(path);
if (bustype == "ccw")
- return string("ccw@") + basename(const_cast<char*>(path.c_str()));
+ return string("ccw@") + shortname(path);
if (bustype == "ccwgroup")
{
@@ -252,7 +251,7 @@ string entry::driver() const
string driverlink = This->devpath + "/driver";
if (!exists(driverlink))
return "";
- return basename(const_cast<char*>(readlink(driverlink).c_str()));
+ return shortname(readlink(driverlink));
}
@@ -340,7 +339,7 @@ string entry::name_in_class(const string & classname) const
string entry::name() const
{
- return basename(const_cast<char*>(This->devpath.c_str()));
+ return shortname(This->devpath);
}
@@ -352,17 +351,17 @@ entry entry::parent() const
string entry::classname() const
{
- return basename(const_cast<char*>(dirname(This->devpath).c_str()));
+ return shortname(dirname(This->devpath));
}
string entry::subsystem() const
{
- return basename(const_cast<char*>(realpath(This->devpath+"/subsystem").c_str()));
+ return shortname(realpath(This->devpath+"/subsystem"));
}
bool entry::isvirtual() const
{
- return string(basename(const_cast<char*>(dirname(dirname(This->devpath)).c_str()))) == "virtual";
+ return shortname(dirname(dirname(This->devpath))) == "virtual";
}
string entry::string_attr(const string & name, const string & def) const
--
2.33.1

28
0047-devtree-Add-UUID-property.patch Normal file
View File

@ -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 47/65] 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 d3188c6..7df6a4e 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.33.1

44
0048-Fix-getting-size-of-memory-banks-32GiB.patch Normal file
View File

@ -0,0 +1,44 @@
From 74e23540335254b8fca6a81cc891c52d96937d40 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Thu, 29 Apr 2021 16:40:37 +0200
Subject: [PATCH 48/65] Fix getting size of memory banks <32GiB
PR65 on Github (thanks to Z.Bitter)
Due to a regression introduced by 8ff1efb, no size was recorded for memory banks <32GiB in size on systems with an SMBIOS version of 2.7 or later. On these systems the Type 17 size field from SMBIOS was only recorded if the extended size field was used.
Modify the code to use the regular size field whenever it is valid (not 0xFFFF) and not set to 0x7FFF on versions >2.7 (indicating the extended size field is in use).
---
src/core/dmi.cc | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/core/dmi.cc b/src/core/dmi.cc
index fe6ad39..96b6506 100644
--- a/src/core/dmi.cc
+++ b/src/core/dmi.cc
@@ -1567,15 +1567,14 @@ int dmiversionrev)
// size
u = data[0x0D] << 8 | data[0x0C];
- 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;
- }
+ if (((dmiversionmaj > 2)
+ || ((dmiversionmaj == 2) && (dmiversionmin >= 7)))
+ && u == 0x7FFF) {
+ unsigned long long extendsize = (data[0x1F] << 24) | (data[0x1E] << 16) | (data[0x1D] << 8) | data[0x1C];
+ extendsize &= 0x7FFFFFFFUL;
+ size = extendsize * 1024ULL * 1024ULL;
}
- else
+ else
if (u != 0xFFFF)
size = (1024ULL * (u & 0x7FFF) * ((u & 0x8000) ? 1 : 1024ULL));
description += string(dmi_memory_device_form_factor(data[0x0E]));
--
2.33.1

39
0049-Fix-typos-in-translatable-messages.patch Normal file
View File

@ -0,0 +1,39 @@
From 4c91193fb6ba22be13e8d342dcb1db4a7738d38c Mon Sep 17 00:00:00 2001
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Fri, 18 Jun 2021 00:40:51 -0600
Subject: [PATCH 49/65] Fix typos in translatable messages
---
src/core/dmi.cc | 2 +-
src/lshw.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/dmi.cc b/src/core/dmi.cc
index 96b6506..df5db6b 100644
--- a/src/core/dmi.cc
+++ b/src/core/dmi.cc
@@ -277,7 +277,7 @@ static const char *dmi_board_type(u8 data)
"",
"",
N_("Server Blade"),
- N_("Connectivitiy Switch"),
+ N_("Connectivity Switch"),
N_("System Management Module"),
N_("Processor Module"),
N_("I/O Module"),
diff --git a/src/lshw.cc b/src/lshw.cc
index 571b1c3..e5d6b4f 100644
--- a/src/lshw.cc
+++ b/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"));
#ifdef SQLITE
- fprintf(stderr, _("\t-dump filename displays output and dump collected information into a file (SQLite database)\n"));
+ fprintf(stderr, _("\t-dump filename display output and dump collected information into a file (SQLite database)\n"));
#endif
fprintf(stderr, _("\t-class CLASS only show a certain class of hardware\n"));
fprintf(stderr, _("\t-C CLASS same as '-class CLASS'\n"));
--
2.33.1

25
0050-Fix-another-typo.patch Normal file
View File

@ -0,0 +1,25 @@
From a252ea923c747a548e0012ef41ec588e0179907f Mon Sep 17 00:00:00 2001
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Tue, 29 Jun 2021 20:34:35 -0600
Subject: [PATCH 50/65] Fix another typo
---
src/core/dmi.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/dmi.cc b/src/core/dmi.cc
index df5db6b..c356c29 100644
--- a/src/core/dmi.cc
+++ b/src/core/dmi.cc
@@ -462,7 +462,7 @@ u8 cachetype = 0)
switch ((config >> 8) & 3)
{
case 0:
- n.addCapability("write-through", _("Write-trough"));
+ n.addCapability("write-through", _("Write-through"));
break;
case 1:
n.addCapability("write-back", _("Write-back"));
--
2.33.1

134
0051-Translate-all-words-of-a-phrase-together.patch Normal file
View File

@ -0,0 +1,134 @@
From f5ff9f26bff19f8fd487f75410c6f62c8035d33d Mon Sep 17 00:00:00 2001
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Tue, 29 Jun 2021 20:46:45 -0600
Subject: [PATCH 51/65] Translate all words of a phrase together
The translation of the word "Battery" or "volume" can be in the
beginning, middle, or end of the fully translated phrase, depending on
the language.
---
src/core/dmi.cc | 20 ++++++++--------
src/core/volumes.cc | 58 ++++++++++++++++++++++-----------------------
2 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/src/core/dmi.cc b/src/core/dmi.cc
index df5db6b..b18de1f 100644
--- a/src/core/dmi.cc
+++ b/src/core/dmi.cc
@@ -152,19 +152,19 @@ static const char *dmi_battery_chemistry(u8 code)
{
static const char *chemistry[]=
{
- N_("Other"), /* 0x01 */
- N_("Unknown"),
- N_("Lead Acid"),
- N_("Nickel Cadmium"),
- N_("Nickel Metal Hydride"),
- N_("Lithium Ion"),
- N_("Zinc Air"),
- N_("Lithium Polymer") /* 0x08 */
+ N_("Other Battery"), /* 0x01 */
+ N_("Unknown Battery"),
+ N_("Lead Acid Battery"),
+ N_("Nickel Cadmium Battery"),
+ N_("Nickel Metal Hydride Battery"),
+ N_("Lithium Ion Battery"),
+ N_("Zinc Air Battery"),
+ N_("Lithium Polymer Battery") /* 0x08 */
};
if(code>=0x01 && code<=0x08)
return _(chemistry[code-0x01]);
- return "";
+ return _("Battery");
}
@@ -1735,7 +1735,7 @@ int dmiversionrev)
else
batt.setCapacity(dmi_battery_capacity(data[0x0A] + 256*data[0x0B], data[0x15]));
if(data[0x09]!=0x02 || dm->length<0x1A)
- batt.setDescription(hw::strip(string(dmi_battery_chemistry(data[0x09])) + " Battery"));
+ batt.setDescription(dmi_battery_chemistry(data[0x09]));
node.addChild(batt);
}
diff --git a/src/core/volumes.cc b/src/core/volumes.cc
index 6fce2ee..03b90b0 100644
--- a/src/core/volumes.cc
+++ b/src/core/volumes.cc
@@ -45,34 +45,34 @@ static bool detect_swap(hwNode & n, source & s);
static struct fstypes fs_types[] =
{
- {"blank", "Blank", "", NULL},
- {"fat", "Windows FAT", "", detect_fat},
- {"ntfs", "Windows NTFS", "secure", detect_ntfs},
- {"hpfs", "OS/2 HPFS", "secure", NULL},
- {"ext2", "EXT2/EXT3", "secure", detect_ext2},
- {"reiserfs", "Linux ReiserFS", "secure,journaled", detect_reiserfs},
- {"romfs", "Linux ROMFS", "ro", NULL},
- {"squashfs", "Linux SquashFS", "ro", NULL},
- {"cramfs", "Linux CramFS", "ro", NULL},
- {"minixfs", "MinixFS", "secure", NULL},
- {"sysvfs", "System V FS", "secure", NULL},
- {"jfs", "Linux JFS", "secure,journaled", NULL},
- {"xfs", "Linux XFS", "secure,journaled", NULL},
- {"iso9660", "ISO-9660", "secure,ro", NULL},
- {"xboxdvd", "X-Box DVD", "ro", NULL},
- {"udf", "UDF", "secure,ro", NULL},
- {"ufs", "UFS", "secure", NULL},
- {"hphfs", "HP-UX HFS", "secure", NULL},
- {"vxfs", "VxFS", "secure,journaled", NULL},
- {"ffs", "FFS", "secure", NULL},
- {"befs", "BeOS BFS", "journaled", NULL},
- {"qnxfs", "QNX FS", "", NULL},
- {"mfs", "MacOS MFS", "", NULL},
- {"hfsplus", "MacOS HFS+", "secure,journaled", detect_hfsx},
- {"hfs", "MacOS HFS", "", detect_hfs},
- {"apfs", "MacOS APFS", "", detect_apfs},
- {"luks", "Linux Unified Key Setup", "encrypted", detect_luks},
- {"swap", "Linux swap", "", detect_swap},
+ {"blank", N_("Blank volume"), "", NULL},
+ {"fat", N_("Windows FAT volume"), "", detect_fat},
+ {"ntfs", N_("Windows NTFS volume"), "secure", detect_ntfs},
+ {"hpfs", N_("OS/2 HPFS volume"), "secure", NULL},
+ {"ext2", N_("EXT2/EXT3 volume"), "secure", detect_ext2},
+ {"reiserfs", N_("Linux ReiserFS volume"), "secure,journaled", detect_reiserfs},
+ {"romfs", N_("Linux ROMFS volume"), "ro", NULL},
+ {"squashfs", N_("Linux SquashFS volume"), "ro", NULL},
+ {"cramfs", N_("Linux CramFS volume"), "ro", NULL},
+ {"minixfs", N_("MinixFS volume"), "secure", NULL},
+ {"sysvfs", N_("System V FS volume"), "secure", NULL},
+ {"jfs", N_("Linux JFS volume"), "secure,journaled", NULL},
+ {"xfs", N_("Linux XFS volume"), "secure,journaled", NULL},
+ {"iso9660", N_("ISO-9660 volume"), "secure,ro", NULL},
+ {"xboxdvd", N_("X-Box DVD volume"), "ro", NULL},
+ {"udf", N_("UDF volume"), "secure,ro", NULL},
+ {"ufs", N_("UFS volume"), "secure", NULL},
+ {"hphfs", N_("HP-UX HFS volume"), "secure", NULL},
+ {"vxfs", N_("VxFS volume"), "secure,journaled", NULL},
+ {"ffs", N_("FFS volume"), "secure", NULL},
+ {"befs", N_("BeOS BFS volume"), "journaled", NULL},
+ {"qnxfs", N_("QNX FS volume"), "", NULL},
+ {"mfs", N_("MacOS MFS volume"), "", NULL},
+ {"hfsplus", N_("MacOS HFS+ volume"), "secure,journaled", detect_hfsx},
+ {"hfs", N_("MacOS HFS volume"), "", detect_hfs},
+ {"apfs", N_("MacOS APFS volume"), "", detect_apfs},
+ {"luks", N_("Linux Unified Key Setup volume"), "encrypted", detect_luks},
+ {"swap", N_("Linux swap volume"), "", detect_swap},
{ NULL, NULL, NULL, NULL }
};
@@ -1154,7 +1154,7 @@ bool scan_volume(hwNode & n, source & s)
n.setConfig("filesystem", fs_types[i].id);
n.addCapability("initialized", _("initialized volume"));
if(n.getDescription()=="")
- n.setDescription(string(fs_types[i].description) + " "+string(_("volume")));
+ n.setDescription(_(fs_types[i].description));
return true;
}
i++;
--
2.33.1

29
0052-Remove-unnecessary-space-before-closing-parenthesis.patch Normal file
View File

@ -0,0 +1,29 @@
From dbe5708e7f3f14f13aee4b498070aab4fac45f6e Mon Sep 17 00:00:00 2001
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Tue, 29 Jun 2021 20:47:37 -0600
Subject: [PATCH 52/65] Remove unnecessary space before closing parenthesis
Some messages had this space and others did not.
---
src/lshw.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lshw.cc b/src/lshw.cc
index e5d6b4f..5a2d594 100644
--- a/src/lshw.cc
+++ b/src/lshw.cc
@@ -41,9 +41,9 @@ void usage(const char *progname)
fprintf(stderr, _("\t-C CLASS same as '-class CLASS'\n"));
fprintf(stderr, _("\t-c CLASS same as '-class CLASS'\n"));
fprintf(stderr,
- _("\t-disable TEST disable a test (like pci, isapnp, cpuid, etc. )\n"));
+ _("\t-disable TEST disable a test (like pci, isapnp, cpuid, etc.)\n"));
fprintf(stderr,
- _("\t-enable TEST enable a test (like pci, isapnp, cpuid, etc. )\n"));
+ _("\t-enable TEST enable a test (like pci, isapnp, cpuid, etc.)\n"));
fprintf(stderr, _("\t-quiet don't display status\n"));
fprintf(stderr, _("\t-sanitize sanitize output (remove sensitive information like serial numbers, etc.)\n"));
fprintf(stderr, _("\t-numeric output numeric IDs (for PCI, USB, etc.)\n"));
--
2.33.1

49
0055-code-clean-up.patch Normal file
View File

@ -0,0 +1,49 @@
From 353866cf8f9d2fff89d226598c97dfd33229fe35 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Tue, 12 Oct 2021 16:28:35 +0200
Subject: [PATCH 55/65] code clean-up
be more prudent before freeing memory
---
src/core/usb.cc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/core/usb.cc b/src/core/usb.cc
index da65e10..7074d87 100644
--- a/src/core/usb.cc
+++ b/src/core/usb.cc
@@ -311,6 +311,7 @@ static bool load_usbids(const string & name)
buffer[linelen-1] = '\0'; // chop \n
string line = string(buffer);
free(buffer);
+ buffer = NULL;
description = NULL;
t = 0;
@@ -338,6 +339,7 @@ static bool load_usbids(const string & name)
}
}
}
+ if(buffer != NULL) free(buffer);
}
fclose(usbids);
@@ -393,6 +395,7 @@ bool scan_usb(hwNode & n)
{
string line = hw::strip(string(buffer));
free(buffer);
+ buffer = NULL;
if(line.length()<=0)
{
@@ -497,6 +500,7 @@ bool scan_usb(hwNode & n)
}
}
}
+ if(buffer != NULL) free(buffer);
}
if(defined)
addUSBChild(n, device, bus, lev, prnt);
--
2.33.1

34
0056-code-clean-up.patch Normal file
View File

@ -0,0 +1,34 @@
From 9555d6cfc33a58a7cf91d137f7209ccf1bee86a8 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Tue, 12 Oct 2021 22:02:22 +0200
Subject: [PATCH 56/65] code clean-up
get rid of warning complaining about `register` storage of CRC
---
src/core/partitions.cc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/core/partitions.cc b/src/core/partitions.cc
index 4268903..7b9fd4f 100644
--- a/src/core/partitions.cc
+++ b/src/core/partitions.cc
@@ -520,7 +520,6 @@ hwNode & partition)
* - Now pass seed as an arg
* - changed unsigned long to uint32_t, added #include<stdint.h>
* - changed len to be an unsigned long
- * - changed crc32val to be a register
* - License remains unchanged! It's still GPL-compatable!
*/
@@ -626,7 +625,7 @@ uint32_t
__efi_crc32(const void *buf, unsigned long len, uint32_t seed)
{
unsigned long i;
- register uint32_t crc32val;
+ uint32_t crc32val;
const unsigned char *s = (const unsigned char *)buf;
crc32val = seed;
--
2.33.1

368
0057-support-for-new-ethtool-capabilities.patch Normal file
View File

@ -0,0 +1,368 @@
From 1a39de2d0af780c06b55f5a96d5f696da1a6fda3 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Tue, 12 Oct 2021 23:33:08 +0200
Subject: [PATCH 57/65] support for new ethtool capabilities
merge Github PR#73
---
src/core/network.cc | 299 +++++++++++++++++++++++++++++---------------
1 file changed, 195 insertions(+), 104 deletions(-)
diff --git a/src/core/network.cc b/src/core/network.cc
index 5aab06d..613c1af 100644
--- a/src/core/network.cc
+++ b/src/core/network.cc
@@ -53,6 +53,7 @@ typedef unsigned long long u64;
typedef uint32_t u32;
typedef uint16_t u16;
typedef uint8_t u8;
+typedef int8_t s8;
struct ethtool_cmd
{
@@ -70,6 +71,28 @@ struct ethtool_cmd
u32 reserved[4];
};
+#define MAX_LINK_MODE_MASK_SIZE 64
+struct ethtool_link_settings
+{
+ u32 cmd;
+ u32 speed; /* The forced speed, 10Mb, 100Mb, gigabit */
+ u8 duplex; /* Duplex, half or full */
+ u8 port; /* Which connector port */
+ u8 phy_address;
+ u8 autoneg; /* Enable or disable autonegotiation */
+ u8 mdio_support;
+ u8 eth_tp_mdix;
+ u8 eth_tp_mdix_ctrl;
+ s8 link_mode_masks_nwords;
+ u8 transceiver; /* Which tranceiver to use */
+ u8 master_slave_cfg;
+ u8 master_slave_state;
+ u8 reserved1[1];
+ u32 reserved[7];
+ u32 link_mode_masks[3 * MAX_LINK_MODE_MASK_SIZE]; /* Link mode mask fields for modes:
+ supported, advertised, peer advertised. */
+};
+
#ifndef IFNAMSIZ
#define IFNAMSIZ 32
#endif
@@ -108,6 +131,7 @@ struct ethtool_value
#define ETHTOOL_GSET 0x00000001 /* Get settings. */
#define ETHTOOL_GDRVINFO 0x00000003 /* Get driver info. */
#define ETHTOOL_GLINK 0x0000000a /* Get link status (ethtool_value) */
+#define ETHTOOL_GLINKSETTINGS 0x0000004c /* Get link mode settings. */
/* Indicates what features are supported by the interface. */
#define SUPPORTED_10baseT_Half (1 << 0)
@@ -124,10 +148,17 @@ struct ethtool_value
#define SUPPORTED_BNC (1 << 11)
#define SUPPORTED_10000baseT_Full (1 << 12)
-/* The forced speed, 10Mb, 100Mb, gigabit, 10GbE. */
+/* Indicates what features are supported by the interface,
+ * in the second word of the extended bitmap. */
+#define SUPPORTED2_2500baseT_Full (1 << 15)
+#define SUPPORTED2_5000baseT_Full (1 << 16)
+
+/* The forced speed, 10Mb, 100Mb, gigabit, 2.5GbE, 5GbE, 10GbE. */
#define SPEED_10 10
#define SPEED_100 100
#define SPEED_1000 1000
+#define SPEED_2500 2500
+#define SPEED_5000 5000
#define SPEED_10000 10000
/* Duplex, half or full. */
@@ -308,6 +339,168 @@ static bool isVirtual(const string & MAC)
}
+static void updateCapabilities(hwNode & interface, u32 supported, u32 supported2, u32 speed, u8 duplex, u8 port, u8 autoneg)
+{
+ if(supported & SUPPORTED_TP)
+ interface.addCapability("tp", _("twisted pair"));
+ if(supported & SUPPORTED_AUI)
+ interface.addCapability("aui", _("AUI"));
+ if(supported & SUPPORTED_BNC)
+ interface.addCapability("bnc", _("BNC"));
+ if(supported & SUPPORTED_MII)
+ interface.addCapability("mii", _("Media Independant Interface"));
+ if(supported & SUPPORTED_FIBRE)
+ interface.addCapability("fibre",_( "optical fibre"));
+ if(supported & SUPPORTED_10baseT_Half)
+ {
+ interface.addCapability("10bt", _("10Mbit/s"));
+ interface.setCapacity(10000000ULL);
+ }
+ if(supported & SUPPORTED_10baseT_Full)
+ {
+ interface.addCapability("10bt-fd", _("10Mbit/s (full duplex)"));
+ interface.setCapacity(10000000ULL);
+ }
+ if(supported & SUPPORTED_100baseT_Half)
+ {
+ interface.addCapability("100bt", _("100Mbit/s"));
+ interface.setCapacity(100000000ULL);
+ }
+ if(supported & SUPPORTED_100baseT_Full)
+ {
+ interface.addCapability("100bt-fd", _("100Mbit/s (full duplex)"));
+ interface.setCapacity(100000000ULL);
+ }
+ if(supported & SUPPORTED_1000baseT_Half)
+ {
+ interface.addCapability("1000bt", "1Gbit/s");
+ interface.setCapacity(1000000000ULL);
+ }
+ if(supported & SUPPORTED_1000baseT_Full)
+ {
+ interface.addCapability("1000bt-fd", _("1Gbit/s (full duplex)"));
+ interface.setCapacity(1000000000ULL);
+ }
+ if(supported2 & SUPPORTED2_2500baseT_Full)
+ {
+ interface.addCapability("2500bt-fd", _("2.5Gbit/s (full duplex)"));
+ interface.setCapacity(2500000000ULL);
+ }
+ if(supported2 & SUPPORTED2_5000baseT_Full)
+ {
+ interface.addCapability("5000bt-fd", _("5Gbit/s (full duplex)"));
+ interface.setCapacity(5000000000ULL);
+ }
+ if(supported & SUPPORTED_10000baseT_Full)
+ {
+ interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)"));
+ interface.setCapacity(10000000000ULL);
+ }
+ if(supported & SUPPORTED_Autoneg)
+ interface.addCapability("autonegotiation", _("Auto-negotiation"));
+
+ switch(speed)
+ {
+ case SPEED_10:
+ interface.setConfig("speed", "10Mbit/s");
+ interface.setSize(10000000ULL);
+ break;
+ case SPEED_100:
+ interface.setConfig("speed", "100Mbit/s");
+ interface.setSize(100000000ULL);
+ break;
+ case SPEED_1000:
+ interface.setConfig("speed", "1Gbit/s");
+ interface.setSize(1000000000ULL);
+ break;
+ case SPEED_2500:
+ interface.setConfig("speed", "2.5Gbit/s");
+ interface.setSize(2500000000ULL);
+ break;
+ case SPEED_5000:
+ interface.setConfig("speed", "5Gbit/s");
+ interface.setSize(5000000000ULL);
+ break;
+ case SPEED_10000:
+ interface.setConfig("speed", "10Gbit/s");
+ interface.setSize(10000000000ULL);
+ break;
+ }
+ switch(duplex)
+ {
+ case DUPLEX_HALF:
+ interface.setConfig("duplex", "half");
+ break;
+ case DUPLEX_FULL:
+ interface.setConfig("duplex", "full");
+ break;
+ }
+ switch(port)
+ {
+ case PORT_TP:
+ interface.setConfig("port", "twisted pair");
+ break;
+ case PORT_AUI:
+ interface.setConfig("port", "AUI");
+ break;
+ case PORT_BNC:
+ interface.setConfig("port", "BNC");
+ break;
+ case PORT_MII:
+ interface.setConfig("port", "MII");
+ break;
+ case PORT_FIBRE:
+ interface.setConfig("port", "fibre");
+ break;
+ }
+ interface.setConfig("autonegotiation", (autoneg == AUTONEG_DISABLE) ? "off" : "on");
+}
+
+
+static void scan_modes(hwNode & interface, int fd)
+{
+ struct ifreq ifr;
+ struct ethtool_cmd ecmd;
+ struct ethtool_link_settings elink;
+ s8 mask_size;
+
+ elink.cmd = ETHTOOL_GLINKSETTINGS;
+ elink.link_mode_masks_nwords = 0;
+ memset(&ifr, 0, sizeof(ifr));
+ strcpy(ifr.ifr_name, interface.getLogicalName().c_str());
+ ifr.ifr_data = (caddr_t) &elink;
+ // Probe link mode mask count.
+ if (ioctl(fd, SIOCETHTOOL, &ifr) == 0)
+ {
+ mask_size = -elink.link_mode_masks_nwords;
+ if (mask_size > 1 && mask_size <= MAX_LINK_MODE_MASK_SIZE)
+ {
+ elink.cmd = ETHTOOL_GLINKSETTINGS;
+ elink.link_mode_masks_nwords = mask_size;
+ memset(&ifr, 0, sizeof(ifr));
+ strcpy(ifr.ifr_name, interface.getLogicalName().c_str());
+ ifr.ifr_data = (caddr_t) &elink;
+ // Read link mode settings.
+ if (ioctl(fd, SIOCETHTOOL, &ifr) == 0)
+ {
+ updateCapabilities(interface, elink.link_mode_masks[0], elink.link_mode_masks[1],
+ elink.speed, elink.duplex, elink.port, elink.autoneg);
+ return;
+ }
+ }
+ }
+
+ ecmd.cmd = ETHTOOL_GSET;
+ memset(&ifr, 0, sizeof(ifr));
+ strcpy(ifr.ifr_name, interface.getLogicalName().c_str());
+ ifr.ifr_data = (caddr_t) &ecmd;
+ if (ioctl(fd, SIOCETHTOOL, &ifr) == 0)
+ {
+ updateCapabilities(interface, ecmd.supported, 0, ecmd.speed, ecmd.duplex, ecmd.port, ecmd.autoneg);
+ }
+}
+
+
bool scan_network(hwNode & n)
{
vector < string > interfaces;
@@ -322,7 +515,6 @@ bool scan_network(hwNode & n)
{
struct ifreq ifr;
struct ethtool_drvinfo drvinfo;
- struct ethtool_cmd ecmd;
struct ethtool_value edata;
for (unsigned int i = 0; i < interfaces.size(); i++)
@@ -417,108 +609,7 @@ bool scan_network(hwNode & n)
interface.setConfig("link", edata.data ? "yes":"no");
}
- ecmd.cmd = ETHTOOL_GSET;
- memset(&ifr, 0, sizeof(ifr));
- strcpy(ifr.ifr_name, interfaces[i].c_str());
- ifr.ifr_data = (caddr_t) &ecmd;
- if (ioctl(fd, SIOCETHTOOL, &ifr) == 0)
- {
- if(ecmd.supported & SUPPORTED_TP)
- interface.addCapability("tp", _("twisted pair"));
- if(ecmd.supported & SUPPORTED_AUI)
- interface.addCapability("aui", _("AUI"));
- if(ecmd.supported & SUPPORTED_BNC)
- interface.addCapability("bnc", _("BNC"));
- if(ecmd.supported & SUPPORTED_MII)
- interface.addCapability("mii", _("Media Independant Interface"));
- if(ecmd.supported & SUPPORTED_FIBRE)
- interface.addCapability("fibre",_( "optical fibre"));
- if(ecmd.supported & SUPPORTED_10baseT_Half)
- {
- interface.addCapability("10bt", _("10Mbit/s"));
- interface.setCapacity(10000000ULL);
- }
- if(ecmd.supported & SUPPORTED_10baseT_Full)
- {
- interface.addCapability("10bt-fd", _("10Mbit/s (full duplex)"));
- interface.setCapacity(10000000ULL);
- }
- if(ecmd.supported & SUPPORTED_100baseT_Half)
- {
- interface.addCapability("100bt", _("100Mbit/s"));
- interface.setCapacity(100000000ULL);
- }
- if(ecmd.supported & SUPPORTED_100baseT_Full)
- {
- interface.addCapability("100bt-fd", _("100Mbit/s (full duplex)"));
- interface.setCapacity(100000000ULL);
- }
- if(ecmd.supported & SUPPORTED_1000baseT_Half)
- {
- interface.addCapability("1000bt", "1Gbit/s");
- interface.setCapacity(1000000000ULL);
- }
- if(ecmd.supported & SUPPORTED_1000baseT_Full)
- {
- interface.addCapability("1000bt-fd", _("1Gbit/s (full duplex)"));
- interface.setCapacity(1000000000ULL);
- }
- if(ecmd.supported & SUPPORTED_10000baseT_Full)
- {
- interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)"));
- interface.setCapacity(10000000000ULL);
- }
- if(ecmd.supported & SUPPORTED_Autoneg)
- interface.addCapability("autonegotiation", _("Auto-negotiation"));
-
- switch(ecmd.speed)
- {
- case SPEED_10:
- interface.setConfig("speed", "10Mbit/s");
- interface.setSize(10000000ULL);
- break;
- case SPEED_100:
- interface.setConfig("speed", "100Mbit/s");
- interface.setSize(100000000ULL);
- break;
- case SPEED_1000:
- interface.setConfig("speed", "1Gbit/s");
- interface.setSize(1000000000ULL);
- break;
- case SPEED_10000:
- interface.setConfig("speed", "10Gbit/s");
- interface.setSize(10000000000ULL);
- break;
- }
- switch(ecmd.duplex)
- {
- case DUPLEX_HALF:
- interface.setConfig("duplex", "half");
- break;
- case DUPLEX_FULL:
- interface.setConfig("duplex", "full");
- break;
- }
- switch(ecmd.port)
- {
- case PORT_TP:
- interface.setConfig("port", "twisted pair");
- break;
- case PORT_AUI:
- interface.setConfig("port", "AUI");
- break;
- case PORT_BNC:
- interface.setConfig("port", "BNC");
- break;
- case PORT_MII:
- interface.setConfig("port", "MII");
- break;
- case PORT_FIBRE:
- interface.setConfig("port", "fibre");
- break;
- }
- interface.setConfig("autonegotiation", (ecmd.autoneg == AUTONEG_DISABLE) ? "off" : "on");
- }
+ scan_modes(interface, fd);
drvinfo.cmd = ETHTOOL_GDRVINFO;
memset(&ifr, 0, sizeof(ifr));
--
2.33.1

135
0058-cosmetic-fixes.patch Normal file
View File

@ -0,0 +1,135 @@
From 62d96b016b04219e76e2de2f5dd585c7bbdae9c1 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Tue, 12 Oct 2021 23:35:54 +0200
Subject: [PATCH 58/65] cosmetic fixes
Github PR#71
---
README.md | 4 ++--
docs/Changelog | 12 ++++++------
docs/TODO | 2 +-
lshw.spec.in | 2 +-
src/Makefile | 2 +-
src/core/Makefile | 2 +-
src/core/dmi.cc | 6 +++---
src/gui/Makefile | 2 +-
src/po/Makefile | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index 6659f9c..0c610f5 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Getting help
1. the lshw home page is http://lshw.ezix.org/
2. bug reports and feature requests: http://ezix.org/project/newticket?component=lshw
-
+
Please make sure you include enough information in your bug report: XML output from lshw is preferred over text or HTML, indicate the affected version of lshw, your platform (i386, x86-64, PA-RISC, PowerPC, etc.) and your distribution.
NOTE TO DISTRIBUTIONS
diff --git a/docs/Changelog b/docs/Changelog
index 6ea288c..0f648f5 100644
--- a/docs/Changelog
+++ b/docs/Changelog
@@ -3,17 +3,17 @@
detection of SD/MMC and SDIO devices
bug fixes
code cleanup
- updated data files
+ updated data files
* lshw B.02.18
migrated to git
bug fixes
code cleanup
- updated data files
+ updated data files
* lshw B.02.17
bug fixes
code cleanup
improved support for FAT-formatted disks
- updated data files
+ updated data files
* lshw B.02.16
bug fixes
code cleanup
@@ -27,7 +27,7 @@
updated data files
* lshw B.02.14
bug fixes
- support for EXT4 partitions
+ support for EXT4 partitions
* lshw B.02.13
fix bug #402: properly detect 64 bit systems (even when compiled for i386)
fix bug #401: SMP-related crash on IA-64
@@ -70,7 +70,7 @@
* lshw B.02.09
minor bugfixes (#26, #27)
added support for PCI domains (#28)
- use of /sys (sysfs) when possible for PCI devices
+ use of /sys (sysfs) when possible for PCI devices
* B.02.08.01
bugfix release for non-x86 platforms (#24)
* B.02.08
@@ -99,7 +99,7 @@
the GUI now uses a GtkTextView instead of a GtkLabel
SVG icons are now displayed for USB, Firewire, SCSI, etc.
added support for reporting VMX (Vanderpool) capabilities (untested)
- fixed a compilation problem with GCC 4
+ fixed a compilation problem with GCC 4
* B.02.03
added support for PA-RISC devices (IODC-controlled) on 2.6 kernels
the GUI can now be launched by invoking lshw with the '-X' option
diff --git a/docs/TODO b/docs/TODO
index 0b33782..2d4d3af 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -9,4 +9,4 @@
* use MPTABLE for reporting of CPUs
report SSD/rotational devices: /sys/block/DEV/queue/rotational
-better handle containers
\ No newline at end of file
+better handle containers
diff --git a/lshw.spec.in b/lshw.spec.in
index f6884ab..b3b636f 100644
--- a/lshw.spec.in
+++ b/lshw.spec.in
@@ -35,7 +35,7 @@ Requires: gtk3 >= 3.24
BuildRequires: gtk3-devel >= 3.24
%description gui
-lshw (Hardware Lister) is a small tool to provide detailed informaton on
+lshw (Hardware Lister) is a small tool to provide detailed information on
the hardware configuration of the machine. It can report exact memory
configuration, firmware version, mainboard configuration, CPU version
and speed, cache configuration, bus speed, etc. on DMI-capable x86s
diff --git a/src/core/dmi.cc b/src/core/dmi.cc
index df5db6b..6d76c53 100644
--- a/src/core/dmi.cc
+++ b/src/core/dmi.cc
@@ -1648,9 +1648,9 @@ int dmiversionrev)
uint64_t(data[0x1C]) << 40 | uint64_t(data[0x1B]) << 32 |
uint64_t(data[0x1A]) << 24 | uint64_t(data[0x19]) << 16 |
uint64_t(data[0x18]) << 8 | uint64_t(data[0x17]);
- if (end - start < 512) // memory range is smaller thant 512KB
+ if (end - start < 512) // memory range is smaller than 512KB
{
-// consider that values were expressed in megagytes
+// consider that values were expressed in megabytes
start *= 1024;
end *= 1024;
}
@@ -1688,7 +1688,7 @@ int dmiversionrev)
uint64_t(data[0x18]) << 8 | uint64_t(data[0x17]);
if (end - start < 512) // memory range is smaller than 512KB
{
-// consider that values were expressed in megagytes
+// consider that values were expressed in megabytes
start *= 1024;
end *= 1024;
}
--
2.33.1

25
0059-fix-typo.patch Normal file
View File

@ -0,0 +1,25 @@
From 5a0bad9020f731cf5b5a0744a9323f97b3a1efe9 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Tue, 12 Oct 2021 23:37:40 +0200
Subject: [PATCH 59/65] fix typo
---
src/core/network.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/network.cc b/src/core/network.cc
index 613c1af..d66c978 100644
--- a/src/core/network.cc
+++ b/src/core/network.cc
@@ -348,7 +348,7 @@ static void updateCapabilities(hwNode & interface, u32 supported, u32 supported2
if(supported & SUPPORTED_BNC)
interface.addCapability("bnc", _("BNC"));
if(supported & SUPPORTED_MII)
- interface.addCapability("mii", _("Media Independant Interface"));
+ interface.addCapability("mii", _("Media Independent Interface"));
if(supported & SUPPORTED_FIBRE)
interface.addCapability("fibre",_( "optical fibre"));
if(supported & SUPPORTED_10baseT_Half)
--
2.33.1

232
0060-add-some-includes.patch Normal file
View File

@ -0,0 +1,232 @@
From 9d9b7103257abc6fe26b383253e1f15f726f31cd Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Tue, 12 Oct 2021 23:42:02 +0200
Subject: [PATCH 60/65] add some includes
maybe needed for newer GCCs
---
src/core/cdrom.cc | 1 +
src/core/cpuid.cc | 1 +
src/core/fb.cc | 1 +
src/core/ideraid.cc | 1 +
src/core/mounts.cc | 2 +-
src/core/osutils.cc | 1 +
src/core/partitions.cc | 2 ++
src/core/pci.cc | 1 +
src/core/pcmcia-legacy.cc | 1 +
src/core/pcmcia.cc | 2 ++
src/core/smp.cc | 1 +
src/core/spd.cc | 1 +
src/core/usb.cc | 2 ++
src/core/volumes.cc | 1 +
src/gui/engine.cc | 2 ++
src/gui/print-gui.cc | 1 +
16 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/core/cdrom.cc b/src/core/cdrom.cc
index 11b9a84..58fa7b0 100644
--- a/src/core/cdrom.cc
+++ b/src/core/cdrom.cc
@@ -25,6 +25,7 @@
#include <unistd.h>
#include <limits.h>
#include <linux/cdrom.h>
+#include <climits>
__ID("@(#) $Id$");
diff --git a/src/core/cpuid.cc b/src/core/cpuid.cc
index c40dc98..3cb60ac 100644
--- a/src/core/cpuid.cc
+++ b/src/core/cpuid.cc
@@ -7,6 +7,7 @@
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/time.h>
+#include <cstring>
__ID("@(#) $Id$");
diff --git a/src/core/fb.cc b/src/core/fb.cc
index 5456204..d198982 100644
--- a/src/core/fb.cc
+++ b/src/core/fb.cc
@@ -14,6 +14,7 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
+#include <cstring>
__ID("@(#) $Id$");
diff --git a/src/core/ideraid.cc b/src/core/ideraid.cc
index 5cff28f..5e84ab0 100644
--- a/src/core/ideraid.cc
+++ b/src/core/ideraid.cc
@@ -20,6 +20,7 @@
#include <string.h>
#include <dirent.h>
#include <ctype.h>
+#include <cstring>
#include <vector>
#include <linux/hdreg.h>
#include <regex.h>
diff --git a/src/core/mounts.cc b/src/core/mounts.cc
index 495a3c2..79b682e 100644
--- a/src/core/mounts.cc
+++ b/src/core/mounts.cc
@@ -14,7 +14,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-
+#include <cstdlib>
__ID("@(#) $Id$");
diff --git a/src/core/osutils.cc b/src/core/osutils.cc
index 8cce54c..cfa09ca 100644
--- a/src/core/osutils.cc
+++ b/src/core/osutils.cc
@@ -3,6 +3,7 @@
#include <sstream>
#include <iomanip>
#include <stack>
+#include <cstring>
#include <fcntl.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/src/core/partitions.cc b/src/core/partitions.cc
index 7b9fd4f..69fdc2c 100644
--- a/src/core/partitions.cc
+++ b/src/core/partitions.cc
@@ -21,6 +21,8 @@
#include "volumes.h"
#include "osutils.h"
#include <stdio.h>
+#include <stdlib.h>
+#include <cstring>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/src/core/pci.cc b/src/core/pci.cc
index a1dd5c7..5040d75 100644
--- a/src/core/pci.cc
+++ b/src/core/pci.cc
@@ -14,6 +14,7 @@
#include <string.h>
#include <stdlib.h>
#include <dirent.h>
+#include <cstring>
__ID("@(#) $Id$");
diff --git a/src/core/pcmcia-legacy.cc b/src/core/pcmcia-legacy.cc
index bf68911..8983ccb 100644
--- a/src/core/pcmcia-legacy.cc
+++ b/src/core/pcmcia-legacy.cc
@@ -9,6 +9,7 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
+#include <cstring>
__ID("@(#) $Id$");
diff --git a/src/core/pcmcia.cc b/src/core/pcmcia.cc
index 1db47b2..4d93947 100644
--- a/src/core/pcmcia.cc
+++ b/src/core/pcmcia.cc
@@ -6,6 +6,8 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
+#include <cstdlib>
+#include <cstring>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/core/smp.cc b/src/core/smp.cc
index 9bd3631..df1c88b 100644
--- a/src/core/smp.cc
+++ b/src/core/smp.cc
@@ -11,6 +11,7 @@
#include <fcntl.h>
#include <string.h>
#include <unistd.h>
+#include <cstring>
#include "osutils.h"
diff --git a/src/core/spd.cc b/src/core/spd.cc
index a304d06..babdf1b 100644
--- a/src/core/spd.cc
+++ b/src/core/spd.cc
@@ -9,6 +9,7 @@
#include <string>
#include <dirent.h>
#include <stdio.h>
+#include <cstring>
__ID("@(#) $Id$");
diff --git a/src/core/usb.cc b/src/core/usb.cc
index da65e10..353036d 100644
--- a/src/core/usb.cc
+++ b/src/core/usb.cc
@@ -14,6 +14,7 @@
#include "heuristics.h"
#include "options.h"
#include <stdio.h>
+#include <stdlib.h>
#include <map>
#include <sys/types.h>
#include <sys/stat.h>
@@ -24,6 +25,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <dirent.h>
+#include <cstring>
#define PROCBUSUSBDEVICES "/proc/bus/usb/devices"
#define SYSKERNELDEBUGUSBDEVICES "/sys/kernel/debug/usb/devices"
diff --git a/src/core/volumes.cc b/src/core/volumes.cc
index 6fce2ee..53096ba 100644
--- a/src/core/volumes.cc
+++ b/src/core/volumes.cc
@@ -22,6 +22,7 @@
#include <unistd.h>
#include <stdint.h>
#include <time.h>
+#include <cstring>
__ID("@(#) $Id$");
diff --git a/src/gui/engine.cc b/src/gui/engine.cc
index 2962ec8..ea442cc 100644
--- a/src/gui/engine.cc
+++ b/src/gui/engine.cc
@@ -6,6 +6,8 @@
#include "osutils.h"
#include "options.h"
+#include <cstring>
+#include <cstdlib>
#include <iostream>
#include <fstream>
#include <sys/utsname.h>
diff --git a/src/gui/print-gui.cc b/src/gui/print-gui.cc
index 4138424..916f25d 100644
--- a/src/gui/print-gui.cc
+++ b/src/gui/print-gui.cc
@@ -10,6 +10,7 @@
#include "version.h"
#include "osutils.h"
#include "stock.h"
+#include <cstring>
#include <sstream>
#include <iomanip>
#include <unistd.h>
--
2.33.1

115
0061-Add-more-network-speeds.patch Normal file
View File

@ -0,0 +1,115 @@
From 663869cc6276811fec884dd76394c7d8656d326a Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Tue, 19 Oct 2021 01:09:20 +0200
Subject: [PATCH 61/65] Add more network speeds
cf. Github PR#75
---
src/core/network.cc | 58 ++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 57 insertions(+), 1 deletion(-)
diff --git a/src/core/network.cc b/src/core/network.cc
index d66c978..01a1f51 100644
--- a/src/core/network.cc
+++ b/src/core/network.cc
@@ -147,19 +147,38 @@ struct ethtool_value
#define SUPPORTED_FIBRE (1 << 10)
#define SUPPORTED_BNC (1 << 11)
#define SUPPORTED_10000baseT_Full (1 << 12)
+#define SUPPORTED_2500baseX_Full (1 << 15)
+#define SUPPORTED_1000baseKX_Full (1 << 17)
+#define SUPPORTED_10000baseKX4_Full (1 << 18)
+#define SUPPORTED_10000baseKR_Full (1 << 19)
+#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_25000baseCR_Full (1 << 31)
/* Indicates what features are supported by the interface,
* in the second word of the extended bitmap. */
+#define SUPPORTED2_25000baseKR_Full (1 << 0)
+#define SUPPORTED2_25000baseSR_Full (1 << 1)
+#define SUPPORTED2_1000baseX_Full (1 << 9)
+#define SUPPORTED2_10000baseCR_Full (1 << 10)
+#define SUPPORTED2_10000baseSR_Full (1 << 11)
+#define SUPPORTED2_10000baseLR_Full (1 << 12)
+#define SUPPORTED2_10000baseLRM_Full (1 << 13)
+#define SUPPORTED2_10000baseER_Full (1 << 14)
#define SUPPORTED2_2500baseT_Full (1 << 15)
#define SUPPORTED2_5000baseT_Full (1 << 16)
-/* The forced speed, 10Mb, 100Mb, gigabit, 2.5GbE, 5GbE, 10GbE. */
+/* The forced speed, 10Mb, 100Mb, gigabit, 2.5GbE, 5GbE, 10GbE and up. */
#define SPEED_10 10
#define SPEED_100 100
#define SPEED_1000 1000
#define SPEED_2500 2500
#define SPEED_5000 5000
#define SPEED_10000 10000
+#define SPEED_25000 25000
+#define SPEED_40000 40000
/* Duplex, half or full. */
#define DUPLEX_HALF 0x00
@@ -381,6 +400,16 @@ static void updateCapabilities(hwNode & interface, u32 supported, u32 supported2
interface.addCapability("1000bt-fd", _("1Gbit/s (full duplex)"));
interface.setCapacity(1000000000ULL);
}
+ if((supported & SUPPORTED_1000baseKX_Full) || (supported2 & SUPPORTED2_1000baseX_Full))
+ {
+ interface.addCapability("1000bx-fd", _("1Gbit/s (full duplex)"));
+ interface.setCapacity(1000000000ULL);
+ }
+ if(supported & SUPPORTED_2500baseX_Full)
+ {
+ interface.addCapability("2500bx-fd", _("2.5Gbit/s (full duplex)"));
+ interface.setCapacity(2500000000ULL);
+ }
if(supported2 & SUPPORTED2_2500baseT_Full)
{
interface.addCapability("2500bt-fd", _("2.5Gbit/s (full duplex)"));
@@ -396,6 +425,25 @@ static void updateCapabilities(hwNode & interface, u32 supported, u32 supported2
interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)"));
interface.setCapacity(10000000000ULL);
}
+ if((supported & (SUPPORTED_10000baseKX4_Full | SUPPORTED_10000baseKR_Full)) ||
+ (supported2 & (SUPPORTED2_10000baseCR_Full | SUPPORTED2_10000baseSR_Full | SUPPORTED2_10000baseLR_Full |
+ SUPPORTED2_10000baseLRM_Full | SUPPORTED2_10000baseER_Full)))
+ {
+ interface.addCapability("10000bx-fd", _("10Gbit/s (full duplex)"));
+ interface.setCapacity(10000000000ULL);
+ }
+ 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_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_Autoneg)
interface.addCapability("autonegotiation", _("Auto-negotiation"));
@@ -425,6 +473,14 @@ static void updateCapabilities(hwNode & interface, u32 supported, u32 supported2
interface.setConfig("speed", "10Gbit/s");
interface.setSize(10000000000ULL);
break;
+ case SPEED_25000:
+ interface.setConfig("speed", "25Gbit/s");
+ interface.setSize(25000000000ULL);
+ break;
+ case SPEED_40000:
+ interface.setConfig("speed", "40Gbit/s");
+ interface.setSize(40000000000ULL);
+ break;
}
switch(duplex)
{
--
2.33.1

1804
0062-Update-POT-file.patch Normal file
View File

File diff suppressed because it is too large Load Diff

1541
0063-Add-Catalan-translation.patch Normal file
View File

File diff suppressed because it is too large Load Diff

172
0065-merge-Github-PR-77.patch Normal file
View File

@ -0,0 +1,172 @@
From 9a7ded387a87accd6437b3e36748d4451e8135f4 Mon Sep 17 00:00:00 2001
From: Erik Ekman <erik@kryo.se>
Date: Tue, 2 Nov 2021 14:56:25 +0100
Subject: [PATCH 65/65] merge Github PR#77
---
src/core/network.cc | 128 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 128 insertions(+)
diff --git a/src/core/network.cc b/src/core/network.cc
index 01a1f51..746ac1b 100644
--- a/src/core/network.cc
+++ b/src/core/network.cc
@@ -93,6 +93,41 @@ struct ethtool_link_settings
supported, advertised, peer advertised. */
};
+/* Recognized module eeprom standards. */
+#define ETH_MODULE_SFF_8079 0x1
+#define ETH_MODULE_SFF_8472 0x2
+#define ETH_MODULE_SFF_8636 0x3
+#define ETH_MODULE_SFF_8436 0x4
+
+struct ethtool_modinfo {
+ u32 cmd;
+ u32 type; /* SFF standard used in module */
+ u32 eeprom_len; /* Length of module eeprom */
+ u32 reserved[8];
+};
+
+/* Known id types. */
+#define SFF_8024_ID_SOLDERED 0x2
+#define SFF_8024_ID_SFP 0x3
+#define SFF_8024_EXT_ID_DEFINED_BY_2WIRE_ID 0x4
+
+/* Common connector types. */
+#define SFF_8024_CONNECTOR_SC 0x1
+#define SFF_8024_CONNECTOR_LC 0x7
+#define SFF_8024_CONNECTOR_OPTICAL_PIGTAIL 0xb
+#define SFF_8024_CONNECTOR_COPPER_PIGTAIL 0x21
+#define SFF_8024_CONNECTOR_RJ45 0x22
+#define SFF_8024_CONNECTOR_NON_SEPARABLE 0x23
+
+#define MAX_EEPROM_SIZE 256
+struct ethtool_eeprom {
+ u32 cmd;
+ u32 magic; /* Only used for eeprom writes */
+ u32 offset; /* Read or write offset */
+ u32 len; /* Length of read/write */
+ u8 data[MAX_EEPROM_SIZE]; /* Buffer */
+};
+
#ifndef IFNAMSIZ
#define IFNAMSIZ 32
#endif
@@ -131,6 +166,8 @@ struct ethtool_value
#define ETHTOOL_GSET 0x00000001 /* Get settings. */
#define ETHTOOL_GDRVINFO 0x00000003 /* Get driver info. */
#define ETHTOOL_GLINK 0x0000000a /* Get link status (ethtool_value) */
+#define ETHTOOL_GMODULEINFO 0x00000042 /* Get plug-in module information */
+#define ETHTOOL_GMODULEEEPROM 0x00000043 /* Get plug-in module eeprom */
#define ETHTOOL_GLINKSETTINGS 0x0000004c /* Get link mode settings. */
/* Indicates what features are supported by the interface. */
@@ -358,6 +395,96 @@ static bool isVirtual(const string & MAC)
}
+// Get data for connected transceiver module.
+static void scan_module(hwNode & interface, int fd)
+{
+ struct ifreq ifr;
+ struct ethtool_modinfo emodinfo;
+ struct ethtool_eeprom eeeprom;
+
+ emodinfo.cmd = ETHTOOL_GMODULEINFO;
+ memset(&ifr, 0, sizeof(ifr));
+ strcpy(ifr.ifr_name, interface.getLogicalName().c_str());
+ ifr.ifr_data = (caddr_t) &emodinfo;
+ // Skip interface if module info not supported.
+ if (ioctl(fd, SIOCETHTOOL, &ifr) != 0)
+ return;
+
+ eeeprom.cmd = ETHTOOL_GMODULEEEPROM;
+ eeeprom.offset = 0;
+ eeeprom.len = emodinfo.eeprom_len;
+ if (eeeprom.len > MAX_EEPROM_SIZE)
+ eeeprom.len = MAX_EEPROM_SIZE;
+ memset(&ifr, 0, sizeof(ifr));
+ strcpy(ifr.ifr_name, interface.getLogicalName().c_str());
+ ifr.ifr_data = (caddr_t) &eeeprom;
+ if (ioctl(fd, SIOCETHTOOL, &ifr) != 0)
+ return;
+
+ switch (emodinfo.type)
+ {
+ /* SFF 8472 eeprom layout starts with same data as SFF 8079. */
+ case ETH_MODULE_SFF_8079:
+ case ETH_MODULE_SFF_8472:
+ if ((eeeprom.data[0] == SFF_8024_ID_SOLDERED || eeeprom.data[0] == SFF_8024_ID_SFP) &&
+ eeeprom.data[1] == SFF_8024_EXT_ID_DEFINED_BY_2WIRE_ID)
+ {
+ char buffer[32];
+ /* Get part number (padded with space). String is stripped inside setConfig. */
+ interface.setConfig("module", string((const char*)&eeeprom.data[40], 16));
+ int wavelength = eeeprom.data[60] << 8 | eeeprom.data[61];
+ /* Skip wavelength for SFP+ cables, they use byte 60 for other data. */
+ if ((eeeprom.data[8] & 0x0C) == 0 && wavelength > 0)
+ {
+ snprintf(buffer, sizeof(buffer), "%dnm", wavelength);
+ interface.setConfig("wavelength", buffer);
+ }
+ int max_length = 0;
+ int length;
+ length = eeeprom.data[14] * 1000; /* SMF, km */
+ if (length > max_length) max_length = length;
+ length = eeeprom.data[15] * 100; /* SMF, meter */
+ if (length > max_length) max_length = length;
+ length = eeeprom.data[16] * 10; /* 50um (OM2), meter */
+ if (length > max_length) max_length = length;
+ length = eeeprom.data[17] * 10; /* 62.5um (OM1), meter */
+ if (length > max_length) max_length = length;
+ length = eeeprom.data[18]; /* Copper, meter */
+ if (length > max_length) max_length = length;
+ length = eeeprom.data[19] * 10; /* OM3, meter */
+ if (length > max_length) max_length = length;
+ if (max_length > 0)
+ {
+ snprintf(buffer, sizeof(buffer), "%dm", max_length);
+ interface.setConfig("maxlength", buffer);
+ }
+ switch (eeeprom.data[2])
+ {
+ case SFF_8024_CONNECTOR_SC:
+ interface.setConfig("connector", "SC");
+ break;
+ case SFF_8024_CONNECTOR_LC:
+ interface.setConfig("connector", "LC");
+ break;
+ case SFF_8024_CONNECTOR_OPTICAL_PIGTAIL:
+ interface.setConfig("connector", "optical pigtail");
+ break;
+ case SFF_8024_CONNECTOR_COPPER_PIGTAIL:
+ interface.setConfig("connector", "copper pigtail");
+ break;
+ case SFF_8024_CONNECTOR_RJ45:
+ interface.setConfig("connector", "RJ45");
+ break;
+ case SFF_8024_CONNECTOR_NON_SEPARABLE:
+ interface.setConfig("connector", "non separable");
+ break;
+ }
+ }
+ break;
+ }
+}
+
+
static void updateCapabilities(hwNode & interface, u32 supported, u32 supported2, u32 speed, u8 duplex, u8 port, u8 autoneg)
{
if(supported & SUPPORTED_TP)
@@ -666,6 +793,7 @@ bool scan_network(hwNode & n)
}
scan_modes(interface, fd);
+ scan_module(interface, fd);
drvinfo.cmd = ETHTOOL_GDRVINFO;
memset(&ifr, 0, sizeof(ifr));
--
2.33.1

95
0066-Fix-mistakes-in-Catalan-translation.patch Normal file
View File

@ -0,0 +1,95 @@
From d67d67a7d9d3288a1ddadc8fafeb6143cbafcbac Mon Sep 17 00:00:00 2001
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Tue, 9 Nov 2021 09:21:24 -0700
Subject: [PATCH 1/2] Fix mistakes in Catalan translation
---
src/po/ca.po | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/po/ca.po b/src/po/ca.po
index 09710a9..f1c8cb4 100644
--- a/src/po/ca.po
+++ b/src/po/ca.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: @(#) $Id$\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-10-22 00:36-0600\n"
-"PO-Revision-Date: 2021-10-22 01:05-0600\n"
+"PO-Revision-Date: 2021-11-09 09:21-0700\n"
"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
"Language-Team: Catalan <ca@li.org>\n"
"Language: ca\n"
@@ -1312,11 +1312,11 @@ msgstr "Atributs extensos"
#: ../core/volumes.cc:318
msgid "4GB+ files"
-msgstr "fitxers 4GB+"
+msgstr "fitxers de 4GB+"
#: ../core/volumes.cc:320
msgid "16TB+ files"
-msgstr "fitxers 16TB+"
+msgstr "fitxers de 16TB+"
#: ../core/volumes.cc:322
msgid "directories with 65000+ subdirs"
@@ -1406,7 +1406,7 @@ msgstr "\t-html emet l'arbre de maquinari com a HTML\n"
#: ../lshw.cc:30
#, c-format
msgid "\t-xml output hardware tree as XML\n"
-msgstr "\t-xml emet l'arbre demaquinari com a XML\n"
+msgstr "\t-xml emet l'arbre de maquinari com a XML\n"
#: ../lshw.cc:31
#, c-format
@@ -1443,7 +1443,7 @@ msgid ""
"\t-dump filename display output and dump collected information into a file "
"(SQLite database)\n"
msgstr ""
-"\t-dump fitxer mostra la sortida i bolca la informació recollida en un "
+"\t-dump fitxer mostra la sortida i bolca la informació recollida en un "
"fitxer (base de dades SQL)\n"
#: ../lshw.cc:40
@@ -1454,24 +1454,24 @@ msgstr "\t-class CLASSE mostra només una classe determinada de maquinari\n"
#: ../lshw.cc:41
#, c-format
msgid "\t-C CLASS same as '-class CLASS'\n"
-msgstr "\t-C CLASSE ho mateix que '-class CLASSE'\n"
+msgstr "\t-C CLASSE ho mateix que '-class CLASSE'\n"
#: ../lshw.cc:42
#, c-format
msgid "\t-c CLASS same as '-class CLASS'\n"
-msgstr "\t-c CLASSE ho mateix que '-class CLASSE'\n"
+msgstr "\t-c CLASSE ho mateix que '-class CLASSE'\n"
#: ../lshw.cc:44
#, c-format
msgid "\t-disable TEST disable a test (like pci, isapnp, cpuid, etc.)\n"
msgstr ""
-"\t-disable TEST deshabilita una prova (com a pci, isapnp, cpuid, etc.)\n"
+"\t-disable PROVA deshabilita una prova (com a pci, isapnp, cpuid, etc.)\n"
#: ../lshw.cc:46
#, c-format
msgid "\t-enable TEST enable a test (like pci, isapnp, cpuid, etc.)\n"
msgstr ""
-"\t-enable TEST habilita una prova (com a pci, isapnp, cpuid, etc.)\n"
+"\t-enable PROVA habilita una prova (com a pci, isapnp, cpuid, etc.)\n"
#: ../lshw.cc:47
#, c-format
@@ -1484,7 +1484,7 @@ msgid ""
"\t-sanitize sanitize output (remove sensitive information like serial "
"numbers, etc.)\n"
msgstr ""
-"\t-sanitize saneja la sortida (elimina informació sensitiva com als "
+"\t-sanitize expurga la sortida (elimina informació sensitiva com als "
"nombres serials etc.)\n"
#: ../lshw.cc:49
--
2.33.1

1541
0067-Add-Spanish-translation.patch Normal file
View File

File diff suppressed because it is too large Load Diff

66
lshw-B.02.18-revert-json.patch
View File

@ -1,66 +0,0 @@
commit 135a853c60582b14c5b67e5cd988a8062d9896f4
Author: Lyonel Vincent <lyonel@ezix.org>
Date: Fri Apr 28 16:54:42 2017 +0200
Fix JSON output format
cf. https://github.com/lyonel/lshw/pull/28
diff --git a/src/core/hw.cc b/src/core/hw.cc
index 68e5912..9defd26 100644
--- a/src/core/hw.cc
+++ b/src/core/hw.cc
@@ -1368,9 +1368,14 @@ string hwNode::asJSON(unsigned level)
config = getConfigKeys();
resources = getResources("\" value=\"");
+ if (level == 0)
+ {
+ out << "[" << endl;
+ }
+
if(visible(getClassName()))
{
- out << "{" << endl;
+ out << spaces(2*level) << "{" << endl;
out << spaces(2*level+2) << "\"id\" : \"" << getId() << "\"," << endl;
out << spaces(2*level+2) << "\"class\" : \"" << getClassName() << "\"";
@@ -1613,20 +1618,13 @@ string hwNode::asJSON(unsigned level)
resources.clear();
}
-
- if(countChildren()>0)
+ for (unsigned int i = 0; i < countChildren(); i++)
{
- if(visible(getClassName()))
- out << "," << endl << spaces(2*level+2) << "\"children\" : [" << endl;
-
- for (unsigned int i = 0; i < countChildren(); i++)
+ out << getChild(i)->asJSON(visible(getClassName()) ? level + 2 : 1);
+ if (visible(getChild(i)->getClassName()))
{
- out << spaces(2*level+4) << getChild(i)->asJSON(visible(getClassName()) ? level + 2 : 1);
- if(visible(getChild(i)->getClassName()) && (i < countChildren()-1)) out << "," << endl;
+ out << "," << endl;
}
-
- if(visible(getClassName()))
- out << endl << spaces(2*level+2) << "]";
}
if(visible(getClassName()))
@@ -1635,6 +1633,12 @@ string hwNode::asJSON(unsigned level)
out << "}";
}
+ if (level == 0)
+ {
+ out.seekp(-2, std::ios_base::end);
+ out << endl << "]" << endl;
+ }
+
return out.str();
}

9
lshw-B.02.19.2-cmake.patch
View File

@ -734,24 +734,25 @@ new file mode 100644
index 0000000..3489053
--- /dev/null
+++ b/src/gui/CMakeLists.txt
@@ -0,0 +1,67 @@
@@ -0,0 +1,68 @@
+if(NOT GUI OR STATIC)
+ message("-- gtk-${PROJECT_NAME} disabled")
+ return()
+endif()
+
+find_package(PkgConfig)
+pkg_check_modules(GTK2 REQUIRED gtk+-2.0 gmodule-2.0)
+pkg_check_modules(GTK3 REQUIRED gtk+-3.0 gmodule-2.0)
+
+file(GLOB GTK_SOURCES "*.c*")
+list(FILTER GTK_SOURCES EXCLUDE REGEX ".*support.c$")
+
+include_directories("${PROJECT_BINARY_DIR}")
+include_directories("${PROJECT_SOURCE_DIR}/src/core")
+
+include_directories("${GTK2_INCLUDE_DIRS}")
+include_directories("${GTK3_INCLUDE_DIRS}")
+
+add_executable(gtk-lshw ${GTK_SOURCES})
+target_link_libraries(gtk-lshw ${SQLITE3_LIBRARIES} ${Z_LIBRARIES} ${GTK2_LIBRARIES} core resolv)
+target_link_libraries(gtk-lshw ${SQLITE3_LIBRARIES} ${Z_LIBRARIES} ${GTK3_LIBRARIES} core resolv)
+install(TARGETS gtk-lshw DESTINATION sbin)
+
+if(POLICYKIT)

140
lshw.spec
View File

@ -8,16 +8,78 @@ URL: http://ezix.org/project/wiki/HardwareLiSter
Source0: http://www.ezix.org/software/files/lshw-%{version}.tar.gz
Source1: https://salsa.debian.org/openstack-team/third-party/lshw/raw/debian/stein/debian/patches/lshw-gtk.1
Patch1: lshw-B.02.18-scandir.patch
Patch3: lshw-B.02.18-revert-json.patch
Patch4: lshw-B.02.19.2-cmake.patch
Patch5: https://build.opensuse.org/package/view_file/hardware/lshw/lshw-fix-mmc.patch
Patch6: https://build.opensuse.org/package/view_file/hardware/lshw/lshw-fix-segfault-in-apfs-volume-code.patch
Patch9: 0003-report-CPU-family-model-stepping.patch
Patch10: 0004-move-PnP-devices-to-the-ISA-LPC-bridge.patch
Patch11: 0005-correctly-format-SMBIOS-UUID.patch
Patch12: 0006-cosmetic-clean-up.patch
Patch13: 0007-begin-work-on-input-devices.patch
Patch14: 0008-cosmetic-fixes.patch
Patch15: 0009-detect-sound-devices.patch
Patch16: 0010-detect-framebuffers.patch
Patch17: 0011-try-to-connect-input-devices-to-the-right-parent.patch
Patch18: 0012-devtree-Add-chip-id-from-the-dimm-module.patch
Patch19: 0013-devtree-Add-chip-id-from-CPU-node.patch
Patch20: 0014-volumes-fix-segfault-in-apfs-volume-code.patch
Patch21: 0015-merge-Github-PR-53.patch
Patch22: 0016-devtree-Add-capabilites-to-the-OPAL-Firmware.patch
Patch23: 0017-fix-issue-with-logical-names-being-truncated-dev-sda.patch
Patch24: 0018-code-clean-up-for-read-3.patch
Patch25: 0019-JSON-output-clean-up-list-object.patch
Patch26: 0020-clean-up-JSON-output.patch
Patch27: 0021-report-product-model-on-Power-systems.patch
Patch28: 0022-Fix-few-memory-leaks.patch
Patch29: 0023-Build-against-gtk3-instead-of-gtk2.patch
Patch30: 0024-Remove-deprecated-stock-messages.patch
Patch31: 0025-Remove-hack-which-is-apparently-not-useful-anymore.patch
Patch32: 0026-Use-GtkFileChooserNative-instead-of-GtkFileChooserDi.patch
Patch33: 0027-Replace-deprecated-GtkIconFactory-with-GHashTable.patch
Patch34: 0028-Replace-the-last-GtkStock-in-overwrite-dialog.patch
Patch35: 0029-Remove-deprecated-widgets.patch
Patch36: 0030-Remove-deprecated-use_action_appearance-property.patch
Patch37: 0031-Move-to-GtkApplication.patch
Patch38: 0032-Replace-signals-with-GSimpleActions.patch
Patch39: 0033-Enable-Disable-GSimpleAction-instead-of-button-sensi.patch
Patch40: 0034-Move-from-GtkMenuBar-to-GMenu.patch
Patch41: 0035-Replace-the-about-GtkDialog-with-a-GtkAboutDialog.patch
Patch42: 0036-Update-docs-TODO.patch
Patch43: 0037-Update-docs-TODO.patch
Patch44: 0038-update-man-page.patch
Patch45: 0039-fix-man-page-after-previous-update.patch
Patch46: 0040-Report-correct-memory-size-on-SMBIOS-2.7.patch
Patch47: 0041-Add-JEDEC-manufacturer.patch
Patch48: 0042-Avoid-crash-on-device-tree-parsing.patch
#Patch49: 0043-add-static-target-to-Makefile.patch
Patch50: 0044-fix-potential-crash.patch
Patch51: 0045-improve-portability-esp.-musl.patch
Patch52: 0046-code-clean-up.patch
Patch53: 0047-devtree-Add-UUID-property.patch
Patch54: 0048-Fix-getting-size-of-memory-banks-32GiB.patch
Patch55: 0049-Fix-typos-in-translatable-messages.patch
Patch56: 0050-Fix-another-typo.patch
Patch57: 0051-Translate-all-words-of-a-phrase-together.patch
Patch58: 0052-Remove-unnecessary-space-before-closing-parenthesis.patch
#Patch59: 0053-allow-pkg-config-override.patch
#Patch60: 0054-allow-pkg-config-override.patch
Patch61: 0055-code-clean-up.patch
Patch62: 0056-code-clean-up.patch
Patch63: 0057-support-for-new-ethtool-capabilities.patch
Patch64: 0058-cosmetic-fixes.patch
Patch65: 0059-fix-typo.patch
Patch66: 0060-add-some-includes.patch
Patch67: 0061-Add-more-network-speeds.patch
Patch68: 0062-Update-POT-file.patch
Patch69: 0063-Add-Catalan-translation.patch
#Patch70: 0064-use-max-9-Gzip-compression.patch
Patch71: 0065-merge-Github-PR-77.patch
Patch72: 0066-Fix-mistakes-in-Catalan-translation.patch
Patch73: 0067-Add-Spanish-translation.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: gettext
BuildRequires: gtk2-devel >= 2.4
BuildRequires: gtk3-devel >= 3.24
BuildRequires: libappstream-glib
BuildRequires: ninja-build
BuildRequires: python3-devel
@ -43,10 +105,72 @@ format.
%prep
%setup -q
%patch01 -p1
%patch03 -R -p1
%patch04 -p1
%patch05 -p1
%patch06 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch28 -p1
%patch29 -p1
%patch30 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
%patch34 -p1
%patch35 -p1
%patch36 -p1
%patch37 -p1
%patch38 -p1
%patch39 -p1
%patch40 -p1
%patch41 -p1
%patch42 -p1
%patch43 -p1
%patch44 -p1
%patch45 -p1
%patch46 -p1
%patch47 -p1
%patch48 -p1
#%patch49 -p1 changes only on Makefile, not needed
%patch50 -p1
%patch51 -p1
%patch52 -p1
%patch53 -p1
%patch54 -p1
%patch55 -p1
%patch56 -p1
%patch57 -p1
%patch58 -p1
#%patch59 -p1 changes only on src/Makefile, not needed
#%patch60 -p1 changes only on src/gui/Makefile, not needed
%patch61 -p1
%patch62 -p1
%patch63 -p1
%patch64 -p1
%patch65 -p1
%patch66 -p1
%patch67 -p1
%patch68 -p1
%patch69 -p1
#%patch70 -p1 changes only on src/Makefile, not needed
%patch71 -p1
%patch72 -p1
%patch73 -p1
%build
%cmake -DNOLOGO=ON -DHWDATA=OFF -DPOLICYKIT=ON -DBUILD_SHARED_LIBS=OFF -GNinja
@ -59,7 +183,7 @@ ln -s gtk-lshw %{buildroot}%{_sbindir}/lshw-gui
# translations seems borken, remove for now
#find_lang %{name}
rm -rf %{buildroot}%{_datadir}/locale/fr/
rm -rf %{buildroot}%{_datadir}/locale/*/
%check
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml