Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -1,4 +1,4 @@
|
||||
From ca6e99d9fa4bf503a883407e964eaad5e18d51c7 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Wed, 22 Jul 2015 07:04:33 +0300
|
||||
Subject: [PATCH] Avoid searching host library path
|
||||
@@ -9,44 +9,44 @@ host libraries which may be different than target libraries. Don't use
|
||||
$(libdir) in the library search path.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
Signed-off-by: Joel Stanley <joel@jms.id.au>
|
||||
---
|
||||
cmdlang/Makefile.am | 2 +-
|
||||
unix/Makefile.am | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
cmdlang/Makefile.am | 3 +--
|
||||
unix/Makefile.am | 6 ++----
|
||||
2 files changed, 3 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
|
||||
index e80090dd0c6f..b59ff244b9a8 100644
|
||||
index 264ee12be79f..0b3843784656 100644
|
||||
--- a/cmdlang/Makefile.am
|
||||
+++ b/cmdlang/Makefile.am
|
||||
@@ -16,7 +16,7 @@ libOpenIPMIcmdlang_la_LIBADD = -lm \
|
||||
@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \
|
||||
libOpenIPMIcmdlang_la_LIBADD = -lm \
|
||||
$(top_builddir)/utils/libOpenIPMIutils.la \
|
||||
$(top_builddir)/lib/libOpenIPMI.la
|
||||
libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
|
||||
- -Wl,-Map -Wl,libOpenIPMIcmdlang.map -L$(libdir)
|
||||
+ -Wl,-Map -Wl,libOpenIPMIcmdlang.map
|
||||
-libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
|
||||
- -L$(libdir)
|
||||
+libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION)
|
||||
|
||||
bin_PROGRAMS = openipmish
|
||||
|
||||
diff --git a/unix/Makefile.am b/unix/Makefile.am
|
||||
index a7921477e1c4..a108bc679c9a 100644
|
||||
index 5128839dad13..bd0f897ba8d6 100644
|
||||
--- a/unix/Makefile.am
|
||||
+++ b/unix/Makefile.am
|
||||
@@ -11,13 +11,13 @@ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c
|
||||
@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la
|
||||
libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c
|
||||
libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \
|
||||
$(top_builddir)/utils/libOpenIPMIutils.la
|
||||
libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
|
||||
- -Wl,-Map -Wl,libOpenIPMIpthread.map -L$(libdir)
|
||||
+ -Wl,-Map -Wl,libOpenIPMIpthread.map
|
||||
$(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB)
|
||||
-libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
|
||||
- -L$(libdir)
|
||||
+libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION)
|
||||
|
||||
libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c
|
||||
libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \
|
||||
$(GDBM_LIB)
|
||||
libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
|
||||
- -Wl,-Map -Wl,libOpenIPMIposix.map -L$(libdir)
|
||||
+ -Wl,-Map -Wl,libOpenIPMIposix.map
|
||||
$(GDBM_LIB) $(RT_LIB)
|
||||
-libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
|
||||
- -L$(libdir)
|
||||
+libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION)
|
||||
|
||||
noinst_HEADERS = heap.h
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
From d3be03464be7fa3844dfe0837a7e2c920c107836 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Thu, 23 Jul 2015 13:35:35 +0300
|
||||
Subject: [PATCH] configure.ac: detect -lrt requirement for clock_gettime
|
||||
|
||||
glibc versions before 2.17 require link with -lrt.
|
||||
|
||||
Upstream status: sent, stuck in moderator's queue
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
configure.ac | 8 ++++++++
|
||||
unix/Makefile.am | 4 ++--
|
||||
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 18401f161d45..6b350a41a916 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -854,6 +854,14 @@ OPENIPMI_SWIG_SO="${PYTHON_POSIX_SO}:\$(top_builddir)/lib/.libs/libOpenIPMI.so:\
|
||||
AC_SUBST(OPENIPMI_SWIG_LIBS)
|
||||
AC_SUBST(OPENIPMI_SWIG_SO)
|
||||
|
||||
+LIB_CLOCK_GETTIME=
|
||||
+clk_saved_libs=$LIBS
|
||||
+AC_SEARCH_LIBS([clock_gettime], [rt],
|
||||
+ [test "$ac_cv_search_clock_gettime" = "none required" ||
|
||||
+ LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
|
||||
+AC_SUBST([LIB_CLOCK_GETTIME])
|
||||
+LIBS=$clk_saved_libs
|
||||
+
|
||||
# Everything from here to AC_OUTPUT is for libedit
|
||||
|
||||
# AC_PROG_LIBTOOL runs AC_CANONICAL_HOST
|
||||
diff --git a/unix/Makefile.am b/unix/Makefile.am
|
||||
index a108bc679c9a..fb60242d5d3b 100644
|
||||
--- a/unix/Makefile.am
|
||||
+++ b/unix/Makefile.am
|
||||
@@ -9,13 +9,13 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la
|
||||
|
||||
libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c
|
||||
libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \
|
||||
- $(top_builddir)/utils/libOpenIPMIutils.la
|
||||
+ $(top_builddir)/utils/libOpenIPMIutils.la $(LIB_CLOCK_GETTIME)
|
||||
libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
|
||||
-Wl,-Map -Wl,libOpenIPMIpthread.map
|
||||
|
||||
libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c
|
||||
libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \
|
||||
- $(GDBM_LIB)
|
||||
+ $(GDBM_LIB) $(LIB_CLOCK_GETTIME)
|
||||
libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
|
||||
-Wl,-Map -Wl,libOpenIPMIposix.map
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
# From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/
|
||||
sha1 826081e7ed0ad430de9b8fdb75a9eaa10c99b660 OpenIPMI-2.0.22.tar.gz
|
||||
sha1 f37656813a826a3147ed557c32408f8daa399c28 OpenIPMI-2.0.24.tar.gz
|
||||
# Locally computed
|
||||
sha256 4988900043c35fcfa9b2bf275d6593904f6429221befb770ba6ecb5502108e55 OpenIPMI-2.0.22.tar.gz
|
||||
sha256 0eafaa502ccf752899c5089159574081067d0c4ac53ea0ace33a5087f33ea32a 0001-ui-use-standard-uint32_t.patch
|
||||
sha256 bca39a27071278a8b74610181ede8df51e155e5e9031bc8eaa3699d1720292b4 OpenIPMI-2.0.24.tar.gz
|
||||
|
||||
@@ -4,12 +4,10 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPENIPMI_VERSION = 2.0.22
|
||||
OPENIPMI_VERSION = 2.0.24
|
||||
OPENIPMI_SITE = http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library
|
||||
OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz
|
||||
OPENIPMI_PATCH = \
|
||||
http://sourceforge.net/p/openipmi/patches/26/attachment/0001-ui-use-standard-uint32_t.patch
|
||||
OPENIPMI_LICENSE = LGPLv2+, GPLv2+, BSD-3c
|
||||
OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause
|
||||
OPENIPMI_LICENSE_FILES = COPYING.LIB COPYING COPYING.BSD
|
||||
OPENIPMI_DEPENDENCIES = popt ncurses host-pkgconf
|
||||
# Patching Makefile.am
|
||||
@@ -17,7 +15,6 @@ OPENIPMI_AUTORECONF = YES
|
||||
OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)"
|
||||
OPENIPMI_CONF_OPTS = \
|
||||
--with-glib=no \
|
||||
--with-glib12=no \
|
||||
--with-tcl=no \
|
||||
--with-perl=no \
|
||||
--with-python=no \
|
||||
|
||||
Reference in New Issue
Block a user