update buildroot to 2017.02.11

This commit is contained in:
jbnadal
2018-05-22 15:35:47 +02:00
parent 4bf1f5e091
commit a3c10bd762
9257 changed files with 433426 additions and 1701 deletions

View File

@@ -0,0 +1,34 @@
From d400314757a8d5d52bd5722d263bfd5886bb6595 Mon Sep 17 00:00:00 2001
From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Sat, 29 Oct 2016 13:32:57 -0400
Subject: [PATCH] lttng-ust-elf.c: define NT_GNU_BUILD_ID if not defined
On uClibc, NT_GNU_BUILD_ID is not defined, so we define it
manually in this case.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
[Philippe: grabbed from this pull request:
https://github.com/lttng/lttng-ust/pull/39
]
---
liblttng-ust/lttng-ust-elf.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c
index 5f27920..beaa7f3 100644
--- a/liblttng-ust/lttng-ust-elf.c
+++ b/liblttng-ust/lttng-ust-elf.c
@@ -29,6 +29,10 @@
#define BUF_LEN 4096
+#ifndef NT_GNU_BUILD_ID
+# define NT_GNU_BUILD_ID 3
+#endif
+
/*
* Retrieve the nth (where n is the `index` argument) phdr (program
* header) from the given elf instance.
--
2.9.3

View File

@@ -0,0 +1,49 @@
From f54894580da85e33f934c5c9bf5ab32d3fcce18b Mon Sep 17 00:00:00 2001
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date: Wed, 30 Nov 2016 16:52:51 +0000
Subject: [PATCH] doc/examples/Makefile.am: define C and C++ compilers for
CMake
This prevents build failures when cross-compiling.
If we don't define the compiler, it will use the one from the host
machine. For instance "/usr/bin/c++", which is incorrect.
The failure looks like this:
.............................................................
[ 10%] Building CXX object CMakeFiles/tracepoint-provider.dir/tracepoint-provider.cpp.o
/usr/bin/c++ -Dtracepoint_provider_EXPORTS -I/br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/. -isystem /br/output/build/lttng-libust-2.9.0/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -o CMakeFiles/tracepoint-provider.dir/tracepoint-provider.cpp.o -c /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp
In file included from /br/output/build/lttng-libust-2.9.0/include/lttng/tracepoint.h:29:0,
from /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h:32,
from /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp:26:
/br/output/build/lttng-libust-2.9.0/include/lttng/tracepoint-rcu.h:26:27: fatal error: urcu/compiler.h: No such file or directory
#include <urcu/compiler.h>
^
compilation terminated.
.............................................................
Pull request URL: https://github.com/lttng/lttng-ust/pull/41
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
doc/examples/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 424b844..5bc1f4c 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -152,7 +152,9 @@ all-local:
cmake \
-DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \
-DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \
+ -DCMAKE_C_COMPILER="$(CC)" \
-DCMAKE_C_FLAGS="$(CFLAGS) $(CPPFLAGS)" \
+ -DCMAKE_CXX_COMPILER="$(CXX)" \
-DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
-DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
.. && \
--
2.10.1

View File

@@ -0,0 +1,130 @@
From 42330adcefcd1830dad89e2a960c93d8dd1da125 Mon Sep 17 00:00:00 2001
From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Tue, 21 Feb 2017 16:00:27 -0500
Subject: [PATCH] Validate the presence of dlmopen at configure time
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
[Backport from upstream commit 42330adcefcd1830dad89e2a960c93d8dd1da125.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
configure.ac | 8 ++++++++
liblttng-ust-dl/lttng-ust-dl.c | 8 ++++++++
liblttng-ust-dl/ust_dl.h | 2 ++
3 files changed, 18 insertions(+)
diff --git a/configure.ac b/configure.ac
index 450b43b..023cfd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,15 +125,23 @@ AS_IF([test "x${ax_cv_sys_weak_alias}" = "xno"], [
# Checks for libraries.
AC_CHECK_LIB([dl], [dlopen], [
have_libdl=yes
+ libdl_name=dl
], [
#libdl not found, check for dlopen in libc.
AC_CHECK_LIB([c], [dlopen], [
have_libc_dl=yes
+ libdl_name=c
], [
AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use [LDFLAGS]=-Ldir to specify their location.])
])
])
+# Check if libdl has dlmopen support.
+AH_TEMPLATE([HAVE_DLMOPEN], ["Define to 1 if dlmopen is available."])
+AC_CHECK_LIB([$libdl_name], [dlmopen],
+ [AC_DEFINE([HAVE_DLMOPEN], [1])]
+)
+
AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBDL], [test "x$have_libdl" = "xyes"])
AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"])
diff --git a/liblttng-ust-dl/lttng-ust-dl.c b/liblttng-ust-dl/lttng-ust-dl.c
index b0737b6..ce2ae0e 100644
--- a/liblttng-ust-dl/lttng-ust-dl.c
+++ b/liblttng-ust-dl/lttng-ust-dl.c
@@ -38,8 +38,10 @@
#include "ust_dl.h"
static void *(*__lttng_ust_plibc_dlopen)(const char *filename, int flags);
+#ifdef HAVE_DLMOPEN
static void *(*__lttng_ust_plibc_dlmopen)(Lmid_t nsid, const char *filename,
int flags);
+#endif
static int (*__lttng_ust_plibc_dlclose)(void *handle);
static
@@ -55,6 +57,7 @@ void *_lttng_ust_dl_libc_dlopen(const char *filename, int flags)
return __lttng_ust_plibc_dlopen(filename, flags);
}
+#ifdef HAVE_DLMOPEN
static
void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename,
int flags)
@@ -68,6 +71,7 @@ void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename,
}
return __lttng_ust_plibc_dlmopen(nsid, filename, flags);
}
+#endif
static
int _lttng_ust_dl_libc_dlclose(void *handle)
@@ -143,6 +147,7 @@ end:
return;
}
+#ifdef HAVE_DLMOPEN
static
void lttng_ust_dl_dlmopen(void *so_base, Lmid_t nsid, const char *so_name,
int flags, void *ip)
@@ -203,6 +208,7 @@ end:
lttng_ust_elf_destroy(elf);
return;
}
+#endif
void *dlopen(const char *filename, int flags)
{
@@ -223,6 +229,7 @@ void *dlopen(const char *filename, int flags)
return handle;
}
+#ifdef HAVE_DLMOPEN
void *dlmopen(Lmid_t nsid, const char *filename, int flags)
{
void *handle;
@@ -243,6 +250,7 @@ void *dlmopen(Lmid_t nsid, const char *filename, int flags)
return handle;
}
+#endif
int dlclose(void *handle)
{
diff --git a/liblttng-ust-dl/ust_dl.h b/liblttng-ust-dl/ust_dl.h
index b8cfe82..afa8e84 100644
--- a/liblttng-ust-dl/ust_dl.h
+++ b/liblttng-ust-dl/ust_dl.h
@@ -51,6 +51,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
)
)
+#ifdef HAVE_DLMOPEN
TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
TP_ARGS(void *, ip, void *, baddr, Lmid_t, nsid,
const char *, path, int, flags,
@@ -66,6 +67,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
ctf_integer(uint8_t, has_debug_link, has_debug_link)
)
)
+#endif
TRACEPOINT_EVENT(lttng_ust_dl, build_id,
TP_ARGS(
--
2.7.4

View File

@@ -0,0 +1,30 @@
From 0b2253f5c9af73904d49da32085036c16b9d2d75 Mon Sep 17 00:00:00 2001
From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Tue, 21 Feb 2017 18:10:11 -0500
Subject: [PATCH] Fix: include config.h to resolve HAVE_DLMOPEN
Fixes commit 42330adcefcd1830dad89e2a960c93d8dd1da125
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
[Backported from upstream commit 0b2253f5c9af73904d49da32085036c16b9d2d75.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
liblttng-ust-dl/ust_dl.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/liblttng-ust-dl/ust_dl.h b/liblttng-ust-dl/ust_dl.h
index afa8e84..c8a0695 100644
--- a/liblttng-ust-dl/ust_dl.h
+++ b/liblttng-ust-dl/ust_dl.h
@@ -33,6 +33,7 @@ extern "C" {
#include <stdint.h>
#include <unistd.h>
+#include <config.h>
#define LTTNG_UST_DL_PROVIDER
#include <lttng/tracepoint.h>
--
2.7.4

View File

@@ -0,0 +1,21 @@
config BR2_PACKAGE_LTTNG_LIBUST
bool "lttng-libust"
select BR2_PACKAGE_LIBURCU
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
depends on BR2_USE_WCHAR # uses wchar_t
# liburcu only works on some architectures and requires threads support"
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_STATIC_LIBS
help
Userspace tracing library for the LTTng 2.x tracing
infrastructure. It allows userspace programs to create
custom trace events that are integrated with all other
events gathered by LTTng.
http://lttng.org
comment "lttng-libust needs a toolchain w/ dynamic library, wchar, threads"
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

View File

@@ -0,0 +1,3 @@
# From http://lttng.org/files/lttng-ust/lttng-ust-2.9.0.tar.bz2.{md5,sha1}
md5 77f3378ba37a36801420bce87b702e9c lttng-ust-2.9.0.tar.bz2
sha1 9937eae64540821b8597cce081e92be76e6b5568 lttng-ust-2.9.0.tar.bz2

View File

@@ -0,0 +1,30 @@
################################################################################
#
# lttng-libust
#
################################################################################
LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
LTTNG_LIBUST_VERSION = 2.9.0
LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
LTTNG_LIBUST_LICENSE = LGPLv2.1, MIT (system headers), GPLv2 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond)
LTTNG_LIBUST_LICENSE_FILES = COPYING
LTTNG_LIBUST_INSTALL_STAGING = YES
LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
LTTNG_LIBUST_CONF_OPTS += --disable-man-pages
# 0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch
# 0003-Validate-the-presence-of-dlmopen-at-configure-time.patch
LTTNG_LIBUST_AUTORECONF = YES
ifeq ($(BR2_PACKAGE_PYTHON),y)
LTTNG_LIBUST_DEPENDENCIES += python
LTTNG_LIBUST_CONF_OPTS += --enable-python-agent
else ifeq ($(BR2_PACKAGE_PYTHON3),y)
LTTNG_LIBUST_DEPENDENCIES += python3
LTTNG_LIBUST_CONF_OPTS += --enable-python-agent
else
LTTNG_LIBUST_CONF_ENV = am_cv_pathless_PYTHON="none"
LTTNG_LIBUST_CONF_OPTS += --disable-python-agent
endif
$(eval $(autotools-package))