Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -0,0 +1,78 @@
|
||||
From 016bdb133a44bdf42c268ff72ee7aa04af19cfd3 Mon Sep 17 00:00:00 2001
|
||||
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
|
||||
Date: Sat, 27 Aug 2016 01:11:56 +0200
|
||||
Subject: [PATCH] Fix musl build: basename() is in libgen.h.
|
||||
|
||||
Also, its argument is not const, so add const_cast. This is risky
|
||||
because in fact basename() will modify the argument if it ends with /
|
||||
but that's not the case here.
|
||||
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
src/core/dasd.cc | 1 +
|
||||
src/core/sysfs.cc | 9 +++++----
|
||||
2 files changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/core/dasd.cc b/src/core/dasd.cc
|
||||
index 626b8a8..6276101 100644
|
||||
--- a/src/core/dasd.cc
|
||||
+++ b/src/core/dasd.cc
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <sys/ioctl.h>
|
||||
#include <linux/fs.h>
|
||||
#include <map>
|
||||
+#include <libgen.h>
|
||||
|
||||
using namespace std;
|
||||
|
||||
diff --git a/src/core/sysfs.cc b/src/core/sysfs.cc
|
||||
index acc9d00..bdd69e3 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$");
|
||||
|
||||
@@ -99,7 +100,7 @@ static string sysfs_getbustype(const string & path)
|
||||
{
|
||||
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))
|
||||
return string(namelist[i]->d_name);
|
||||
@@ -139,7 +140,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
|
||||
@@ -207,7 +208,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()));
|
||||
}
|
||||
|
||||
|
||||
@@ -288,7 +289,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()));
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
2.9.3
|
||||
|
||||
36
bsp/buildroot/package/lshw/0003-Fix-use-of-LONG_BIT.patch
Normal file
36
bsp/buildroot/package/lshw/0003-Fix-use-of-LONG_BIT.patch
Normal file
@@ -0,0 +1,36 @@
|
||||
From 50284ac4400ac3d7562f4765726492caee8ff547 Mon Sep 17 00:00:00 2001
|
||||
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
|
||||
Date: Sat, 27 Aug 2016 01:15:13 +0200
|
||||
Subject: [PATCH] Fix use of LONG_BIT
|
||||
|
||||
LONG_BIT is not a sysconf value, it is either 32 or 64. Using it as
|
||||
a sysconf value will give weird results.
|
||||
|
||||
Originally it was sysconf(_SC_LONG_BIT) (before it was "fixed" by the
|
||||
gentoo guys). But this is useless: it will always return a value
|
||||
equal to LONG_BIT: it's either compiled 32-bit or 64-bit so a runtime
|
||||
lookup doesn't make sense. For this reason, musl has removed the
|
||||
definition of _SC_LONG_BIT.
|
||||
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
src/core/abi.cc | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/core/abi.cc b/src/core/abi.cc
|
||||
index 76e5082..a13daaa 100644
|
||||
--- a/src/core/abi.cc
|
||||
+++ b/src/core/abi.cc
|
||||
@@ -19,8 +19,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 ?
|
||||
- system.setWidth(sysconf(LONG_BIT));
|
||||
+ system.setWidth(LONG_BIT);
|
||||
|
||||
pushd(PROC_SYS);
|
||||
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user