NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lshw: bump version to B.02.18

Browse Source 
Version B.02.17 was found to be unstable on recent HW.

Status of the patches:

 - The patch allowing to add extra values to the LIBS variable has
   been refreshed, and changed to a Git formatted patch.

 - The two patches from git.alpinelinux.org were needed for lshw to
   build with the musl C library, but they have been merged upstream
   (commit cd690bff1516b40fecd5ec4a7f6619e5bffc3cf0).

 - The last patch was taken from upstream, and therefore already
   merged, and now part of B.02.18.

This patch was tested with kernel 4.4.16.

Signed-off-by: Hubert Sokolowski <hubert.sokolowski@intel.com>
[Thomas:
 - better explanation about patches
 - re-add patch from Gustavo about LIBS, since it is really needed.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Hubert Sokolowski 2016-07-29 18:54:59 +02:00 committed by Thomas Petazzoni
parent 04bf807173
commit d0af5cd663
4 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
package/lshw/0001-Makefile-allow-to-pass-additional-LIBS.patch Normal file
View File

@ -0,0 +1,44 @@
From 5af98ca8135ac411364b16720d795224a9b4a178 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 30 Jul 2016 15:15:14 +0200
Subject: [PATCH] Makefile: allow to pass additional LIBS
We need to be able to pass extra LIBS when our toolchain lacks NLS
support, this way we can build libintl and link to it. A good example
is uClibc with locale support disabled.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
src/Makefile | 2 +-
src/gui/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index b50586b..acbdbfa 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -30,7 +30,7 @@ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
LDFLAGS+= -Wl,--as-needed
endif
LDSTATIC=-static
-LIBS=-llshw -lresolv
+LIBS+=-llshw -lresolv
ifeq ($(SQLITE), 1)
LIBS+= $(shell pkg-config --libs sqlite3)
endif
diff --git a/src/gui/Makefile b/src/gui/Makefile
index 332ce57..7f72e3f 100644
--- a/src/gui/Makefile
+++ b/src/gui/Makefile
@@ -11,7 +11,7 @@ INCLUDES=-I../core $(GTKINCLUDES)
CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
CFLAGS=$(CXXFLAGS) $(DEFINES)
GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs)
-LIBS=-L../core -llshw -lresolv $(GTKLIBS)
+LIBS+=-L../core -llshw -lresolv $(GTKLIBS)
LDFLAGS=
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
LDFLAGS+= -Wl,--as-needed
--
2.7.4

30
package/lshw/0001-add-LIBS.patch
View File

@ -1,30 +0,0 @@
We need to be able to pass extra LIBS when our toolchain lacks NLS support,
this way we can build libintl and link to it.
A good example is uClibc with locale support disabled.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
diff -Nura lshw-B.02.16.orig/src/gui/Makefile lshw-B.02.16/src/gui/Makefile
--- lshw-B.02.16.orig/src/gui/Makefile 2012-05-28 12:32:49.303885759 -0300
+++ lshw-B.02.16/src/gui/Makefile 2012-05-28 12:33:33.850206001 -0300
@@ -11,7 +11,7 @@
CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
CFLAGS=$(CXXFLAGS) $(DEFINES)
GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs)
-LIBS=-L../core -llshw -lresolv -lsqlite3 $(GTKLIBS)
+LIBS+=-L../core -llshw -lresolv -lsqlite3 $(GTKLIBS)
LDFLAGS=
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
LDFLAGS+= -Wl,--as-needed
diff -Nura lshw-B.02.16.orig/src/Makefile lshw-B.02.16/src/Makefile
--- lshw-B.02.16.orig/src/Makefile 2012-05-28 12:32:49.292885680 -0300
+++ lshw-B.02.16/src/Makefile 2012-05-28 12:33:24.530139060 -0300
@@ -30,7 +30,7 @@
LDFLAGS+= -Wl,--as-needed
endif
LDSTATIC=-static
-LIBS=-llshw -lresolv
+LIBS+=-llshw -lresolv
ifeq ($(SQLITE), 1)
LIBS+= $(shell pkg-config --libs sqlite3)
endif

5
package/lshw/lshw.hash
View File

@ -1,5 +1,2 @@
# Locally calculated
sha256 eb9cc053fa0f1e78685cb695596e73931bfb55d2377e3bc3b8b94aff4c5a489c lshw-B.02.17.tar.gz
sha256 2e5a3d63da8475db17fd90969bcb1930cf19d2b8da7be41edeea5c2a53878382 no-private-uint.patch
sha256 c8365f7ac8fc7a751c78d89ab446111bb1a235bc977a1b21e1b826c2e62361d1 basename-limits-long-bits.patch
sha256 9eba284061574e02a6b162ab20dff07c48693e00f781220ee974ba5c90d1cca9 988f5449791ebf869ab9fa7520463dab4eae3404.patch
sha256 ae22ef11c934364be4fd2a0a1a7aadf4495a0251ec6979da280d342a89ca3c2f lshw-B.02.18.tar.gz

6
package/lshw/lshw.mk
View File

@ -4,12 +4,8 @@
#
################################################################################
LSHW_VERSION = B.02.17
LSHW_VERSION = B.02.18
LSHW_SITE = http://ezix.org/software/files
LSHW_PATCH = \
http://git.alpinelinux.org/cgit/aports/plain/testing/lshw/basename-limits-long-bits.patch \
http://git.alpinelinux.org/cgit/aports/plain/testing/lshw/no-private-uint.patch \
https://github.com/lyonel/lshw/commit/988f5449791ebf869ab9fa7520463dab4eae3404.patch
LSHW_LICENSE = GPLv2
LSHW_LICENSE_FILES = COPYING