Update software/fluent-bit/software.cfg, software/fluent-bit/instance.cfg.in,...

See merge request nexedi/slapos!1254

component/fluent-bit/0001-slapos-don-t-try-to-install-system-startup-script.patch

+From 90950c10cf6bfcba777a5b22cdcd3b54b4043d35 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
+Date: Tue, 20 Sep 2022 23:10:16 +0900
+Subject: [PATCH] slapos: don't try to install system startup script
+
+in slapos context we don't write to system directories when installing
+packages
+---
+ src/CMakeLists.txt | 21 ---------------------
+ 1 file changed, 21 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 630f875bf..388c72ab1 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -477,27 +477,6 @@ if(FLB_BINARY)
+       DESTINATION "${FLB_INSTALL_BINDIR}")
+   endif()
+ 
+-  # Detect init system, install upstart, systemd or init.d script
+-  if(IS_DIRECTORY /lib/systemd/system)
+-    set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
+-    configure_file(
+-      "${PROJECT_SOURCE_DIR}/init/systemd.in"
+-      ${FLB_SYSTEMD_SCRIPT}
+-      )
+-    install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION /lib/systemd/system)
+-    install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
+-  elseif(IS_DIRECTORY /usr/share/upstart)
+-    set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
+-    configure_file(
+-      "${PROJECT_SOURCE_DIR}/init/upstart.in"
+-      ${FLB_UPSTART_SCRIPT}
+-      )
+-    install(FILES ${FLB_UPSTART_SCRIPT} COMPONENT binary DESTINATION /etc/init)
+-    install(DIRECTORY DESTINATION COMPONENT binary ${FLB_INSTALL_CONFDIR})
+-  else()
+-    # FIXME: should we support Sysv init script ?
+-  endif()
+-
+   if(FLB_SYSTEM_WINDOWS)
+     install(FILES
+       "${PROJECT_SOURCE_DIR}/conf/fluent-bit-win32.conf"
+-- 
+2.37.0

component/fluent-bit/buildout.cfg

+[buildout]
+extends =
+  ../cmake/buildout.cfg
+  ../bison/buildout.cfg
+  ../flex/buildout.cfg
+  ../patch/buildout.cfg
+  
+[fluent-bit]
+recipe = slapos.recipe.cmmi
+url = https://github.com/fluent/fluent-bit/archive/refs/tags/v1.9.8.tar.gz
+md5sum = a0973b739f1d1f0daaa503b077760cd7
+configure-command = 
+  ${cmake:location}/bin/cmake
+configure-options = 
+  -DFLB_CONFIG_YAML=Off .
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+environment =
+  PATH=${bison:location}/bin:${flex:location}/bin:%(PATH)s
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/0001-slapos-don-t-try-to-install-system-startup-script.patch#c071d1aefe0adbc6c96bbdf92d9dbb29
+patch-binary = ${patch:location}/bin/patch

software/fluent-bit/buildout.hash.cfg

 [instance-profile]
 filename = instance.cfg.in
-md5sum = 21ea6fe8ebb6b7baf7e26c0f4c13ebcd
+md5sum = 6a32b81db4ea9f2f63b5a92e8a134d58

software/fluent-bit/instance.cfg.in

 [buildout]
 parts =
-  fluentbit-service
+  fluent-bit-service
   
 eggs-directory = {{ buildout['eggs-directory'] }}
 develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
@@ -17,8 +17,8 @@ promise = ${:etc}/promise/
 log = ${:var}/log
 bin = ${:home}/bin
 
-[fluentbit-service]
+[fluent-bit-service]
 recipe  = slapos.cookbook:wrapper
-command-line = {{ fluentbit_source_location }}/build/bin/fluent-bit -i cpu -o stdout
+command-line = {{ fluent_bit_location }}/bin/fluent-bit -i cpu -o stdout
 wrapper-path = ${directory:service}/fluentbit-service
 output = $${:wrapper-path}

software/fluent-bit/software.cfg

@@ -2,13 +2,11 @@
 extends =
   buildout.hash.cfg
   ../../stack/slapos.cfg
-  ../../component/cmake/buildout.cfg
-  ../../component/bison/buildout.cfg
-  ../../component/flex/buildout.cfg
+  ../../stack/monitor/buildout.cfg
+  ../../component/fluent-bit/buildout.cfg
 
 parts =
   slapos-cookbook
-  fluent-bit
   instance-profile
 
 [instance-profile]
@@ -17,16 +15,4 @@ template = ${:_profile_base_location_}/instance.cfg.in
 rendered = ${buildout:directory}/instance.cfg
 context =
   section buildout buildout
-  key fluentbit_source_location fluent-bit:location
-
-[fluent-bit]
-recipe = slapos.recipe.cmmi
-url = https://github.com/fluent/fluent-bit/archive/refs/tags/v1.9.7.tar.gz
-environment =
-  PATH=${bison:location}/bin:${flex:location}/bin:${fluent-bit:location}:%(PATH)s
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-configure-command =
-  cd build && ${cmake:location}/bin/cmake .. -DFLB_CONFIG_YAML=Off .
-make-targets =
-make-binary =
-  cd build && make
+  key fluent_bit_location fluent-bit:location