summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/fluentbit
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-04-25 11:54:23 -0700
committerKhem Raj <raj.khem@gmail.com>2022-04-25 12:10:11 -0700
commitf9a935ac8e0129fa91279ec8bff9f8ced93734f2 (patch)
treedb517a6cda47f4235de66a218b1df214c5c723ff /meta-oe/recipes-extended/fluentbit
parentf0d0034e26934852a8d92176f87b4dfc4c7c2438 (diff)
downloadmeta-openembedded-f9a935ac8e0129fa91279ec8bff9f8ced93734f2.tar.gz
fluentbit: Disable systemd support when systemd distro feature is disabled
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/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch2
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch4
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb3
3 files changed, 5 insertions, 4 deletions
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch
index b90a62ef1..bf4cda08f 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch
@@ -24,5 +24,5 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
24+ install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system) 24+ install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system)
25+ endif() 25+ endif()
26 install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR}) 26 install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR})
27 elseif(IS_DIRECTORY /usr/share/upstart OR FLB_UPSTART) 27 elseif(FLB_UPSTART)
28 set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf") 28 set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch
index a18578999..d3822fc8d 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.kheem@gmail.com>
12 12
13 # Detect init system, install upstart, systemd or init.d script 13 # Detect init system, install upstart, systemd or init.d script
14- if(IS_DIRECTORY /lib/systemd/system) 14- if(IS_DIRECTORY /lib/systemd/system)
15+ if(IS_DIRECTORY /lib/systemd/system OR FLB_SYSTEMD) 15+ if(FLB_SYSTEMD)
16 set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service") 16 set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
17 configure_file( 17 configure_file(
18 "${PROJECT_SOURCE_DIR}/init/systemd.in" 18 "${PROJECT_SOURCE_DIR}/init/systemd.in"
@@ -21,7 +21,7 @@ Signed-off-by: Khem Raj <raj.kheem@gmail.com>
21 install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system) 21 install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system)
22 install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR}) 22 install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR})
23- elseif(IS_DIRECTORY /usr/share/upstart) 23- elseif(IS_DIRECTORY /usr/share/upstart)
24+ elseif(IS_DIRECTORY /usr/share/upstart OR FLB_UPSTART) 24+ elseif(FLB_UPSTART)
25 set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf") 25 set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
26 configure_file( 26 configure_file(
27 "${PROJECT_SOURCE_DIR}/init/upstart.in" 27 "${PROJECT_SOURCE_DIR}/init/upstart.in"
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb
index e586262a6..b231cc287 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb
@@ -48,7 +48,8 @@ EXTRA_OECMAKE += "-DFLB_LUAJIT=Off -DFLB_FILTER_LUA=Off "
48# Disable Library and examples 48# Disable Library and examples
49EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off -DFLB_EXAMPLES=Off " 49EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off -DFLB_EXAMPLES=Off "
50 50
51EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On -DSYSTEMD_DIR=${systemd_system_unitdir}','',d)}" 51# Enable systemd iff systemd is in DISTRO_FEATURES
52EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On -DSYSTEMD_DIR=${systemd_system_unitdir}','-DFLB_SYSTEMD=Off',d)}"
52 53
53EXTRA_OECMAKE:append:riscv64 = " -DFLB_DEPS='atomic'" 54EXTRA_OECMAKE:append:riscv64 = " -DFLB_DEPS='atomic'"
54EXTRA_OECMAKE:append:riscv32 = " -DFLB_DEPS='atomic'" 55EXTRA_OECMAKE:append:riscv32 = " -DFLB_DEPS='atomic'"