diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-04-23 08:35:11 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-04-25 10:44:09 -0700 |
| commit | ae8e0ae77f74d966d687fef38bc1bccc76268f8f (patch) | |
| tree | df869bcd22110e543f014ddc87ca83c5c4a25a70 /meta-oe/recipes-extended | |
| parent | 2b643dcefe8ae4ef0cd3066bd31bae41e322b84c (diff) | |
| download | meta-openembedded-contrib-ae8e0ae77f74d966d687fef38bc1bccc76268f8f.tar.gz | |
fluentbit: Fix build with usrmerge distro feature
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
| -rw-r--r-- | meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch | 28 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb | 3 |
2 files changed, 30 insertions, 1 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 new file mode 100644 index 0000000000..b90a62ef19 --- /dev/null +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch @@ -0,0 +1,28 @@ +From 5571f949fa2048b79c197b5b10a11ecb1891cbe9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 23 Apr 2022 08:24:34 -0700 +Subject: [PATCH] Control sytemd unit install location with SYSTEM_DIR + +This helps building when usrmerge is on + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -323,7 +323,11 @@ if(FLB_BINARY) + "${PROJECT_SOURCE_DIR}/init/systemd.in" + ${FLB_SYSTEMD_SCRIPT} + ) +- install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system) ++ if(SYSTEMD_DIR) ++ install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION ${SYSTEMD_DIR}) ++ else() ++ install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system) ++ endif() + install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR}) + elseif(IS_DIRECTORY /usr/share/upstart OR FLB_UPSTART) + set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf") 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 670d596cad..e586262a60 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb @@ -18,6 +18,7 @@ SRC_URI = "http://fluentbit.io/releases/1.3/fluent-bit-${PV}.tar.gz \ file://0001-ppc-Fix-signature-for-co_create-API.patch \ file://0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch \ file://0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch \ + file://0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch \ " SRC_URI[md5sum] = "6eae6dfd0a874e5dd270c36e9c68f747" SRC_URI[sha256sum] = "e037c76c89269c8dc4027a08e442fefd2751b0f1e0f9c38f9a4b12d781a9c789" @@ -47,7 +48,7 @@ EXTRA_OECMAKE += "-DFLB_LUAJIT=Off -DFLB_FILTER_LUA=Off " # Disable Library and examples EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off -DFLB_EXAMPLES=Off " -EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On','',d)}" +EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On -DSYSTEMD_DIR=${systemd_system_unitdir}','',d)}" EXTRA_OECMAKE:append:riscv64 = " -DFLB_DEPS='atomic'" EXTRA_OECMAKE:append:riscv32 = " -DFLB_DEPS='atomic'" |