summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/fluentbit
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-03-23 18:29:08 -0700
committerKhem Raj <raj.khem@gmail.com>2023-03-23 18:31:10 -0700
commit344092438f44853c392413e623e09725dce4b25b (patch)
treee55ee3cabba3851429747cd7806bc372f6e75cac /meta-oe/recipes-extended/fluentbit
parentea6112ae7738143a1aa8eb607e9afa9888632013 (diff)
downloadmeta-openembedded-344092438f44853c392413e623e09725dce4b25b.tar.gz
fluentbit: Disable upstart scripts
They are not cross compile friendly as they poke into build host directories to determine if system is upstart based and it can fail build on such hosts e.g. ubuntu If someone is still using upstart with OE then please fix it and send a better fix upstream to re-enable it here. Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/fluentbit')
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch46
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb1
2 files changed, 47 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch
new file mode 100644
index 0000000000..71bdd34eeb
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch
@@ -0,0 +1,46 @@
1From c41653e856d05ed430d22f8b311714ff756a0e0b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 23 Mar 2023 18:05:27 -0700
4Subject: [PATCH] cmake: Do not check for upstart on build host
5
6Some ubuntu distros might have this directory /usr/share/upstart around
7and yocto based distros not using systemd will process this piece of
8code and falsely assume that target supports upstart, which may not be
9true in case of cross-compilation.
10
11This also can end up in configure errors e.g.
12
13| CMake Error at src/CMakeLists.txt:496 (install):
14| install DIRECTORY given unknown argument "/etc/td-agent-bit/".
15|
16|
17| -- Configuring incomplete, errors occurred!
18
19Upstream-Status: Inappropriate [ Cross-compile Specific ]
20Signed-off-by: Khem Raj <raj.khem@gmail.com>
21---
22 src/CMakeLists.txt | 8 --------
23 1 file changed, 8 deletions(-)
24
25diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
26index bb30b2a..c63b6d8 100644
27--- a/src/CMakeLists.txt
28+++ b/src/CMakeLists.txt
29@@ -486,14 +486,6 @@ if(FLB_BINARY)
30 )
31 install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
32 install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
33- elseif(IS_DIRECTORY /usr/share/upstart)
34- set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
35- configure_file(
36- "${PROJECT_SOURCE_DIR}/init/upstart.in"
37- ${FLB_UPSTART_SCRIPT}
38- )
39- install(FILES ${FLB_UPSTART_SCRIPT} COMPONENT binary DESTINATION /etc/init)
40- install(DIRECTORY DESTINATION COMPONENT binary ${FLB_INSTALL_CONFDIR})
41 else()
42 # FIXME: should we support Sysv init script ?
43 endif()
44--
452.40.0
46
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb
index f626168421..26238e51f1 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb
@@ -22,6 +22,7 @@ SRC_URI = "https://releases.fluentbit.io/1.9/source-${PV}.tar.gz;subdir=fluent-b
22 file://0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch \ 22 file://0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch \
23 file://0005-stackdriver-Fix-return-type-mismatch.patch \ 23 file://0005-stackdriver-Fix-return-type-mismatch.patch \
24 file://0006-monkey-Fix-TLS-detection-testcase.patch \ 24 file://0006-monkey-Fix-TLS-detection-testcase.patch \
25 file://0007-cmake-Do-not-check-for-upstart-on-build-host.patch \
25 " 26 "
26SRC_URI:remove:x86 = "file://0002-mbedtls-Remove-unused-variable.patch" 27SRC_URI:remove:x86 = "file://0002-mbedtls-Remove-unused-variable.patch"
27SRC_URI:append:libc-musl = "\ 28SRC_URI:append:libc-musl = "\