changed debian/source/format to native
This commit is contained in:
Lu zhiping
parent
20b636220b
commit
97ab1044b5
|
|
@ -1,58 +0,0 @@
|
|||
From 82393aa9b59307a443677df7340a1dd38847a5ef Mon Sep 17 00:00:00 2001
|
||||
From: Yuan-Chen Cheng <ycheng.tw@gmail.com>
|
||||
Date: Fri, 25 Oct 2019 11:15:24 -0400
|
||||
Subject: [PATCH] correct "JSON output format" without/with all class.
|
||||
|
||||
test pass on my machine.
|
||||
|
||||
Signed-off-by: Yuan-Chen Cheng <ycheng.tw@gmail.com>
|
||||
---
|
||||
src/core/hw.cc | 25 ++++++++++++++++++++-----
|
||||
1 file changed, 20 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/core/hw.cc b/src/core/hw.cc
|
||||
index 4522c1a..8232337 100644
|
||||
--- a/src/core/hw.cc
|
||||
+++ b/src/core/hw.cc
|
||||
@@ -1650,13 +1650,29 @@ string hwNode::asJSON(unsigned level)
|
||||
resources.clear();
|
||||
}
|
||||
|
||||
- for (unsigned int i = 0; i < countChildren(); i++)
|
||||
+ if(countChildren()>0)
|
||||
{
|
||||
- out << getChild(i)->asJSON(visible(getClassName()) ? level + 2 : 1);
|
||||
- if (visible(getChild(i)->getClassName()))
|
||||
+ bool childOutputed = false;
|
||||
+ for (unsigned int i = 0; i < countChildren(); i++)
|
||||
{
|
||||
- out << "," << endl;
|
||||
+ string childJSON = getChild(i)->asJSON(visible(getClassName()) ? level + 2 : 1);
|
||||
+ string childJSONstrip = strip(childJSON);
|
||||
+ if (childJSONstrip.length() > 0)
|
||||
+ {
|
||||
+ if (!childOutputed)
|
||||
+ {
|
||||
+ if(visible(getClassName()))
|
||||
+ out << "," << endl << spaces(2*level+2) << "\"children\" : [" << endl;
|
||||
+ }
|
||||
+ else
|
||||
+ out << "," << endl;
|
||||
+ childOutputed = true;
|
||||
+ out << childJSON;
|
||||
+ }
|
||||
}
|
||||
+
|
||||
+ if(visible(getClassName()) && childOutputed)
|
||||
+ out << endl << spaces(2*level+2) << "]";
|
||||
}
|
||||
|
||||
if(visible(getClassName()))
|
||||
@@ -1667,7 +1683,6 @@ string hwNode::asJSON(unsigned level)
|
||||
|
||||
if (level == 0)
|
||||
{
|
||||
- out.seekp(-2, std::ios_base::end);
|
||||
out << endl << "]" << endl;
|
||||
}
|
||||
|
||||
|
|
@ -1,246 +0,0 @@
|
|||
Description: Add missing link standards
|
||||
lshw was only capable of reporting link types up to SUPPORTED_10000baseT_Full,
|
||||
meaning that nothing above 10Gbits/s plus many other new link types where not
|
||||
reported at all, leading to faster cards not reporting their speeds.
|
||||
.
|
||||
This patch adds new capacities, with the information taken from the libc
|
||||
usr/include/linux/ethtool.h (ie: the linux-libc-dev package).
|
||||
.
|
||||
FYI, I needed this patch because lshw was not reporting any speed for our
|
||||
MT27710 Family [ConnectX-4 Lx] (Mellanox Technologies) 25Gbits/s cards, so I
|
||||
thought I would add the speed reporting for that one, then since I was doing
|
||||
the job, I added all standards documented in ethtool.h.
|
||||
Author: Thomas Goirand <zigo@debian.org>
|
||||
Forwarded: no
|
||||
Last-Update: 2019-07-03
|
||||
|
||||
--- lshw-02.18.85.orig/src/core/network.cc
|
||||
+++ lshw-02.18.85/src/core/network.cc
|
||||
@@ -123,6 +123,43 @@ struct ethtool_value
|
||||
#define SUPPORTED_FIBRE (1 << 10)
|
||||
#define SUPPORTED_BNC (1 << 11)
|
||||
#define SUPPORTED_10000baseT_Full (1 << 12)
|
||||
+// ETHTOOL_LINK_MODE_Pause_BIT = 13,
|
||||
+// ETHTOOL_LINK_MODE_Asym_Pause_BIT = 14,
|
||||
+#define SUPPORTED_2500baseX_Full (1 << 15)
|
||||
+// ETHTOOL_LINK_MODE_Backplane_BIT = 16,
|
||||
+#define SUPPORTED_1000baseKX_Full (1 << 17)
|
||||
+#define SUPPORTED_10000baseKX4_Full (1 << 18)
|
||||
+#define SUPPORTED_10000baseKR_Full (1 << 19)
|
||||
+// What does FEC mean?
|
||||
+#define SUPPORTED_10000baseR_FEC (1 << 20)
|
||||
+#define SUPPORTED_20000baseMLD2_Full (1 << 21)
|
||||
+#define SUPPORTED_20000baseKR2_Full (1 << 22)
|
||||
+#define SUPPORTED_40000baseKR4_Full (1 << 23)
|
||||
+#define SUPPORTED_40000baseCR4_Full (1 << 24)
|
||||
+#define SUPPORTED_40000baseSR4_Full (1 << 25)
|
||||
+#define SUPPORTED_40000baseLR4_Full (1 << 26)
|
||||
+#define SUPPORTED_56000baseKR4_Full (1 << 27)
|
||||
+#define SUPPORTED_56000baseCR4_Full (1 << 28)
|
||||
+#define SUPPORTED_56000baseSR4_Full (1 << 29)
|
||||
+#define SUPPORTED_56000baseLR4_Full (1 << 30)
|
||||
+#define SUPPORTED_25000baseCR_Full (1 << 31)
|
||||
+#define SUPPORTED_25000baseKR_Full (1 << 32)
|
||||
+#define SUPPORTED_25000baseSR_Full (1 << 33)
|
||||
+#define SUPPORTED_50000baseCR2_Full (1 << 34)
|
||||
+#define SUPPORTED_50000baseKR2_Full (1 << 35)
|
||||
+#define SUPPORTED_100000baseKR4_Full (1 << 36)
|
||||
+#define SUPPORTED_100000baseSR4_Full (1 << 37)
|
||||
+#define SUPPORTED_100000baseCR4_Full (1 << 38)
|
||||
+#define SUPPORTED_100000baseLR4_ER4_Full (1 << 39)
|
||||
+#define SUPPORTED_50000baseSR2_Full (1 << 40)
|
||||
+#define SUPPORTED_1000baseX_Full (1 << 41)
|
||||
+#define SUPPORTED_10000baseCR_Full (1 << 42)
|
||||
+#define SUPPORTED_10000baseSR_Full (1 << 43)
|
||||
+#define SUPPORTED_10000baseLR_Full (1 << 44)
|
||||
+#define SUPPORTED_10000baseLRM_Full (1 << 45)
|
||||
+#define SUPPORTED_10000baseER_Full (1 << 46)
|
||||
+#define SUPPORTED_2500baseT_Full (1 << 47)
|
||||
+#define SUPPORTED_5000baseT_Full (1 << 48)
|
||||
|
||||
/* The forced speed, 10Mb, 100Mb, gigabit, 10GbE. */
|
||||
#define SPEED_10 10
|
||||
@@ -463,11 +500,183 @@ bool scan_network(hwNode & n)
|
||||
interface.addCapability("1000bt-fd", _("1Gbit/s (full duplex)"));
|
||||
interface.setCapacity(1000000000ULL);
|
||||
}
|
||||
+
|
||||
+ // Addition by Zigo
|
||||
+ if(ecmd.supported & SUPPORTED_1000baseKX_Full)
|
||||
+ {
|
||||
+ interface.addCapability("1000bt-fd", _("1Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(1000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_1000baseX_Full)
|
||||
+ {
|
||||
+ interface.addCapability("1000bt-fd", _("1Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(1000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_2500baseX_Full)
|
||||
+ {
|
||||
+ interface.addCapability("2500bt-fd", _("2500Mbit/s (full duplex)"));
|
||||
+ interface.setCapacity(2500000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_2500baseT_Full)
|
||||
+ {
|
||||
+ interface.addCapability("2500bt-fd", _("2500Mbit/s (full duplex)"));
|
||||
+ interface.setCapacity(2500000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_5000baseT_Full)
|
||||
+ {
|
||||
+ interface.addCapability("5000bt-fd", _("5Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(5000000000ULL);
|
||||
+ }
|
||||
+
|
||||
+ // Was there already
|
||||
if(ecmd.supported & SUPPORTED_10000baseT_Full)
|
||||
{
|
||||
interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)"));
|
||||
interface.setCapacity(10000000000ULL);
|
||||
}
|
||||
+
|
||||
+ // Additions by Zigo
|
||||
+ if(ecmd.supported & SUPPORTED_10000baseKX4_Full)
|
||||
+ {
|
||||
+ interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(10000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_10000baseKR_Full)
|
||||
+ {
|
||||
+ interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(10000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_10000baseR_FEC)
|
||||
+ {
|
||||
+ interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(10000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_10000baseCR_Full)
|
||||
+ {
|
||||
+ interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(10000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_10000baseSR_Full)
|
||||
+ {
|
||||
+ interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(10000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_10000baseLR_Full)
|
||||
+ {
|
||||
+ interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(10000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_10000baseLRM_Full)
|
||||
+ {
|
||||
+ interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(10000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_10000baseER_Full)
|
||||
+ {
|
||||
+ interface.addCapability("10000bt-fd", _("10Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(10000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_20000baseMLD2_Full)
|
||||
+ {
|
||||
+ interface.addCapability("20000bt-fd", _("20Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(20000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_20000baseKR2_Full)
|
||||
+ {
|
||||
+ interface.addCapability("20000bt-fd", _("20Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(20000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_25000baseCR_Full)
|
||||
+ {
|
||||
+ interface.addCapability("25000bt-fd", _("25Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(25000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_25000baseKR_Full)
|
||||
+ {
|
||||
+ interface.addCapability("25000bt-fd", _("25Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(25000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_25000baseSR_Full)
|
||||
+ {
|
||||
+ interface.addCapability("25000bt-fd", _("25Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(25000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_40000baseKR4_Full)
|
||||
+ {
|
||||
+ interface.addCapability("40000bt-fd", _("40Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(40000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_40000baseCR4_Full)
|
||||
+ {
|
||||
+ interface.addCapability("40000bt-fd", _("40Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(40000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_40000baseSR4_Full)
|
||||
+ {
|
||||
+ interface.addCapability("40000bt-fd", _("40Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(40000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_40000baseLR4_Full)
|
||||
+ {
|
||||
+ interface.addCapability("40000bt-fd", _("40Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(40000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_50000baseCR2_Full)
|
||||
+ {
|
||||
+ interface.addCapability("50000bt-fd", _("50Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(50000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_50000baseKR2_Full)
|
||||
+ {
|
||||
+ interface.addCapability("50000bt-fd", _("50Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(50000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_50000baseSR2_Full)
|
||||
+ {
|
||||
+ interface.addCapability("50000bt-fd", _("50Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(50000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_56000baseKR4_Full)
|
||||
+ {
|
||||
+ interface.addCapability("56000bt-fd", _("56Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(56000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_56000baseCR4_Full)
|
||||
+ {
|
||||
+ interface.addCapability("56000bt-fd", _("56Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(56000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_56000baseSR4_Full)
|
||||
+ {
|
||||
+ interface.addCapability("56000bt-fd", _("56Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(56000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_56000baseLR4_Full)
|
||||
+ {
|
||||
+ interface.addCapability("56000bt-fd", _("56Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(56000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_100000baseKR4_Full)
|
||||
+ {
|
||||
+ interface.addCapability("100000bt-fd", _("100Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(100000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_100000baseSR4_Full)
|
||||
+ {
|
||||
+ interface.addCapability("100000bt-fd", _("100Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(100000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_100000baseCR4_Full)
|
||||
+ {
|
||||
+ interface.addCapability("100000bt-fd", _("100Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(100000000000ULL);
|
||||
+ }
|
||||
+ if(ecmd.supported & SUPPORTED_100000baseLR4_ER4_Full)
|
||||
+ {
|
||||
+ interface.addCapability("100000bt-fd", _("100Gbit/s (full duplex)"));
|
||||
+ interface.setCapacity(100000000000ULL);
|
||||
+ }
|
||||
+
|
||||
if(ecmd.supported & SUPPORTED_Autoneg)
|
||||
interface.addCapability("autonegotiation", _("Auto-negotiation"));
|
||||
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
Index: src/core/dmi.cc
|
||||
===================================================================
|
||||
--- a/lshw-B.02.18/src/core/dmi.cc (revision 2519)
|
||||
+++ b/lshw-B.02.18/src/core/dmi.cc (working copy)
|
||||
@@ -1752,8 +1752,8 @@
|
||||
u16 dmimaj = 0, dmimin = 0;
|
||||
currentcpu = 0;
|
||||
|
||||
-#ifdef __hppa__
|
||||
- return false; // SMBIOS not supported on PA-RISC machines
|
||||
+#if defined(__arm__) || defined (__hppa__)
|
||||
+ return false; // SMBIOS not supported on ARM and PA-RISC machines
|
||||
#endif
|
||||
|
||||
if (sizeof(u8) != 1 || sizeof(u16) != 2 || sizeof(u32) != 4)
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
Move binaries to /bin instead of /sbin
|
||||
It can be executed by normal users without privilegesIndex: lshw-02.14/src/Makefile
|
||||
===================================================================
|
||||
Index: lshw/src/Makefile
|
||||
===================================================================
|
||||
--- lshw.orig/src/Makefile
|
||||
+++ lshw/src/Makefile
|
||||
@@ -7,7 +7,7 @@ ZLIB?=0
|
||||
|
||||
DESTDIR?=/
|
||||
PREFIX?=/usr
|
||||
-SBINDIR=$(PREFIX)/sbin
|
||||
+SBINDIR=$(PREFIX)/bin
|
||||
MANDIR=$(PREFIX)/share/man
|
||||
DATADIR=$(PREFIX)/share
|
||||
INSTALL?=install -p
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
Description: Fix Makefiles cflags
|
||||
Author: Thomas Goirand <zigo@debian.org>
|
||||
Forwarded: no
|
||||
Last-Update: 2018-07-12
|
||||
|
||||
--- lshw-02.18.85.orig/src/Makefile
|
||||
+++ lshw-02.18.85/src/Makefile
|
||||
@@ -23,14 +23,14 @@ export ZLIB
|
||||
CXX?=$(CROSS_COMPILE)c++
|
||||
INCLUDES=-I./core/
|
||||
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" -DVERSION=\"$(VERSION)\"
|
||||
-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
|
||||
+CXXFLAGS=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES)
|
||||
ifeq ($(SQLITE), 1)
|
||||
CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
|
||||
endif
|
||||
ifeq ($(ZLIB), 1)
|
||||
CXXFLAGS+= -DZLIB $(shell pkg-config --cflags zlib)
|
||||
endif
|
||||
-LDFLAGS+=-L./core/ -g
|
||||
+LDFLAGS+=-L./core/
|
||||
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
|
||||
LDFLAGS+= -Wl,--as-needed
|
||||
endif
|
||||
--- lshw-02.18.85.orig/src/core/Makefile
|
||||
+++ lshw-02.18.85/src/core/Makefile
|
||||
@@ -3,7 +3,7 @@ PACKAGENAME?=lshw
|
||||
CXX?=$(CROSS_COMPILE)c++
|
||||
INCLUDES=
|
||||
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
|
||||
-CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
|
||||
+CXXFLAGS?=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES)
|
||||
LDFLAGS=
|
||||
LDSTATIC=
|
||||
LIBS=
|
||||
--- lshw-02.18.85.orig/src/gui/Makefile
|
||||
+++ lshw-02.18.85/src/gui/Makefile
|
||||
@@ -8,7 +8,7 @@ OBJCOPY?=objcopy
|
||||
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
|
||||
GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
|
||||
INCLUDES=-I../core $(GTKINCLUDES)
|
||||
-CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
|
||||
+CXXFLAGS=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES)
|
||||
ifeq ($(SQLITE), 1)
|
||||
CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
|
||||
endif
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
From: Helmut Grohne <helmut@subdivi.de>
|
||||
Subject: make pkg-config subtitutable
|
||||
|
||||
--- lshw-02.18.85.orig/src/Makefile
|
||||
+++ lshw-02.18.85/src/Makefile
|
||||
@@ -21,14 +21,15 @@ export SQLITE
|
||||
export ZLIB
|
||||
|
||||
CXX?=$(CROSS_COMPILE)c++
|
||||
+PKG_CONFIG ?= pkg-config
|
||||
INCLUDES=-I./core/
|
||||
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" -DVERSION=\"$(VERSION)\"
|
||||
CXXFLAGS=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES)
|
||||
ifeq ($(SQLITE), 1)
|
||||
- CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
|
||||
+ CXXFLAGS+= -DSQLITE $(shell $(PKG_CONFIG) --cflags sqlite3)
|
||||
endif
|
||||
ifeq ($(ZLIB), 1)
|
||||
- CXXFLAGS+= -DZLIB $(shell pkg-config --cflags zlib)
|
||||
+ CXXFLAGS+= -DZLIB $(shell $(PKG_CONFIG) --cflags zlib)
|
||||
endif
|
||||
LDFLAGS+=-L./core/
|
||||
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
|
||||
@@ -37,10 +38,10 @@ endif
|
||||
LDSTATIC=-static
|
||||
LIBS+=-llshw -lresolv
|
||||
ifeq ($(SQLITE), 1)
|
||||
- LIBS+= $(shell pkg-config --libs sqlite3)
|
||||
+ LIBS+= $(shell $(PKG_CONFIG) --libs sqlite3)
|
||||
endif
|
||||
ifeq ($(ZLIB), 1)
|
||||
- LIBS+= $(shell pkg-config --libs zlib)
|
||||
+ LIBS+= $(shell $(PKG_CONFIG) --libs zlib)
|
||||
endif
|
||||
|
||||
export CXXFLAGS
|
||||
--- lshw-02.18.85.orig/src/gui/Makefile
|
||||
+++ lshw-02.18.85/src/gui/Makefile
|
||||
@@ -1,22 +1,23 @@
|
||||
PACKAGENAME?=lshw
|
||||
|
||||
CXX?=$(CROSS_COMPILE)c++
|
||||
+PKG_CONFIG ?= pkg-config
|
||||
CC?=$(CROSS_COMPILE)cc
|
||||
STRIP?=strip
|
||||
OBJCOPY?=objcopy
|
||||
|
||||
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
|
||||
-GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
|
||||
+GTKINCLUDES=$(shell $(PKG_CONFIG) gtk+-2.0 --cflags)
|
||||
INCLUDES=-I../core $(GTKINCLUDES)
|
||||
CXXFLAGS=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES)
|
||||
ifeq ($(SQLITE), 1)
|
||||
- CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
|
||||
+ CXXFLAGS+= -DSQLITE $(shell $(PKG_CONFIG) --cflags sqlite3)
|
||||
endif
|
||||
CFLAGS=$(CXXFLAGS) $(DEFINES)
|
||||
-GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs)
|
||||
+GTKLIBS=$(shell $(PKG_CONFIG) gtk+-2.0 gmodule-2.0 --libs)
|
||||
LIBS+=-L../core -llshw -lresolv $(GTKLIBS)
|
||||
ifeq ($(SQLITE), 1)
|
||||
- LIBS+= $(shell pkg-config --libs sqlite3)
|
||||
+ LIBS+= $(shell $(PKG_CONFIG) --libs sqlite3)
|
||||
endif
|
||||
LDFLAGS=
|
||||
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
|
||||
|
|
@ -1,233 +0,0 @@
|
|||
Include headers to build under gcc-4.3Index: lshw-02.14/src/core/cdrom.cc
|
||||
===================================================================
|
||||
Index: lshw/src/core/cdrom.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/cdrom.cc
|
||||
+++ lshw/src/core/cdrom.cc
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <unistd.h>
|
||||
#include <limits.h>
|
||||
#include <linux/cdrom.h>
|
||||
+#include <climits>
|
||||
|
||||
__ID("@(#) $Id$");
|
||||
|
||||
Index: lshw/src/core/cpuid.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/cpuid.cc
|
||||
+++ lshw/src/core/cpuid.cc
|
||||
@@ -7,6 +7,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/time.h>
|
||||
+#include <cstring>
|
||||
|
||||
__ID("@(#) $Id$");
|
||||
|
||||
Index: lshw/src/core/cpuinfo.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/cpuinfo.cc
|
||||
+++ lshw/src/core/cpuinfo.cc
|
||||
@@ -5,6 +5,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
+#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <vector>
|
||||
Index: lshw/src/core/fb.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/fb.cc
|
||||
+++ lshw/src/core/fb.cc
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
+#include <cstring>
|
||||
|
||||
__ID("@(#) $Id$");
|
||||
|
||||
Index: lshw/src/core/hw.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/hw.cc
|
||||
+++ lshw/src/core/hw.cc
|
||||
@@ -19,6 +19,9 @@
|
||||
#include <unistd.h>
|
||||
#include <limits.h>
|
||||
#include <sys/utsname.h>
|
||||
+#include <string.h>
|
||||
+#include <limits.h>
|
||||
+#include <cstring>
|
||||
|
||||
using namespace hw;
|
||||
|
||||
Index: lshw/src/core/ideraid.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/ideraid.cc
|
||||
+++ lshw/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>
|
||||
Index: lshw/src/core/mounts.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/mounts.cc
|
||||
+++ lshw/src/core/mounts.cc
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
-
|
||||
+#include <cstdlib>
|
||||
|
||||
__ID("@(#) $Id$");
|
||||
|
||||
Index: lshw/src/core/osutils.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/osutils.cc
|
||||
+++ lshw/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>
|
||||
Index: lshw/src/core/partitions.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/partitions.cc
|
||||
+++ lshw/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>
|
||||
Index: lshw/src/core/pci.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/pci.cc
|
||||
+++ lshw/src/core/pci.cc
|
||||
@@ -15,6 +15,8 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <dirent.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <cstring>
|
||||
|
||||
__ID("@(#) $Id$");
|
||||
|
||||
Index: lshw/src/core/pcmcia-legacy.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/pcmcia-legacy.cc
|
||||
+++ lshw/src/core/pcmcia-legacy.cc
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
+#include <cstring>
|
||||
|
||||
__ID("@(#) $Id$");
|
||||
|
||||
Index: lshw/src/core/pcmcia.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/pcmcia.cc
|
||||
+++ lshw/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>
|
||||
Index: lshw/src/core/smp.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/smp.cc
|
||||
+++ lshw/src/core/smp.cc
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
+#include <cstring>
|
||||
|
||||
#include "osutils.h"
|
||||
|
||||
Index: lshw/src/core/spd.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/spd.cc
|
||||
+++ lshw/src/core/spd.cc
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <string>
|
||||
#include <dirent.h>
|
||||
#include <stdio.h>
|
||||
+#include <cstring>
|
||||
|
||||
__ID("@(#) $Id$");
|
||||
|
||||
Index: lshw/src/core/usb.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/usb.cc
|
||||
+++ lshw/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"
|
||||
Index: lshw/src/core/volumes.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/volumes.cc
|
||||
+++ lshw/src/core/volumes.cc
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <unistd.h>
|
||||
#include <stdint.h>
|
||||
#include <time.h>
|
||||
+#include <cstring>
|
||||
|
||||
__ID("@(#) $Id$");
|
||||
|
||||
Index: lshw/src/gui/engine.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/gui/engine.cc
|
||||
+++ lshw/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>
|
||||
Index: lshw/src/gui/print-gui.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/gui/print-gui.cc
|
||||
+++ lshw/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>
|
||||
|
|
@ -1,253 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://web.resource.org/cc/"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
sodipodi:docname="logo.svg"
|
||||
sodipodi:docbase="/home/support/Source/ezix-workspace/packages/lshw/development/src/gui/artwork"
|
||||
inkscape:version="0.41"
|
||||
sodipodi:version="0.32"
|
||||
id="svg2"
|
||||
height="600.00000pt"
|
||||
width="600.00000pt">
|
||||
<defs
|
||||
id="defs3">
|
||||
<linearGradient
|
||||
id="linearGradient2218">
|
||||
<stop
|
||||
id="stop2220"
|
||||
offset="0"
|
||||
style="stop-color:#c2c2c2;stop-opacity:1;" />
|
||||
<stop
|
||||
id="stop2222"
|
||||
offset="1.0000000"
|
||||
style="stop-color:#777777;stop-opacity:1.0000000;" />
|
||||
</linearGradient>
|
||||
<radialGradient
|
||||
gradientUnits="userSpaceOnUse"
|
||||
r="24.538383"
|
||||
fy="924.92517"
|
||||
fx="104.09782"
|
||||
cy="925.70575"
|
||||
cx="103.65790"
|
||||
gradientTransform="scale(1.361999,0.734215)"
|
||||
id="radialGradient2224"
|
||||
xlink:href="#linearGradient2218"
|
||||
inkscape:collect="always" />
|
||||
<radialGradient
|
||||
gradientUnits="userSpaceOnUse"
|
||||
r="21.834162"
|
||||
fy="945.49786"
|
||||
fx="92.327774"
|
||||
cy="945.16803"
|
||||
cx="93.272804"
|
||||
gradientTransform="scale(1.413168,0.707630)"
|
||||
id="radialGradient2232"
|
||||
xlink:href="#linearGradient2218"
|
||||
inkscape:collect="always" />
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
inkscape:window-y="98"
|
||||
inkscape:window-x="37"
|
||||
inkscape:window-height="792"
|
||||
inkscape:window-width="1141"
|
||||
inkscape:current-layer="layer1"
|
||||
inkscape:document-units="px"
|
||||
inkscape:cy="251.34181"
|
||||
inkscape:cx="308.44788"
|
||||
inkscape:zoom="0.70000000"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
borderopacity="1.0"
|
||||
bordercolor="#666666"
|
||||
pagecolor="#ffffff"
|
||||
id="base" />
|
||||
<metadata
|
||||
id="metadata4">
|
||||
<rdf:RDF
|
||||
id="RDF5">
|
||||
<cc:Work
|
||||
id="Work6"
|
||||
rdf:about="">
|
||||
<dc:format
|
||||
id="format7">image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage"
|
||||
id="type9" />
|
||||
<dc:title
|
||||
id="title2085">LSHW logo</dc:title>
|
||||
<dc:date
|
||||
id="date2087">2005/07/15</dc:date>
|
||||
<dc:creator
|
||||
id="creator2089">
|
||||
<cc:Agent
|
||||
id="Agent2091">
|
||||
<dc:title
|
||||
id="title2093">Lyonel Vincent</dc:title>
|
||||
</cc:Agent>
|
||||
</dc:creator>
|
||||
<dc:publisher
|
||||
id="publisher2095">
|
||||
<cc:Agent
|
||||
id="Agent2097">
|
||||
<dc:title
|
||||
id="title2099">ezIX.org</dc:title>
|
||||
</cc:Agent>
|
||||
</dc:publisher>
|
||||
<dc:identifier
|
||||
id="identifier2101">logo</dc:identifier>
|
||||
<dc:source
|
||||
id="source2103">$Id: logo.svg 1822 2007-08-07 19:51:34Z lyonel $</dc:source>
|
||||
<dc:language
|
||||
id="language2105">C</dc:language>
|
||||
<dc:subject
|
||||
id="subject2107">
|
||||
<rdf:Bag
|
||||
id="Bag2109">
|
||||
<rdf:li
|
||||
id="li1372">lshw logo diagnostics</rdf:li>
|
||||
</rdf:Bag>
|
||||
</dc:subject>
|
||||
<cc:license
|
||||
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/"
|
||||
id="license2125" />
|
||||
</cc:Work>
|
||||
<cc:License
|
||||
id="License2127"
|
||||
rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
|
||||
<cc:permits
|
||||
id="permits2129"
|
||||
rdf:resource="http://web.resource.org/cc/Reproduction" />
|
||||
<cc:permits
|
||||
id="permits2131"
|
||||
rdf:resource="http://web.resource.org/cc/Distribution" />
|
||||
<cc:requires
|
||||
id="requires2133"
|
||||
rdf:resource="http://web.resource.org/cc/Notice" />
|
||||
<cc:permits
|
||||
id="permits2135"
|
||||
rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
|
||||
<cc:requires
|
||||
id="requires2137"
|
||||
rdf:resource="http://web.resource.org/cc/ShareAlike" />
|
||||
<cc:requires
|
||||
id="requires2139"
|
||||
rdf:resource="http://web.resource.org/cc/SourceCode" />
|
||||
</cc:License>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
id="layer1"
|
||||
inkscape:groupmode="layer"
|
||||
inkscape:label="Layer 1">
|
||||
<path
|
||||
transform="matrix(0.933830,0.000000,0.000000,0.933830,3.800012,73.07569)"
|
||||
d="M 768.57144 327.14285 A 365.71429 365.71429 0 1 1 37.142853,327.14285 A 365.71429 365.71429 0 1 1 768.57144 327.14285 z"
|
||||
sodipodi:ry="365.71429"
|
||||
sodipodi:rx="365.71429"
|
||||
sodipodi:cy="327.14285"
|
||||
sodipodi:cx="402.85715"
|
||||
id="path2143"
|
||||
style="stroke-dashoffset:0.0000000;stroke-dasharray:none;stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-linejoin:round;stroke-linecap:round;stroke-width:26.771467;stroke:#000000;fill-rule:nonzero;fill-opacity:1.0000000;fill:#ffb200"
|
||||
sodipodi:type="arc" />
|
||||
<path
|
||||
sodipodi:nodetypes="czzz"
|
||||
id="path1321"
|
||||
d="M 517.14221,161.48823 C 500.33905,141.43139 462.89203,126.44234 437.58302,167.88598 C 412.82609,208.42560 442.45806,242.24265 430.24120,283.77595 C 418.16157,324.84265 396.78673,340.73407 350.34175,376.78273"
|
||||
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#949494;stroke-width:16.826393;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none" />
|
||||
<path
|
||||
sodipodi:nodetypes="czzz"
|
||||
id="path2088"
|
||||
d="M 602.59875,240.16689 C 623.39480,256.04605 640.06158,292.77709 599.80458,319.93398 C 560.42574,346.49848 525.30355,318.42575 484.36507,332.50793 C 443.88651,346.43192 428.97774,368.50338 395.06582,416.53071"
|
||||
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#949494;stroke-width:16.826393;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
id="path2092"
|
||||
d="M 437.74888,242.98782 C 437.80171,290.50241 468.45501,324.29635 522.31243,322.31184"
|
||||
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#949494;stroke-width:8.9740763;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none" />
|
||||
<path
|
||||
sodipodi:nodetypes="czzz"
|
||||
id="path2094"
|
||||
d="M 346.56375,379.16757 C 331.05665,393.82414 299.49609,404.62870 299.97314,420.07332 C 300.45019,435.51794 332.90815,470.03747 349.35677,468.77133 C 365.80538,467.50519 379.98282,433.59136 396.41885,414.82641"
|
||||
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:22.400000;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none" />
|
||||
<path
|
||||
sodipodi:nodetypes="czzz"
|
||||
id="path2098"
|
||||
d="M 318.30128,451.08052 C 291.12281,480.56237 252.22438,513.13655 290.19105,563.60838 C 327.61337,613.35657 366.22993,589.69063 361.23775,553.57124 C 356.15470,516.79455 247.74252,403.62782 164.98527,415.46260"
|
||||
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:22.400000;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none" />
|
||||
<g
|
||||
transform="matrix(0.548322,0.524067,-0.524067,0.548322,417.7587,-30.92536)"
|
||||
id="g2117">
|
||||
<path
|
||||
sodipodi:nodetypes="czzzz"
|
||||
id="path2109"
|
||||
d="M 258.57143,85.714286 C 262.61905,81.190477 275.27399,77.229515 279.32161,81.515229 C 283.36922,85.800943 283.45588,99.170170 279.40826,103.69398 C 275.36065,108.21779 262.61905,104.28571 258.57143,100.00000 C 254.52381,95.714286 254.52381,90.238095 258.57143,85.714286 z "
|
||||
style="fill:#000000;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
|
||||
<path
|
||||
transform="matrix(0.195122,0.000000,0.000000,0.292929,218.9197,60.03110)"
|
||||
d="M 314.66250 111.33105 A 20.708128 25.001276 0 1 1 273.24625,111.33105 A 20.708128 25.001276 0 1 1 314.66250 111.33105 z"
|
||||
sodipodi:ry="25.001276"
|
||||
sodipodi:rx="20.708128"
|
||||
sodipodi:cy="111.33105"
|
||||
sodipodi:cx="293.95438"
|
||||
id="path2111"
|
||||
style="fill:#c2c2c2;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.2500000;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
|
||||
sodipodi:type="arc" />
|
||||
</g>
|
||||
<g
|
||||
transform="matrix(0.548322,0.524067,-0.524067,0.548322,417.7587,-30.92536)"
|
||||
id="g2121">
|
||||
<path
|
||||
sodipodi:nodetypes="czzzz"
|
||||
id="path2113"
|
||||
d="M 428.47696,82.683828 C 424.42934,78.160019 411.77440,74.199057 407.72678,78.484771 C 403.67917,82.770485 403.59251,96.139712 407.64013,100.66352 C 411.68774,105.18733 424.42934,101.25525 428.47696,96.969542 C 432.52458,92.683828 432.52458,87.207637 428.47696,82.683828 z "
|
||||
style="fill:#000000;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
|
||||
<path
|
||||
transform="matrix(0.195122,0.000000,0.000000,0.292929,353.7751,57.50572)"
|
||||
d="M 314.66250 111.33105 A 20.708128 25.001276 0 1 1 273.24625,111.33105 A 20.708128 25.001276 0 1 1 314.66250 111.33105 z"
|
||||
sodipodi:ry="25.001276"
|
||||
sodipodi:rx="20.708128"
|
||||
sodipodi:cy="111.33105"
|
||||
sodipodi:cx="293.95438"
|
||||
id="path2115"
|
||||
style="fill:#c2c2c2;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.2500000;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
|
||||
sodipodi:type="arc" />
|
||||
</g>
|
||||
<path
|
||||
transform="matrix(1.370962,1.310318,-1.310318,1.370962,806.0717,-681.5786)"
|
||||
d="M 176.77669 668.93524 A 29.799500 14.394673 0 1 1 117.17769,668.93524 A 29.799500 14.394673 0 1 1 176.77669 668.93524 z"
|
||||
sodipodi:ry="14.394673"
|
||||
sodipodi:rx="29.799500"
|
||||
sodipodi:cy="668.93524"
|
||||
sodipodi:cx="146.97719"
|
||||
id="path2127"
|
||||
style="stroke-dasharray:none;fill:url(#radialGradient2224);fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:7.2435155;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
|
||||
sodipodi:type="arc" />
|
||||
<path
|
||||
transform="matrix(1.017413,0.972407,-0.972407,1.017413,646.9993,-410.1590)"
|
||||
d="M 176.77669 668.93524 A 29.799500 14.394673 0 1 1 117.17769,668.93524 A 29.799500 14.394673 0 1 1 176.77669 668.93524 z"
|
||||
sodipodi:ry="14.394673"
|
||||
sodipodi:rx="29.799500"
|
||||
sodipodi:cy="668.93524"
|
||||
sodipodi:cx="146.97719"
|
||||
id="path2131"
|
||||
style="stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-linejoin:round;stroke-linecap:square;stroke-width:2.1116693;stroke:#000000;fill-rule:nonzero;fill-opacity:1.0000000;fill:#c2c2c2;stroke-dasharray:none"
|
||||
sodipodi:type="arc" />
|
||||
<path
|
||||
transform="matrix(0.845659,0.808251,-0.808251,0.845659,563.7956,-272.5651)"
|
||||
d="M 176.77669 668.93524 A 29.799500 14.394673 0 1 1 117.17769,668.93524 A 29.799500 14.394673 0 1 1 176.77669 668.93524 z"
|
||||
sodipodi:ry="14.394673"
|
||||
sodipodi:rx="29.799500"
|
||||
sodipodi:cy="668.93524"
|
||||
sodipodi:cx="146.97719"
|
||||
id="path2125"
|
||||
style="stroke-dasharray:none;fill:url(#radialGradient2232);fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:2.1116693;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
|
||||
sodipodi:type="arc" />
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 12 KiB |
|
|
@ -1,68 +0,0 @@
|
|||
Sanitize error when trying to run GUI without XIndex: lshw-02.14/src/gui/integration/console.apps
|
||||
===================================================================
|
||||
Index: lshw/src/gui/integration/console.apps
|
||||
===================================================================
|
||||
--- lshw.orig/src/gui/integration/console.apps
|
||||
+++ lshw/src/gui/integration/console.apps
|
||||
@@ -1,3 +1,3 @@
|
||||
USER=root
|
||||
-PROGRAM=/usr/sbin/gtk-lshw
|
||||
+PROGRAM=/usr/sbin/lshw-gtk
|
||||
SESSION=true
|
||||
Index: lshw/src/gui/integration/gtk-lshw.desktop
|
||||
===================================================================
|
||||
--- lshw.orig/src/gui/integration/gtk-lshw.desktop
|
||||
+++ lshw/src/gui/integration/gtk-lshw.desktop
|
||||
@@ -5,7 +5,7 @@ Comment[fr]=Listeur de matériel
|
||||
Comment[es]=Listar equipamiento
|
||||
Categories=Application;System;X-Red-Hat-Base;X-Fedora;
|
||||
Icon=/usr/share/lshw/artwork/logo.svg
|
||||
-Exec=/usr/bin/gtk-lshw
|
||||
+Exec=/usr/bin/lshw-gtk
|
||||
Type=Application
|
||||
Terminal=false
|
||||
Encoding=UTF-8
|
||||
Index: lshw/src/lshw.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/lshw.cc
|
||||
+++ lshw/src/lshw.cc
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <iostream>
|
||||
+#include <errno.h>
|
||||
|
||||
#ifndef NONLS
|
||||
#include <locale.h>
|
||||
@@ -31,8 +32,8 @@ void usage(const char *progname)
|
||||
fprintf(stderr, _("\t-json output hardware tree as a JSON object\n"));
|
||||
fprintf(stderr, _("\t-short output hardware paths\n"));
|
||||
fprintf(stderr, _("\t-businfo output bus information\n"));
|
||||
- if(getenv("DISPLAY") && exists(SBINDIR"/gtk-lshw"))
|
||||
- fprintf(stderr, _("\t-X use graphical interface\n"));
|
||||
+ if(getenv("DISPLAY") && exists(SBINDIR"/lshw-gtk"))
|
||||
+ fprintf(stderr, _("\t-X use graphical interface\n"));
|
||||
fprintf(stderr, _("\noptions can be\n"));
|
||||
#ifdef SQLITE
|
||||
fprintf(stderr, _("\t-dump OUTFILE save hardware tree to a file\n"));
|
||||
@@ -220,7 +221,19 @@ char **argv)
|
||||
exit(1);
|
||||
}
|
||||
|
||||
- if(enabled("output:X")) execl(SBINDIR"/gtk-lshw", SBINDIR"/gtk-lshw", NULL);
|
||||
+/* if(enabled("output:X")) execl(SBINDIR"/gtk-lshw", SBINDIR"/gtk-lshw", NULL); */
|
||||
+
|
||||
+ if(enabled("output:X")) {
|
||||
+ execl(SBINDIR"/lshw-gtk", SBINDIR"/lshw-gtk", NULL);
|
||||
+ // Execl only returns if an error has occurred.
|
||||
+ if ( errno == ENOENT ) {
|
||||
+ fprintf(stderr, "ERROR: Sorry, cannot run the X11/GTK interface because %s/lshw-gtk\n is not available.\n", SBINDIR);
|
||||
+ fprintf(stderr, "HINT: Install the lshw-gtk package in Debian.\n");
|
||||
+ } else {
|
||||
+ fprintf(stderr, "ERROR: There was an error when trying to execute %s/lshw-gtk: %s\n", SBINDIR, strerror(errno));
|
||||
+ fprintf(stderr, "Will just print the information on screen\n");
|
||||
+ }
|
||||
+ }
|
||||
|
||||
if (geteuid() != 0)
|
||||
{
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
Added paths to look for device idsIndex: lshw-02.14/src/core/pci.cc
|
||||
===================================================================
|
||||
Index: lshw/src/core/pci.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/pci.cc
|
||||
+++ lshw/src/core/pci.cc
|
||||
@@ -21,6 +21,7 @@ __ID("@(#) $Id$");
|
||||
#define PROC_BUS_PCI "/proc/bus/pci"
|
||||
#define SYS_BUS_PCI "/sys/bus/pci"
|
||||
#define PCIID_PATH DATADIR"/pci.ids:/usr/share/lshw/pci.ids:/usr/local/share/pci.ids:/usr/share/pci.ids:/etc/pci.ids:/usr/share/hwdata/pci.ids:/usr/share/misc/pci.ids"
|
||||
+#define PCIID_PATH DATADIR"/pci.ids:/usr/share/lshw-common/pci.ids:/usr/local/share/pci.ids:/usr/share/pci.ids:/etc/pci.ids:/usr/share/hwdata/pci.ids:/usr/share/misc/pci.ids"
|
||||
|
||||
#define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */
|
||||
#define PCI_VENDOR_ID 0x00 /* 16 bits */
|
||||
Index: lshw/src/core/usb.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/usb.cc
|
||||
+++ lshw/src/core/usb.cc
|
||||
@@ -28,6 +28,7 @@
|
||||
#define PROCBUSUSBDEVICES "/proc/bus/usb/devices"
|
||||
#define SYSKERNELDEBUGUSBDEVICES "/sys/kernel/debug/usb/devices"
|
||||
#define USBID_PATH DATADIR"/usb.ids:/usr/share/lshw/usb.ids:/usr/local/share/usb.ids:/usr/share/usb.ids:/etc/usb.ids:/usr/share/hwdata/usb.ids:/usr/share/misc/usb.ids"
|
||||
+#define USBID_PATH DATADIR"/usb.ids:/usr/share/lshw-common/usb.ids:/usr/local/share/usb.ids:/usr/share/usb.ids:/etc/usb.ids:/usr/share/hwdata/usb.ids:/usr/share/misc/usb.ids"
|
||||
|
||||
#define USB_CLASS_PER_INTERFACE 0 /* for DeviceClass */
|
||||
#define USB_CLASS_AUDIO 1
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
--- a/lshw-B.02.18/src/core/device-tree.cc.orig 2013-05-07 14:57:16.400177000 -0400
|
||||
+++ b/lshw-B.02.18/src/core/device-tree.cc 2013-05-07 15:01:51.710177000 -0400
|
||||
@@ -193,7 +193,8 @@
|
||||
struct dirent **cachelist;
|
||||
int ncache;
|
||||
|
||||
- if (hw::strip(get_string(basepath + "/device_type")) != "cpu")
|
||||
+ if (exists(basepath + "/device_type") &&
|
||||
+ hw::strip(get_string(basepath + "/device_type")) != "cpu")
|
||||
break; // oops, not a CPU!
|
||||
|
||||
cpu.setProduct(get_string(basepath + "/name"));
|
||||
|
|
@ -1,160 +0,0 @@
|
|||
.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32
|
||||
.\"
|
||||
.\" Standard preamble:
|
||||
.\" ========================================================================
|
||||
.de Sh \" Subsection heading
|
||||
.br
|
||||
.if t .Sp
|
||||
.ne 5
|
||||
.PP
|
||||
\fB\\$1\fR
|
||||
.PP
|
||||
..
|
||||
.de Sp \" Vertical space (when we can't use .PP)
|
||||
.if t .sp .5v
|
||||
.if n .sp
|
||||
..
|
||||
.de Vb \" Begin verbatim text
|
||||
.ft CW
|
||||
.nf
|
||||
.ne \\$1
|
||||
..
|
||||
.de Ve \" End verbatim text
|
||||
.ft R
|
||||
.fi
|
||||
..
|
||||
.\" Set up some character translations and predefined strings. \*(-- will
|
||||
.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
|
||||
.\" double quote, and \*(R" will give a right double quote. \*(C+ will
|
||||
.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
|
||||
.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
|
||||
.\" nothing in troff, for use with C<>.
|
||||
.tr \(*W-
|
||||
.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
|
||||
.ie n \{\
|
||||
. ds -- \(*W-
|
||||
. ds PI pi
|
||||
. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
|
||||
. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
|
||||
. ds L" ""
|
||||
. ds R" ""
|
||||
. ds C` ""
|
||||
. ds C' ""
|
||||
'br\}
|
||||
.el\{\
|
||||
. ds -- \|\(em\|
|
||||
. ds PI \(*p
|
||||
. ds L" ``
|
||||
. ds R" ''
|
||||
'br\}
|
||||
.\"
|
||||
.\" If the F register is turned on, we'll generate index entries on stderr for
|
||||
.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
|
||||
.\" entries marked with X<> in POD. Of course, you'll have to process the
|
||||
.\" output yourself in some meaningful fashion.
|
||||
.if \nF \{\
|
||||
. de IX
|
||||
. tm Index:\\$1\t\\n%\t"\\$2"
|
||||
..
|
||||
. nr % 0
|
||||
. rr F
|
||||
.\}
|
||||
.\"
|
||||
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
|
||||
.\" way too many mistakes in technical documents.
|
||||
.hy 0
|
||||
.if n .na
|
||||
.\"
|
||||
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
|
||||
.\" Fear. Run. Save yourself. No user-serviceable parts.
|
||||
. \" fudge factors for nroff and troff
|
||||
.if n \{\
|
||||
. ds #H 0
|
||||
. ds #V .8m
|
||||
. ds #F .3m
|
||||
. ds #[ \f1
|
||||
. ds #] \fP
|
||||
.\}
|
||||
.if t \{\
|
||||
. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
|
||||
. ds #V .6m
|
||||
. ds #F 0
|
||||
. ds #[ \&
|
||||
. ds #] \&
|
||||
.\}
|
||||
. \" simple accents for nroff and troff
|
||||
.if n \{\
|
||||
. ds ' \&
|
||||
. ds ` \&
|
||||
. ds ^ \&
|
||||
. ds , \&
|
||||
. ds ~ ~
|
||||
. ds /
|
||||
.\}
|
||||
.if t \{\
|
||||
. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
|
||||
. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
|
||||
. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
|
||||
. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
|
||||
. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
|
||||
. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
|
||||
.\}
|
||||
. \" troff and (daisy-wheel) nroff accents
|
||||
.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
|
||||
.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
|
||||
.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
|
||||
.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
|
||||
.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
|
||||
.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
|
||||
.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
|
||||
.ds ae a\h'-(\w'a'u*4/10)'e
|
||||
.ds Ae A\h'-(\w'A'u*4/10)'E
|
||||
. \" corrections for vroff
|
||||
.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
|
||||
.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
|
||||
. \" for low resolution devices (crt and lpr)
|
||||
.if \n(.H>23 .if \n(.V>19 \
|
||||
\{\
|
||||
. ds : e
|
||||
. ds 8 ss
|
||||
. ds o a
|
||||
. ds d- d\h'-1'\(ga
|
||||
. ds D- D\h'-1'\(hy
|
||||
. ds th \o'bp'
|
||||
. ds Th \o'LP'
|
||||
. ds ae ae
|
||||
. ds Ae AE
|
||||
.\}
|
||||
.rm #[ #] #H #V #F C
|
||||
.\" ========================================================================
|
||||
.\"
|
||||
.IX Title "LSHW-GTK 1"
|
||||
.TH LSHW-GTK 1 "2007-12-05" "perl v5.8.8" "User Contributed Perl Documentation"
|
||||
.SH "NAME"
|
||||
lshw\-gtk \- list hardware (GTK version)
|
||||
.SH "DESCRIPTION"
|
||||
.IX Header "DESCRIPTION"
|
||||
lshw is a small tool to extract detailed information on the hardware
|
||||
configuration of the machine. It can report exact memory
|
||||
configuration, firmware version, mainboard configuration,
|
||||
\&\s-1CPU\s0 version
|
||||
and speed, cache configuration, bus speed, etc. on
|
||||
DMI-capable x86 or \s-1IA\-64\s0
|
||||
systems and on some PowerPC
|
||||
machines (PowerMac G4 is known to work).
|
||||
.PP
|
||||
It currently supports \s-1DMI\s0 (x86 and \s-1IA\-64\s0 only), OpenFirmware device tree (PowerPC only),
|
||||
\&\s-1PCI/AGP\s0, \s-1CPUID\s0 (x86), \s-1IDE/ATA/ATAPI\s0, \s-1PCMCIA\s0 (only tested on x86), \s-1SCSI\s0 and \s-1USB\s0.
|
||||
.SH "NOTES"
|
||||
.IX Header "NOTES"
|
||||
lshw-gtk must be run as super user or it will only report
|
||||
.SH "COPYING"
|
||||
.IX Header "COPYING"
|
||||
lshw is distributed under the \s-1GNU\s0 \s-1GENERAL\s0 \s-1PUBLIC\s0 \s-1LICENSE\s0 (\s-1GPL\s0) version 2.
|
||||
.SH "AUTOR"
|
||||
.IX Header "AUTOR"
|
||||
lshw is maintained by Lyonel Vincent
|
||||
<lyonel@ezix.org>.
|
||||
.SH "OTHER INFO"
|
||||
.IX Header "OTHER INFO"
|
||||
The webpage for lshw is at http://ezix.org/software/lshw.html
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=Hardware Lister
|
||||
Name[es]=Listar equipamiento
|
||||
Comment=Provides information on hardware
|
||||
Comment[ca]=Proveeix informació sobre el maquinari
|
||||
Comment[es]=Ofrece información sobre el equipamiento instalado
|
||||
Icon=lshw-gtk
|
||||
Exec=su-to-root -X -c lshw-gtk
|
||||
Terminal=false
|
||||
Categories=System;
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
Modified install directoriesIndex: lshw-02.14/src/Makefile
|
||||
===================================================================
|
||||
Index: lshw/src/Makefile
|
||||
===================================================================
|
||||
--- lshw.orig/src/Makefile
|
||||
+++ lshw/src/Makefile
|
||||
@@ -125,8 +125,8 @@ install: all
|
||||
|
||||
install-gui: gui
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
|
||||
- $(INSTALL) -m 0755 gui/gtk-$(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
|
||||
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/artwork
|
||||
+ $(INSTALL) -m 0755 gui/gtk-$(PACKAGENAME) $(DESTDIR)/$(SBINDIR)/$(PACKAGENAME)-gtk
|
||||
+ $(INSTALL) -d -m 0754 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/artwork
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/ui
|
||||
$(INSTALL) -m 0644 gui/*.ui $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/ui
|
||||
$(INSTALL) -m 0644 gui/artwork/*.svg $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/artwork
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
=head1 NAME
|
||||
|
||||
lshw-gtk - list hardware (GTK version)
|
||||
|
||||
=head1 DESCRIPTION
|
||||
|
||||
lshw is a small tool to extract 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 x86 or IA-64
|
||||
systems and on some PowerPC
|
||||
machines (PowerMac G4 is known to work).
|
||||
|
||||
It currently supports DMI (x86 and IA-64 only), OpenFirmware device tree (PowerPC only),
|
||||
PCI/AGP, CPUID (x86), IDE/ATA/ATAPI, PCMCIA (only tested on x86), SCSI and USB.
|
||||
|
||||
=head1 NOTES
|
||||
|
||||
lshw-gtk must be run as super user or it will only report
|
||||
|
||||
=head1 COPYING
|
||||
|
||||
lshw is distributed under the GNU GENERAL PUBLIC LICENSE (GPL) version 2.
|
||||
|
||||
=head1 AUTOR
|
||||
|
||||
lshw is maintained by Lyonel Vincent
|
||||
<lyonel@ezix.org>.
|
||||
|
||||
=head1 OTHER INFO
|
||||
|
||||
The webpage for lshw is at http://ezix.org/software/lshw.html
|
||||
|
||||
=cut
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
Doesn't look for new version on inte to avoid privacy issuesIndex: lshw-02.14/src/core/version.cc
|
||||
===================================================================
|
||||
Index: lshw/src/core/version.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/version.cc
|
||||
+++ lshw/src/core/version.cc
|
||||
@@ -89,6 +89,8 @@ const char * checkupdates()
|
||||
{
|
||||
static char *latest = NULL;
|
||||
|
||||
+ return NULL;
|
||||
+
|
||||
if(!latest)
|
||||
latest = txtquery(PACKAGE, "ezix.org", NULL);
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
wget.patch
|
||||
bin.patch
|
||||
lshw-gtk.patch
|
||||
lshw-common.patch
|
||||
cflags.patch
|
||||
gcc45.gcc
|
||||
lshw-X.patch
|
||||
privacy.patch
|
||||
spelling-error.patch
|
||||
add-missing-ethlink-standards.patch
|
||||
cross.patch
|
||||
82393aa9b59307a443677df7340a1dd38847a5ef.patch
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
Index: lshw/src/core/network.cc
|
||||
===================================================================
|
||||
--- lshw.orig/src/core/network.cc
|
||||
+++ lshw/src/core/network.cc
|
||||
@@ -430,7 +430,7 @@ bool scan_network(hwNode & n)
|
||||
if(ecmd.supported & SUPPORTED_BNC)
|
||||
interface.addCapability("bnc", _("BNC"));
|
||||
if(ecmd.supported & SUPPORTED_MII)
|
||||
- interface.addCapability("mii", _("Media Independant Interface"));
|
||||
+ interface.addCapability("mii", _("Media Independent Interface"));
|
||||
if(ecmd.supported & SUPPORTED_FIBRE)
|
||||
interface.addCapability("fibre",_( "optical fibre"));
|
||||
if(ecmd.supported & SUPPORTED_10baseT_Half)
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
Index: lshw-02.12.01/src/core/pci.cc
|
||||
===================================================================
|
||||
--- lshw-02.12.01.orig/src/core/pci.cc 2008-05-04 00:24:49.000000000 +0200
|
||||
+++ lshw-02.12.01/src/core/pci.cc 2008-05-04 00:24:49.000000000 +0200
|
||||
@@ -68,6 +68,7 @@
|
||||
#define PCI_CAP_LIST_NEXT 1 /* Next capability in the list */
|
||||
#define PCI_CAP_FLAGS 2 /* Capability defined flags (16 bits) */
|
||||
#define PCI_CAP_SIZEOF 4
|
||||
+#define PCI_FIND_CAP_TTL 48
|
||||
|
||||
#define PCI_SID_ESR 2 /* Expansion Slot Register */
|
||||
#define PCI_SID_ESR_NSLOTS 0x1f /* Number of expansion slots available */
|
||||
@@ -666,8 +667,9 @@
|
||||
{
|
||||
unsigned int where = get_conf_byte(d, PCI_CAPABILITY_LIST) & ~3;
|
||||
string buffer;
|
||||
+ unsigned int ttl = PCI_FIND_CAP_TTL;
|
||||
|
||||
- while(where)
|
||||
+ while(where && ttl--)
|
||||
{
|
||||
unsigned int id, next, cap;
|
||||
|
||||
@@ -675,7 +677,7 @@
|
||||
next = get_conf_byte(d, where + PCI_CAP_LIST_NEXT) & ~3;
|
||||
cap = get_conf_word(d, where + PCI_CAP_FLAGS);
|
||||
|
||||
- if(!id)
|
||||
+ if(!id || id == 0xff)
|
||||
return false;
|
||||
|
||||
switch(id)
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
Avoid downloading of files from inet at build time
|
||||
This is provided by hwdata packageIndex: lshw-02.14/src/Makefile
|
||||
===================================================================
|
||||
Index: lshw/src/Makefile
|
||||
===================================================================
|
||||
--- lshw.orig/src/Makefile
|
||||
+++ lshw/src/Makefile
|
||||
@@ -97,16 +97,16 @@ $(PACKAGENAME).1: $(PACKAGENAME).sgml
|
||||
docbook2man $<
|
||||
|
||||
pci.ids:
|
||||
- wget http://pciids.sourceforge.net/pci.ids
|
||||
+ #wget http://pciids.sourceforge.net/pci.ids
|
||||
|
||||
usb.ids:
|
||||
- wget http://www.linux-usb.org/usb.ids
|
||||
+ #wget http://www.linux-usb.org/usb.ids
|
||||
|
||||
oui.txt:
|
||||
- wget http://standards.ieee.org/regauth/oui/oui.txt
|
||||
+ #wget http://standards.ieee.org/regauth/oui/oui.txt
|
||||
|
||||
manuf.txt:
|
||||
- wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf
|
||||
+ #wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf
|
||||
|
||||
pnp.ids:
|
||||
wget https://git.fedorahosted.org/cgit/hwdata.git/plain/pnp.ids
|
||||
|
|
@ -1 +1 @@
|
|||
3.0 (quilt)
|
||||
3.0 (native)
|
||||
|
|
|
|||
Loading…
Reference in New Issue