From 61e306ad71397bcde9c1cf291e5b1fe89dd2870a Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Fri, 10 May 2019 14:55:00 +0300 Subject: fluentbit: Upgrade 0.12.1 -> 0.12.19 Remove patch applied upstream. Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- ...0001-fluent-bit-shared-Link-with-lpthread.patch | 35 ---------------------- .../recipes-extended/fluentbit/fluentbit_0.12.1.bb | 30 ------------------- .../fluentbit/fluentbit_0.12.19.bb | 29 ++++++++++++++++++ 3 files changed, 29 insertions(+), 65 deletions(-) delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0001-fluent-bit-shared-Link-with-lpthread.patch delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-fluent-bit-shared-Link-with-lpthread.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-fluent-bit-shared-Link-with-lpthread.patch deleted file mode 100644 index e9eed24b32..0000000000 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-fluent-bit-shared-Link-with-lpthread.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 62fa9bceb15a9d160dd5d624a6d46907c1019c5c Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 ---- -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 - diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb deleted file mode 100644 index 99f680f9ab..0000000000 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb +++ /dev/null @@ -1,30 +0,0 @@ -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.12/fluent-bit-${PV}.tar.gz \ - file://jemalloc.patch \ - file://0001-fluent-bit-shared-Link-with-lpthread.patch \ - " -SRC_URI[md5sum] = "6b4472cb7e7213a01425af9121576827" -SRC_URI[sha256sum] = "8ec05365baea723033165687611b3bba3e67a77dce72e282e9f000f7acf9e37b" - -S = "${WORKDIR}/fluent-bit-${PV}" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" - -DEPENDS = "zlib" -INSANE_SKIP_${PN}-dev += "dev-elf" - -inherit cmake systemd - -EXTRA_OECMAKE = "-DGNU_HOST=${HOST_SYS} -DFLB_ALL=ON -DFLB_TD=1" - -# With Ninja it fails with: -# ninja: error: build.ninja:134: bad $-escape (literal $ must be written as $$) -OECMAKE_GENERATOR = "Unix Makefiles" - -SYSTEMD_SERVICE_${PN} = "td-agent-bit.service" - -TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb new file mode 100644 index 0000000000..e50aa71a9f --- /dev/null +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb @@ -0,0 +1,29 @@ +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.12/fluent-bit-${PV}.tar.gz \ + file://jemalloc.patch \ + " +SRC_URI[md5sum] = "7c8708312ac9122faacf9e2a4751eb34" +SRC_URI[sha256sum] = "23a81087edf0e2c6f2d49411c6a82308afc5224f67bbaa45729c057af62e9241" + +S = "${WORKDIR}/fluent-bit-${PV}" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +DEPENDS = "zlib" +INSANE_SKIP_${PN}-dev += "dev-elf" + +inherit cmake systemd + +EXTRA_OECMAKE = "-DGNU_HOST=${HOST_SYS} -DFLB_ALL=ON -DFLB_TD=1" + +# With Ninja it fails with: +# ninja: error: build.ninja:134: bad $-escape (literal $ must be written as $$) +OECMAKE_GENERATOR = "Unix Makefiles" + +SYSTEMD_SERVICE_${PN} = "td-agent-bit.service" + +TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" -- cgit 1.2.3-korg