rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to version 2017-02

Browse Source 
TG-3 #closed
This commit is contained in:
jbnadal
2017-03-28 18:29:16 +02:00
parent 93b7fd91d2
commit 42c92a6bcb
3010 changed files with 41289 additions and 46428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
bsp/buildroot/package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch
View File

@@ -1,37 +0,0 @@
Do not call posix_fallocate() on uClibc
uClibc does not implement posix_fallocate(), and posix_fallocate() is
mostly only an hint to the kernel that we will need such or such
amount of space inside a file. So we just don't call posix_fallocate()
when building against uClibc.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[Peter: add #include <features.h>
---
formats/ctf/ctf.c | 3 +++
1 file changed, 3 insertions(+)
Index: lttng-babeltrace-0.8/formats/ctf/ctf.c
===================================================================
--- lttng-babeltrace-0.8.orig/formats/ctf/ctf.c
+++ lttng-babeltrace-0.8/formats/ctf/ctf.c
@@ -32,6 +32,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <dirent.h>
+#include <features.h>
#include <glib.h>
#include <unistd.h>
#include <stdlib.h>
@@ -384,9 +385,11 @@
}
pos->content_size = -1U; /* Unknown at this point */
pos->packet_size = WRITE_PACKET_LEN;
+#ifndef __UCLIBC__
off = posix_fallocate(pos->fd, pos->mmap_offset,
pos->packet_size / CHAR_BIT);
assert(off >= 0);
+#endif
pos->offset = 0;
} else {
read_next_packet:

36
bsp/buildroot/package/lttng-babeltrace/0001-tests-lib-Makefile.am-remove-unneeded-static-flag.patch Normal file
View File

@@ -0,0 +1,36 @@
From 27e37d2621317d25e08ba0683bf8540b05b9347d Mon Sep 17 00:00:00 2001
From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Fri, 28 Oct 2016 02:09:20 -0400
Subject: [PATCH] tests/lib/Makefile.am: remove unneeded -static flag
Having those -static flags breaks the build in shared-only builds.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
[Philippe: grabbed from this pull request:
https://github.com/efficios/babeltrace/pull/49
]
---
tests/lib/Makefile.am | 2 --
1 file changed, 2 deletions(-)
diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 33ada16..c685e77 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -31,13 +31,11 @@ check_SCRIPTS = test_seek_big_trace \
test_ctf_writer_complete
if ENABLE_DEBUG_INFO
-test_dwarf_LDFLAGS = -static
test_dwarf_LDADD = $(LIBTAP) \
$(top_builddir)/lib/libbabeltrace.la \
$(top_builddir)/lib/libdebug-info.la
test_dwarf_SOURCES = test_dwarf.c
-test_bin_info_LDFLAGS = -static
test_bin_info_LDADD = $(LIBTAP) \
$(top_builddir)/lib/libbabeltrace.la \
$(top_builddir)/lib/libdebug-info.la
--
2.9.3

63
bsp/buildroot/package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch
View File

@@ -1,63 +0,0 @@
From 670d0961a823df0db28f39a354430f3dc2519418 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sat, 28 May 2016 12:53:33 +0200
Subject: [PATCH] configure: fix uuid support detection on static build
This change adds uuid support detection using pkg-config, before falling
back on default AC_CHECK_LIB calls.
Using flags from pkg-config is useful for static build, because they
also include dependency flags; whereas
AC_CHECK_LIB function achieves its test by trying to link against the
requested library, without taking care of its dependency
requirements/flags. Therefore, in case of static build, it can fail on
the uuid detection like [1], because the uuid's dependency flags
(regarding gettext) are missing.
Instead, using pkg-config to do the check will take care of getting and
setting all required flags.
This change adds uuid detection using pkg-config helper before falling
back on the standard AC_CHECK_LIB detection for platforms missing
pkg-config.
This issue [1] has been triggered on Buildroot farms.
[1] http://autobuild.buildroot.net/results/43b/43b98ddf9eb44152ed9ac4a98d887af14831d8da/build-end.log
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
configure.ac | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/configure.ac b/configure.ac
index 632fe39..b344fa8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,6 +65,15 @@ esac
AM_CONDITIONAL([BABELTRACE_BUILD_WITH_MINGW], [test "x$MINGW32" = "xyes"])
# Check for libuuid
+PKG_CHECK_MODULES([UUID], [uuid],
+[
+ LIBS="${UUID_LIBS} ${LIBS}"
+ CFLAGS="${CFLAGS} ${UUID_CFLAGS}"
+ AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.])
+ have_libuuid=yes
+],
+[
+# try detecting libuuid without pkg-config
AC_CHECK_LIB([uuid], [uuid_generate],
[
AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.])
@@ -83,6 +92,7 @@ AC_CHECK_LIB([uuid], [uuid_generate],
AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.])
fi
])
+])
]
)
AM_CONDITIONAL([BABELTRACE_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"])
--
2.8.3

77
bsp/buildroot/package/lttng-babeltrace/0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch Normal file
View File

@@ -0,0 +1,77 @@
From 697ab0905c59561562dc52cd3b925781e07814f3 Mon Sep 17 00:00:00 2001
From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Wed, 2 Nov 2016 01:40:12 -0400
Subject: [PATCH] m4/ax_lib_elfutils.m4: add cache variable
This patch adds an autoconf cache variable to override the
AC_RUN_IFELSE() test result when cross-compiling.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
[Philippe: grabbed from this pull request:
https://github.com/efficios/babeltrace/pull/52
]
---
m4/ax_lib_elfutils.m4 | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/m4/ax_lib_elfutils.m4 b/m4/ax_lib_elfutils.m4
index fcfe06b..f4fcb0d 100644
--- a/m4/ax_lib_elfutils.m4
+++ b/m4/ax_lib_elfutils.m4
@@ -21,7 +21,9 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
# Check the currently installed version of elfutils by using the
-# _ELFUTILS_PREREQ macro defined in elfutils/version.h.
+# `_ELFUTILS_PREREQ` macro defined in <elfutils/version.h>.
+#
+# The cache variable for this test is `bt_cv_lib_elfutils`.
#
# AX_LIB_ELFUTILS(MAJOR_VERSION, MINOR_VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
# ---------------------------------------------------------------------------
@@ -29,7 +31,6 @@ AC_DEFUN([AX_LIB_ELFUTILS], [
m4_pushdef([major_version], [$1])
m4_pushdef([minor_version], [$2])
- AC_MSG_CHECKING([for elfutils version >= major_version.minor_version])
m4_if([$#], 3, [
m4_pushdef([true_action], [$3])
], [
@@ -43,20 +44,21 @@ AC_DEFUN([AX_LIB_ELFUTILS], [
AC_MSG_ERROR(elfutils >= major_version.minor_version is required)])
])
- AC_RUN_IFELSE([
- AC_LANG_SOURCE([
- #include <stdlib.h>
- #include <elfutils/version.h>
+ AC_CACHE_CHECK(
+ [for elfutils version >= major_version.minor_version],
+ [bt_cv_lib_elfutils], [
+ AC_RUN_IFELSE([AC_LANG_SOURCE([
+ #include <stdlib.h>
+ #include <elfutils/version.h>
+
+ int main(void) {
+ return _ELFUTILS_PREREQ(major_version, minor_version) ? EXIT_SUCCESS : EXIT_FAILURE;
+ }
+ ])], [bt_cv_lib_elfutils=yes], [bt_cv_lib_elfutils=no])
+ ]
+ )
- int main(void) {
- return _ELFUTILS_PREREQ(major_version, minor_version) ? EXIT_SUCCESS : EXIT_FAILURE;
- }
- ])
- ],
- echo yes
- true_action,
- echo no
- false_action)
+ AS_IF([test "x$bt_cv_lib_elfutils" = "xyes"], [true_action], [false_action])
m4_popdef([false_action])
m4_popdef([true_action])
--
2.9.3

17
bsp/buildroot/package/lttng-babeltrace/Config.in
View File

@@ -4,7 +4,7 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_POPT
depends on BR2_USE_WCHAR # libglib2, util-linux
depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_USE_MMU # libglib2
help
@@ -14,18 +14,21 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
to/from another trace format.
Babeltrace is the reference implementation of the Common
Trace Format (see <http://diamon.org/docs/ctf/>). Babeltrace
Trace Format (see <http://diamon.org/ctf/>). Babeltrace
can decode and display LTTng traces, since the latter are
written using the CTF format.
To get support for debugging information, enable the
elfutils package.
Having this tool on the target is not mandatory. You can
transfer the binary trace output from the target to your
development workstation, and use babeltrace here. Buildroot
automatically builds a host babeltrace in
$(O)/host/usr/bin/babeltrace as a dependency of the
lttng-tools package.
development workstation, and use babeltrace here.
http://www.efficios.com/babeltrace
See the lttng-babeltrace host utility to install Babeltrace
on the host.
http://diamon.org/babeltrace
comment "lttng-babeltrace needs a toolchain w/ wchar, threads"
depends on BR2_USE_MMU

14
bsp/buildroot/package/lttng-babeltrace/Config.in.host Normal file
View File

@@ -0,0 +1,14 @@
config BR2_PACKAGE_HOST_LTTNG_BABELTRACE
bool "host lttng-babeltrace"
help
The Babeltrace project provides trace read and write
libraries, as well as a trace converter application. Plugins
can be created for any trace format to allow its conversion
to/from another trace format.
Babeltrace is the reference implementation of the Common
Trace Format (see <http://diamon.org/ctf/>). Babeltrace
can decode and display LTTng traces, since the latter are
written using the CTF format.
http://diamon.org/babeltrace

10
bsp/buildroot/package/lttng-babeltrace/lttng-babeltrace.hash
View File

@@ -1,7 +1,3 @@
# From http://lttng.org/files/babeltrace/babeltrace-1.2.4.tar.bz2.md5
md5 20a806fa7570e69a91707855a98f3ca6 babeltrace-1.2.4.tar.bz2
# From http://lttng.org/files/babeltrace/babeltrace-1.2.4.tar.bz2.sha1
sha1 c72a80e8fd905cb1ae3b0cf88885517faafe0fa1 babeltrace-1.2.4.tar.bz2
# Locally generated
sha256 666e3a1ad2dc7d5703059963056e7800f0eab59c8eeb6be2efe4f3acc5209eb1 babeltrace-1.2.4.tar.bz2
# From http://www.efficios.com/files/babeltrace/babeltrace-1.5.1.tar.bz2.{md5,sha1}
md5 3f7d29ba2821a966d24759a928a15cdf babeltrace-1.5.1.tar.bz2
sha1 07bffefed8ef68317f26e043ae5f71be58fdb783 babeltrace-1.5.1.tar.bz2

21
bsp/buildroot/package/lttng-babeltrace/lttng-babeltrace.mk
View File

@@ -4,18 +4,29 @@
#
################################################################################
LTTNG_BABELTRACE_SITE = http://lttng.org/files/babeltrace
LTTNG_BABELTRACE_VERSION = 1.2.4
LTTNG_BABELTRACE_SITE = http://www.efficios.com/files/babeltrace
LTTNG_BABELTRACE_VERSION = 1.5.1
LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPLv2 (test code)
LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE
LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf
# The host-elfutils dependency is optional, but since we don't have
# options for host packages, just build support for it
# unconditionally.
HOST_LTTNG_BABELTRACE_DEPENDENCIES = \
host-popt host-util-linux host-libglib2 host-pkgconf
host-popt host-util-linux host-libglib2 host-pkgconf host-elfutils
HOST_LTTNG_BABELTRACE_CONF_OPTS += --enable-debug-info
# for 0002-configure-fix-uuid-support-detection-on-static-build.patch
# For: 0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch
LTTNG_BABELTRACE_AUTORECONF = YES
ifeq ($(BR2_PACKAGE_ELFUTILS),y)
LTTNG_BABELTRACE_DEPENDENCIES += elfutils
LTTNG_BABELTRACE_CONF_OPTS += --enable-debug-info
LTTNG_BABELTRACE_CONF_ENV += bt_cv_lib_elfutils=yes
else
LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info
endif
$(eval $(autotools-package))
$(eval $(host-autotools-package))