Move buildroot to bsp directory.
This commit is contained in:
@@ -0,0 +1,52 @@
|
||||
From ca6e99d9fa4bf503a883407e964eaad5e18d51c7 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
|
||||
|
||||
The $(libdir) variable points to the location of the directory on the target
|
||||
system, /usr/lib by default. When cross compiling this directory contains the
|
||||
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>
|
||||
---
|
||||
cmdlang/Makefile.am | 2 +-
|
||||
unix/Makefile.am | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
|
||||
index e80090dd0c6f..b59ff244b9a8 100644
|
||||
--- a/cmdlang/Makefile.am
|
||||
+++ b/cmdlang/Makefile.am
|
||||
@@ -16,7 +16,7 @@ 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
|
||||
|
||||
bin_PROGRAMS = openipmish
|
||||
|
||||
diff --git a/unix/Makefile.am b/unix/Makefile.am
|
||||
index a7921477e1c4..a108bc679c9a 100644
|
||||
--- a/unix/Makefile.am
|
||||
+++ b/unix/Makefile.am
|
||||
@@ -11,13 +11,13 @@ 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
|
||||
|
||||
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
|
||||
|
||||
noinst_HEADERS = heap.h
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
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
|
||||
|
||||
18
bsp/buildroot/package/openipmi/Config.in
Normal file
18
bsp/buildroot/package/openipmi/Config.in
Normal file
@@ -0,0 +1,18 @@
|
||||
config BR2_PACKAGE_OPENIPMI
|
||||
bool "openipmi"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on !BR2_STATIC_LIBS # dlopen()
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_POPT
|
||||
select BR2_PACKAGE_NCURSES
|
||||
help
|
||||
IPMI allows remote monitoring and remote management of
|
||||
devices. OpenIPMI provides a library and command line tools
|
||||
to interact with IPMI enabled devices. OpenIPMI also provides
|
||||
an IPMI BMC simulator.
|
||||
|
||||
http://openipmi.sourceforge.net
|
||||
|
||||
comment "openipmi needs a toolchain w/ dynamic library, threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
4
bsp/buildroot/package/openipmi/openipmi.hash
Normal file
4
bsp/buildroot/package/openipmi/openipmi.hash
Normal file
@@ -0,0 +1,4 @@
|
||||
# From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/
|
||||
sha1 54f63ab7fe09f6a4b0b718601fe9c61014aa220b OpenIPMI-2.0.21.tar.gz
|
||||
# Locally computed
|
||||
sha256 0eafaa502ccf752899c5089159574081067d0c4ac53ea0ace33a5087f33ea32a 0001-ui-use-standard-uint32_t.patch
|
||||
44
bsp/buildroot/package/openipmi/openipmi.mk
Normal file
44
bsp/buildroot/package/openipmi/openipmi.mk
Normal file
@@ -0,0 +1,44 @@
|
||||
################################################################################
|
||||
#
|
||||
# openipmi
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPENIPMI_VERSION = 2.0.21
|
||||
OPENIPMI_SITE = http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library
|
||||
OPENIPMI_SOURCE = OpenIPMI-2.0.21.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_FILES = COPYING.LIB COPYING COPYING.BSD
|
||||
OPENIPMI_DEPENDENCIES = popt ncurses host-pkgconf
|
||||
# Patching Makefile.am
|
||||
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 \
|
||||
--with-swig=no
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GDBM),y)
|
||||
OPENIPMI_DEPENDENCIES += gdbm
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
OPENIPMI_DEPENDENCIES += openssl
|
||||
OPENIPMI_CONF_OPTS += --with-openssl=yes
|
||||
else
|
||||
OPENIPMI_CONF_OPTS += --with-openssl=no
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NETSNMP),y)
|
||||
OPENIPMI_DEPENDENCIES += netsnmp
|
||||
OPENIPMI_CONF_OPTS += --with-ucdsnmp=yes
|
||||
else
|
||||
OPENIPMI_CONF_OPTS += --with-ucdsnmp=no
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user