Commit b7e32ef6 authored by Jérome Perrin's avatar Jérome Perrin

component/fluent-bit: version up 2.1.10

parent 03719df1
From 90950c10cf6bfcba777a5b22cdcd3b54b4043d35 Mon Sep 17 00:00:00 2001 From 2a3dd1d84cf45bb78f1b42deab5a8386932c0802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Tue, 20 Sep 2022 23:10:16 +0900 Date: Sun, 15 Oct 2023 09:39:33 +0900
Subject: [PATCH] slapos: don't try to install system startup script Subject: [PATCH] slapos: don't try to install system startup script
in slapos context we don't write to system directories when installing in slapos context we don't write to system directories when installing
packages packages
--- ---
src/CMakeLists.txt | 21 --------------------- src/CMakeLists.txt | 27 ---------------------------
1 file changed, 21 deletions(-) 1 file changed, 27 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 630f875bf..388c72ab1 100644 index b6233d9f7..9b3d395ba 100644
--- a/src/CMakeLists.txt --- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -477,27 +477,6 @@ if(FLB_BINARY) @@ -515,33 +515,6 @@ if(FLB_BINARY)
DESTINATION "${FLB_INSTALL_BINDIR}") DESTINATION "${FLB_INSTALL_BINDIR}")
endif() endif()
- # Detect init system, install upstart, systemd or init.d script - # Detect init system, install upstart, systemd or init.d script
- if(IS_DIRECTORY /lib/systemd/system) -
- # Handle issues with detection on some systems during build
- if(NOT SYSTEMD_UNITDIR AND IS_DIRECTORY /lib/systemd/system)
- set(SYSTEMD_UNITDIR /lib/systemd/system)
- endif()
-
- if(SYSTEMD_UNITDIR)
- set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service") - set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
- configure_file( - configure_file(
- "${PROJECT_SOURCE_DIR}/init/systemd.in" - "${PROJECT_SOURCE_DIR}/init/systemd.in"
- ${FLB_SYSTEMD_SCRIPT} - ${FLB_SYSTEMD_SCRIPT}
- ) - )
- install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION /lib/systemd/system) - install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
- install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary) - install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
- elseif(IS_DIRECTORY /usr/share/upstart) - elseif(IS_DIRECTORY /usr/share/upstart)
- set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf") - set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
...@@ -42,4 +48,5 @@ index 630f875bf..388c72ab1 100644 ...@@ -42,4 +48,5 @@ index 630f875bf..388c72ab1 100644
install(FILES install(FILES
"${PROJECT_SOURCE_DIR}/conf/fluent-bit-win32.conf" "${PROJECT_SOURCE_DIR}/conf/fluent-bit-win32.conf"
-- --
2.37.0 2.40.1
[buildout] [buildout]
extends = extends =
../cmake/buildout.cfg
../bison/buildout.cfg ../bison/buildout.cfg
../cmake/buildout.cfg
../flex/buildout.cfg ../flex/buildout.cfg
../libyaml/buildout.cfg
../openssl/buildout.cfg
../patch/buildout.cfg ../patch/buildout.cfg
[fluent-bit] [fluent-bit]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://github.com/fluent/fluent-bit/archive/refs/tags/v1.9.8.tar.gz shared = true
md5sum = a0973b739f1d1f0daaa503b077760cd7 url = https://github.com/fluent/fluent-bit/archive/refs/tags/v2.1.10.tar.gz
md5sum = 1608fdb463f19d3add5e9f17e2eb1f7d
configure-command = configure-command =
${cmake:location}/bin/cmake ${cmake:location}/bin/cmake
configure-options = configure-options =
-DFLB_CONFIG_YAML=Off .
-DCMAKE_INSTALL_PREFIX=@@LOCATION@@ -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
-DFLB_LIBYAML_DIR=${libyaml:location}
-DOPENSSL_ROOT_DIR=${openssl:location}
environment = environment =
PATH=${bison:location}/bin:${flex:location}/bin:%(PATH)s PATH=${bison:location}/bin:${flex:location}/bin:%(PATH)s
LDFLAGS=-Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${openssl:location}/lib
patch-options = -p1 patch-options = -p1
patches = patches =
${:_profile_base_location_}/0001-slapos-don-t-try-to-install-system-startup-script.patch#c071d1aefe0adbc6c96bbdf92d9dbb29 ${:_profile_base_location_}/0001-slapos-don-t-try-to-install-system-startup-script.patch#7bf6e1b53c371db918dcc3778c6b28ed
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment