mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 14:59:55 +00:00
fluentbit: Upgrade to 0.12.1
Drop upstreamed patches Fix jemalloc build with musl Fix linking errors due to missing -lpthread Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
Martin Jansa
-24
@@ -1,24 +0,0 @@
|
||||
From 84d70b6bc744cd348e66a0bc6c7958cdfa9ce670 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 29 Jun 2017 12:56:21 -0700
|
||||
Subject: [PATCH] flb-plugin-proxy-go: Add missing dependency on jemalloc
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/proxy/go/CMakeLists.txt | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/proxy/go/CMakeLists.txt b/src/proxy/go/CMakeLists.txt
|
||||
index 3273346..02a54c2 100644
|
||||
--- a/src/proxy/go/CMakeLists.txt
|
||||
+++ b/src/proxy/go/CMakeLists.txt
|
||||
@@ -2,3 +2,6 @@ set(src
|
||||
go.c)
|
||||
|
||||
add_library(flb-plugin-proxy-go STATIC ${src})
|
||||
+if(FLB_JEMALLOC)
|
||||
+ target_link_libraries(flb-plugin-proxy-go libjemalloc)
|
||||
+endif()
|
||||
--
|
||||
2.13.2
|
||||
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
From 62fa9bceb15a9d160dd5d624a6d46907c1019c5c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 8 Sep 2017 17:02:55 -0700
|
||||
Subject: [PATCH] fluent-bit-shared: Link with -lpthread
|
||||
|
||||
This fixes a reference to pthread_atfork in libfluent-bit.so
|
||||
otherwise we get undefined reference to the symbols in binaries
|
||||
which are linked with libfluent-bit.so
|
||||
|
||||
Fixes errors like
|
||||
arm-bec-linux-gnueabi-ld: ../../bin/hello_world: hidden symbol `pthread_atfork' in /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/fluentbit/0.12.1-r0/recipe-sysroot/usr/lib/libpthread_nonshared.a(pthread_atfork.oS) is referenced by DSO
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
Upstream-Status: Submitted
|
||||
|
||||
src/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 425a246..1264e59 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -168,7 +168,7 @@ set(FLB_DEPS
|
||||
# Shared Library
|
||||
if(NOT FLB_WITHOUT_SHARED_LIB)
|
||||
add_library(fluent-bit-shared SHARED ${src})
|
||||
- target_link_libraries(fluent-bit-shared ${FLB_DEPS})
|
||||
+ target_link_libraries(fluent-bit-shared ${FLB_DEPS} -lpthread)
|
||||
set_target_properties(fluent-bit-shared
|
||||
PROPERTIES OUTPUT_NAME fluent-bit)
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
||||
-28
@@ -1,28 +0,0 @@
|
||||
From d95c2977da074be0d3913e94fb8fb5ed1c64404a Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 22 Apr 2017 10:04:03 -0700
|
||||
Subject: [PATCH 2/2] msgpack: Add comment for intended fallthrough
|
||||
|
||||
Helps fixing build with gcc7
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h b/lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h
|
||||
index a6dae6f..651e6c2 100644
|
||||
--- a/lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h
|
||||
+++ b/lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h
|
||||
@@ -248,7 +248,7 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c
|
||||
|
||||
_fixed_trail_again:
|
||||
++p;
|
||||
-
|
||||
+ // fallthrough
|
||||
default:
|
||||
if((size_t)(pe - p) < trail) { goto _out; }
|
||||
n = p; p += trail - 1;
|
||||
--
|
||||
2.12.2
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
Add --with-jemalloc-prefix=je_ so it compiles on musl
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Upstream-Status: Pending
|
||||
|
||||
Index: fluent-bit-0.12.1/CMakeLists.txt
|
||||
===================================================================
|
||||
--- fluent-bit-0.12.1.orig/CMakeLists.txt
|
||||
+++ fluent-bit-0.12.1/CMakeLists.txt
|
||||
@@ -325,7 +325,7 @@ if(FLB_JEMALLOC AND ${CMAKE_SYSTEM_NAME}
|
||||
# Link to Jemalloc as an external dependency
|
||||
ExternalProject_Add(jemalloc
|
||||
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc
|
||||
- CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR>
|
||||
+ CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure --with-jemalloc-prefix=je_ ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR>
|
||||
CFLAGS=-std=gnu99\ -Wall\ -pipe\ -g3\ -O3\ -funroll-loops
|
||||
BUILD_COMMAND ${MAKE}
|
||||
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/
|
||||
+5
-5
@@ -2,12 +2,12 @@ SUMMARY = "Fast data collector for Embedded Linux"
|
||||
HOMEPAGE = "http://fluentbit.io"
|
||||
BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
|
||||
|
||||
SRC_URI = "http://fluentbit.io/releases/0.11/fluent-bit-${PV}.tar.gz \
|
||||
file://0001-flb-plugin-proxy-go-Add-missing-dependency-on-jemall.patch \
|
||||
file://0002-msgpack-Add-comment-for-intended-fallthrough.patch \
|
||||
SRC_URI = "http://fluentbit.io/releases/0.12/fluent-bit-${PV}.tar.gz \
|
||||
file://jemalloc.patch \
|
||||
file://0001-fluent-bit-shared-Link-with-lpthread.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "7bce8091c41fb6412b7fe0185b3cb8d6"
|
||||
SRC_URI[sha256sum] = "93b1bdd14db20f2823cd31c6f1a2f3fcb7c94ec3e0c8daefabf130310b7fc4ed"
|
||||
SRC_URI[md5sum] = "6b4472cb7e7213a01425af9121576827"
|
||||
SRC_URI[sha256sum] = "8ec05365baea723033165687611b3bba3e67a77dce72e282e9f000f7acf9e37b"
|
||||
|
||||
S = "${WORKDIR}/fluent-bit-${PV}"
|
||||
|
||||
Reference in New Issue
Block a user