From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-we0-f172.google.com ([74.125.82.172]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1SYzIO-00089u-2M for ptxdist@pengutronix.de; Mon, 28 May 2012 14:44:14 +0200 Received: by werb13 with SMTP id b13so2404508wer.31 for ; Mon, 28 May 2012 05:43:26 -0700 (PDT) From: "Bart vdr. Meulen" Date: Mon, 28 May 2012 14:42:41 +0200 Message-Id: <1338208981-8681-15-git-send-email-bartvdrmeulen@gmail.com> Subject: [ptxdist] [PATCH] lshw: version bump to 2.15 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de From: "Bart vdr. Meulen" Update lshw to version 2.15 Signed-off-by: Bart vdr. Meulen --- .../lshw-B.02.14/0001-fix-cross-compilation.patch | 69 ------------------- ...word-node-with-hwnode-for-TinyXpath-compa.patch | 39 ----------- .../0003-fix-compiling-with-g-4.5.patch | 27 -------- patches/lshw-B.02.14/series | 3 - .../lshw-B.02.15/0001-fix-cross-compilation.patch | 72 ++++++++++++++++++++ ...word-node-with-hwnode-for-TinyXpath-compa.patch | 36 ++++++++++ patches/lshw-B.02.15/series | 2 + rules/lshw.make | 9 ++- 8 files changed, 114 insertions(+), 143 deletions(-) delete mode 100644 patches/lshw-B.02.14/0001-fix-cross-compilation.patch delete mode 100644 patches/lshw-B.02.14/0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch delete mode 100644 patches/lshw-B.02.14/0003-fix-compiling-with-g-4.5.patch delete mode 100644 patches/lshw-B.02.14/series create mode 100644 patches/lshw-B.02.15/0001-fix-cross-compilation.patch create mode 100644 patches/lshw-B.02.15/0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch create mode 100644 patches/lshw-B.02.15/series 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 3e9974d..0000000 --- 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/0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch b/patches/lshw-B.02.14/0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch deleted file mode 100644 index eb9abb6..0000000 --- a/patches/lshw-B.02.14/0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0eea91e31ed90c82acc45c221be689c10e4f779c Mon Sep 17 00:00:00 2001 -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 - -It turns out that within TinyXpath 'node' is a reserved key-word. -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(-) - -diff --git a/src/core/hw.cc b/src/core/hw.cc -index 36679d3..367729b 100644 ---- a/src/core/hw.cc -+++ b/src/core/hw.cc -@@ -1343,7 +1343,7 @@ string hwNode::asXML(unsigned level) - if(visible(getClassName())) - { - out << spaces(2*level); -- out << "" << endl; -+ out << "" << endl; - } - - return out.str(); --- -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 903b87d..0000000 --- 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 c740bfb..0000000 --- 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.15/0001-fix-cross-compilation.patch b/patches/lshw-B.02.15/0001-fix-cross-compilation.patch new file mode 100644 index 0000000..c2991ad --- /dev/null +++ b/patches/lshw-B.02.15/0001-fix-cross-compilation.patch @@ -0,0 +1,72 @@ +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 | 6 +++--- + src/core/Makefile | 4 ++-- + src/gui/Makefile | 6 +++--- + 3 files changed, 8 insertions(+), 8 deletions(-) + +Index: lshw-B.02.15/src/Makefile +=================================================================== +--- lshw-B.02.15.orig/src/Makefile ++++ lshw-B.02.15/src/Makefile +@@ -21,16 +21,16 @@ export SQLITE + CXX?=c++ + INCLUDES=-I./core/ + DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" +-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) ++CXXFLAGS+=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) $(CPPFLAGS) + ifeq ($(SQLITE), 1) + CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3) + endif +-LDFLAGS=-L./core/ -g ++LDFLAGS+= + ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) + LDFLAGS+= -Wl,--as-needed + endif + LDSTATIC=-static +-LIBS=-llshw -lresolv ++LIBS=-L./core/ -llshw -lresolv + ifeq ($(SQLITE), 1) + LIBS+= $(shell pkg-config --libs sqlite3) + endif +Index: lshw-B.02.15/src/core/Makefile +=================================================================== +--- lshw-B.02.15.orig/src/core/Makefile ++++ lshw-B.02.15/src/core/Makefile +@@ -3,8 +3,8 @@ PACKAGENAME?=lshw + 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= + +Index: lshw-B.02.15/src/gui/Makefile +=================================================================== +--- lshw-B.02.15.orig/src/gui/Makefile ++++ lshw-B.02.15/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 -lsqlite3 $(GTKLIBS) +-LDFLAGS= ++LDFLAGS+= + ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) + LDFLAGS+= -Wl,--as-needed + endif diff --git a/patches/lshw-B.02.15/0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch b/patches/lshw-B.02.15/0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch new file mode 100644 index 0000000..1c89be6 --- /dev/null +++ b/patches/lshw-B.02.15/0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch @@ -0,0 +1,36 @@ +From 0eea91e31ed90c82acc45c221be689c10e4f779c Mon Sep 17 00:00:00 2001 +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 + +It turns out that within TinyXpath 'node' is a reserved key-word. +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 file changed, 2 insertions(+), 2 deletions(-) + +Index: lshw-B.02.15/src/core/hw.cc +=================================================================== +--- lshw-B.02.15.orig/src/core/hw.cc ++++ lshw-B.02.15/src/core/hw.cc +@@ -1659,7 +1659,7 @@ string hwNode::asXML(unsigned level) + if(visible(getClassName())) + { + out << spaces(2*level); +- out << "" << endl; ++ out << "" << endl; + } + + return out.str(); diff --git a/patches/lshw-B.02.15/series b/patches/lshw-B.02.15/series new file mode 100644 index 0000000..c41c259 --- /dev/null +++ b/patches/lshw-B.02.15/series @@ -0,0 +1,2 @@ +0001-fix-cross-compilation.patch +0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch diff --git a/rules/lshw.make b/rules/lshw.make index a747c06..341bf79 100644 --- a/rules/lshw.make +++ b/rules/lshw.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LSHW) += lshw # # Paths and names # -LSHW_VERSION := B.02.14 -LSHW_MD5 := 8bed55768c5cb2ceff062b882a687e9b +LSHW_VERSION := B.02.15 +LSHW_MD5 := 970bd9eb05fa3ae139a24a417465c54c LSHW := lshw-$(LSHW_VERSION) LSHW_SUFFIX := tar.gz LSHW_URL := http://www.ezix.org/software/files/$(LSHW).$(LSHW_SUFFIX) @@ -45,9 +45,8 @@ LSHW_CONF_TOOL := NO # the "src" subdir avoids this. LSHW_SUBDIR := src -LSHW_MAKE_ENV := $(CROSS_ENV) -LSHW_MAKE_OPT := all -LSHW_INSTALL_OPT := install +LSHW_MAKE_OPT := $(CROSS_ENV) all +LSHW_INSTALL_OPT := $(CROSS_ENV) install ifdef PTXCONF_LSHW_GUI LSHW_MAKE_OPT += gui -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de