From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 21 Jan 2022 08:24:50 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nAoHy-008Xja-Nz for lore@lore.pengutronix.de; Fri, 21 Jan 2022 08:24:50 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nAoHx-0002yC-MR; Fri, 21 Jan 2022 08:24:49 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nAoD0-0005sp-Ms; Fri, 21 Jan 2022 08:19:42 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nAoD0-00BW7s-Ld; Fri, 21 Jan 2022 08:19:41 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nAoCz-008GCy-3z; Fri, 21 Jan 2022 08:19:41 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 21 Jan 2022 08:19:41 +0100 Message-Id: <20220121071941.1968884-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220108184518.3774572-7-christian.melki@t2data.com> References: <20220108184518.3774572-7-christian.melki@t2data.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] lshw: Version bump. B.02.14 -> B.02.19.2 + accomodation for hwdata package. X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 53e9381ce822a38cd30c7353db72e9a4f88a0d12. Michael [sent from post-receive hook] On Fri, 21 Jan 2022 08:19:40 +0100, Christian Melki wrote: > Make lshw depend on hwdata-pci and hwdata-usb files. > > Remove installation of .ids files, provided by hwdata. > Afaik, oui and manuf databases are not used. > > Signed-off-by: Christian Melki > Message-Id: <20220108184518.3774572-7-christian.melki@t2data.com> > [mol: don't create empty /usr/share/lshw] > [mol: migrate patches] > Signed-off-by: Michael Olbrich > > diff --git a/patches/lshw-B.02.14/0001-fix-cross-compilation.patch b/patches/lshw-B.02.14/0001-fix-cross-compilation.patch > deleted file mode 100644 > index 3e9974d15459..000000000000 > --- a/patches/lshw-B.02.14/0001-fix-cross-compilation.patch > +++ /dev/null > @@ -1,69 +0,0 @@ > -From cb3fbcd551017645b092743e2b48c27514829196 Mon Sep 17 00:00:00 2001 > -From: Remy Bohmer > -Date: Sun, 20 Jun 2010 22:48:09 +0200 > -Subject: [PATCH 1/2] fix cross-compilation > - > -Signed-off-by: Remy Bohmer > -[mkl: improve fix] > -Signed-off-by: Marc Kleine-Budde > ---- > - src/Makefile | 4 ++-- > - src/core/Makefile | 6 +++--- > - src/gui/Makefile | 6 +++--- > - 3 files changed, 8 insertions(+), 8 deletions(-) > - > -diff --git a/src/Makefile b/src/Makefile > -index 93c3ead..ea20184 100644 > ---- a/src/Makefile > -+++ b/src/Makefile > -@@ -18,8 +18,8 @@ export DATADIR > - CXX?=c++ > - INCLUDES=-I./core/ > - DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" > --CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) > --LDFLAGS=-L./core/ -g > -+CXXFLAGS+=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) $(CPPFLAGS) > -+LDFLAGS+=-L./core/ -g > - ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) > - LDFLAGS+= -Wl,--as-needed > - endif > -diff --git a/src/core/Makefile b/src/core/Makefile > -index 024b921..b108a6e 100644 > ---- a/src/core/Makefile > -+++ b/src/core/Makefile > -@@ -1,10 +1,10 @@ > - PACKAGENAME?=lshw > - > --CXX=c++ > -+CXX?=c++ > - INCLUDES= > - DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" > --CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) > --LDFLAGS= > -+CXXFLAGS+=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) $(CPPFLAGS) > -+LDFLAGS+= > - LDSTATIC= > - LIBS= > - > -diff --git a/src/gui/Makefile b/src/gui/Makefile > -index 05fbbfd..d410a1d 100644 > ---- a/src/gui/Makefile > -+++ b/src/gui/Makefile > -@@ -8,11 +8,11 @@ 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) > --CFLAGS=$(CXXFLAGS) $(DEFINES) > -+CXXFLAGS+=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) $(CPPFLAGS) > -+CFLAGS+=$(CXXFLAGS) $(DEFINES) > - GTKLIBS=$(shell pkg-config gtk+-2.0 --libs) > - LIBS=-L../core -llshw -lresolv $(GTKLIBS) > --LDFLAGS= > -+LDFLAGS+= > - ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) > - LDFLAGS+= -Wl,--as-needed > - endif > --- > -1.7.1 > - > diff --git a/patches/lshw-B.02.14/0003-fix-compiling-with-g-4.5.patch b/patches/lshw-B.02.14/0003-fix-compiling-with-g-4.5.patch > deleted file mode 100644 > index 903b87dd5538..000000000000 > --- a/patches/lshw-B.02.14/0003-fix-compiling-with-g-4.5.patch > +++ /dev/null > @@ -1,27 +0,0 @@ > -From: unknown author > -Date: Mon, 23 Aug 2010 10:45:58 +0200 > -Subject: [PATCH] fix compiling with g++ 4.5 > - > -g++ 4.5 is stricter and won't compile without this patch. > - > -Signed-off-by: Michael Olbrich > ---- > - src/core/scsi.cc | 2 +- > - 1 files changed, 1 insertions(+), 1 deletions(-) > - > -diff --git a/src/core/scsi.cc b/src/core/scsi.cc > -index ef49677..e72376b 100644 > ---- a/src/core/scsi.cc > -+++ b/src/core/scsi.cc > -@@ -842,7 +842,7 @@ static bool scan_hosts(hwNode & node) > - > - if (!controller) > - { > -- controller = node.addChild(hwNode::hwNode("scsi", hw::storage)); > -+ controller = node.addChild(hwNode("scsi", hw::storage)); > - if (controller) > - { > - controller->setLogicalName(host_logicalname(number)); > --- > -1.7.1 > - > diff --git a/patches/lshw-B.02.14/series b/patches/lshw-B.02.14/series > deleted file mode 100644 > index c740bfba63d1..000000000000 > --- a/patches/lshw-B.02.14/series > +++ /dev/null > @@ -1,3 +0,0 @@ > -0001-fix-cross-compilation.patch > -0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch > -0003-fix-compiling-with-g-4.5.patch > diff --git a/patches/lshw-B.02.14/0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch b/patches/lshw-B.02.19.2/0001-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch > similarity index 61% > rename from patches/lshw-B.02.14/0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch > rename to patches/lshw-B.02.19.2/0001-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch > index eb9abb67193d..b075f7edf063 100644 > --- a/patches/lshw-B.02.14/0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch > +++ b/patches/lshw-B.02.19.2/0001-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch > @@ -1,7 +1,6 @@ > -From 0eea91e31ed90c82acc45c221be689c10e4f779c Mon Sep 17 00:00:00 2001 > -From: Bart vdr. Meulen > +From: "Bart vdr. Meulen" > Date: Sun, 20 Jun 2010 22:48:09 +0200 > -Subject: [PATCH 2/2] Replace keyword node with hwnode for TinyXpath compatibility > +Subject: [PATCH] Replace keyword node with hwnode for TinyXpath compatibility > > It turns out that within TinyXpath 'node' is a reserved key-word. > Replace it with 'hwnode' when printing to xml. > @@ -9,14 +8,14 @@ Replace it with 'hwnode' when printing to xml. > Signed-off-by: Bart vdr. Meulen > Signed-off-by: Remy Bohmer > --- > - src/core/hw.cc | 4 ++-- > - 1 files changed, 2 insertions(+), 2 deletions(-) > + src/core/hw.cc | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/core/hw.cc b/src/core/hw.cc > -index 36679d3..367729b 100644 > +index 4522c1af0fc3..13c22ac8f44d 100644 > --- a/src/core/hw.cc > +++ b/src/core/hw.cc > -@@ -1343,7 +1343,7 @@ string hwNode::asXML(unsigned level) > +@@ -1715,7 +1715,7 @@ string hwNode::asXML(unsigned level) > if(visible(getClassName())) > { > out << spaces(2*level); > @@ -25,7 +24,7 @@ index 36679d3..367729b 100644 > if (disabled()) > out << " disabled=\"true\""; > if (claimed()) > -@@ -1596,7 +1596,7 @@ string hwNode::asXML(unsigned level) > +@@ -2014,7 +2014,7 @@ string hwNode::asXML(unsigned level) > if(visible(getClassName())) > { > out << spaces(2*level); > @@ -33,7 +32,4 @@ index 36679d3..367729b 100644 > + out << "" << endl; > } > > - return out.str(); > --- > -1.7.1 > - > + if((level==0) && ::enabled("output:list")) > diff --git a/patches/lshw-B.02.19.2/series b/patches/lshw-B.02.19.2/series > new file mode 100644 > index 000000000000..9e84d09a6fc9 > --- /dev/null > +++ b/patches/lshw-B.02.19.2/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch > +# 71740a4e0313709445f69ef544501432 - git-ptx-patches magic > diff --git a/rules/lshw.in b/rules/lshw.in > index 6911380f6999..c8632f7b41c3 100644 > --- a/rules/lshw.in > +++ b/rules/lshw.in > @@ -7,6 +7,9 @@ menuconfig LSHW > select GCCLIBS_CXX > select GCCLIBS_GCC_S > select GTK if LSHW_GUI > + select HWDATA if !SYSTEMD_HWDB > + select HWDATA_USB if !SYSTEMD_HWDB > + select HWDATA_PCI if !SYSTEMD_HWDB > help > lshw (Hardware Lister) is a small tool to provide detailed information > on the hardware configuration of the machine. It can report exact > diff --git a/rules/lshw.make b/rules/lshw.make > index 28dbb6cb7d11..1feb82dba8e8 100644 > --- a/rules/lshw.make > +++ b/rules/lshw.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LSHW) += lshw > # > # Paths and names > # > -LSHW_VERSION := B.02.14 > -LSHW_MD5 := 8bed55768c5cb2ceff062b882a687e9b > +LSHW_VERSION := B.02.19.2 > +LSHW_MD5 := 8c70d46e906688309095c73ecb9396e3 > LSHW := lshw-$(LSHW_VERSION) > LSHW_SUFFIX := tar.gz > LSHW_URL := http://www.ezix.org/software/files/$(LSHW).$(LSHW_SUFFIX) > @@ -59,12 +59,6 @@ $(STATEDIR)/lshw.targetinstall: > > @$(call install_copy, lshw, 0, 0, 0755, -, /usr/sbin/lshw) > > - @$(call install_copy, lshw, 0, 0, 0755, /usr/share/lshw) > - @$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/pci.ids) > - @$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/usb.ids) > - @$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/oui.txt) > - @$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/manuf.txt) > - > ifdef PTXCONF_LSHW_GUI > @$(call install_copy, lshw, 0, 0, 0755, -, /usr/sbin/gtk-lshw) > _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de