fluentbitwip

component/fluent-bit/buildout.cfg

@@ -6,24 +6,57 @@ extends =
   ../libyaml/buildout.cfg
   ../openssl/buildout.cfg
   ../patch/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../systemd/buildout.cfg
   ../zlib/buildout.cfg
 
+# Checking for module 'libsasl2'
+#2024-06-25 00:59:56 slapos[84164] INFO     Libs:
+#2024-06-25 00:59:56 slapos[84164] INFO       OpenSSL:         (LIBS='')
+#2024-06-25 00:59:56 slapos[84164] INFO       Libxml2:        FALSE (LIBS='')
+#2024-06-25 00:59:56 slapos[84164] INFO       Libev:          FALSE (LIBS='')
+#2024-06-25 00:59:56 slapos[84164] INFO       Libc-ares:      FALSE (LIBS='')
+#2024-06-25 00:59:56 slapos[84164] INFO       Libngtcp2:       (LIBS='')
+#2024-06-25 00:59:56 slapos[84164] INFO       Libngtcp2_crypto_quictls:  (LIBS='')
+#2024-06-25 00:59:56 slapos[84164] INFO       Libnghttp3:      (LIBS='')
+#2024-06-25 00:59:56 slapos[84164] INFO       Libbpf:          (LIBS='')
+#2024-06-25 00:59:56 slapos[84164] INFO       Libevent(SSL):  FALSE (LIBS='')
+#2024-06-25 00:59:56 slapos[84164] INFO       Jansson:        FALSE (LIBS='')
+#2024-06-25 00:59:56 slapos[84164] INFO       Jemalloc:       FALSE (LIBS='')
+#2024-06-25 00:59:56 slapos[84164] INFO       Zlib:           FALSE (LIBS='')
+#2024-06-25 00:59:56 slapos[84164] INFO       Systemd:        TRUE (LIBS='/srv/slapgrid/slappart15/srv/runner/instance/slappart7/tmp/shared/systemd/309aa3618798909cb800f83525aea0db/lib')
+
 [fluent-bit]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/fluent/fluent-bit/archive/refs/tags/v2.1.10.tar.gz
-md5sum = 1608fdb463f19d3add5e9f17e2eb1f7d
+url = https://github.com/fluent/fluent-bit/archive/refs/tags/v3.0.7.tar.gz
+md5sum = 4cd0ad6cd87f4f1fbcfe0a1ff6d160d1
 configure-command =
   ${cmake:location}/bin/cmake
 configure-options =
+  --trace
   -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
   -DFLB_LIBYAML_DIR=${libyaml:location}
   -DOPENSSL_ROOT_DIR=${openssl:location}
+  -DZLIB_INCLUDE_DIR=${zlib:location}/include
   -DZLIB_LIBRARY=${zlib:location}/lib/libz.so
+#  -DSYSTEMD_INCLUDE_DIRS=${systemd:location}/include
+#  -DSYSTEMD_LIBRARIES=${systemd:location}/lib
+#  -DJOURNALD_INCLUDE_DIR=${systemd:location}/include
+#  -DJOURNALD_INCLUDEDIR=${systemd:location}/include
+#  -DJOURNALD_INCLUDEDIRS=${systemd:location}/include
+  -DJOURNALD_INCLUDE_DIRS=${systemd:location}/include
+  -DJOURNALD_LIBRARY=${systemd:location}/lib
+#make-options = VERBOSE=1
 environment =
-  PATH=${bison:location}/bin:${flex:location}/bin:%(PATH)s
-  LDFLAGS=-Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib
+  PATH=${pkgconfig:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
+  CFLAGS=-I${systemd:location}/include
+  LDFLAGS=-Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${systemd:location}/lib
+  PKG_CONFIG_PATH=${systemd:location}/share/pkgconfig/:${zlib:location}/lib/pkgconfig/
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/0001-slapos-don-t-try-to-install-system-startup-script.patch#7bf6e1b53c371db918dcc3778c6b28ed
 patch-binary = ${patch:location}/bin/patch
+
+[fluent-bit]
+shared = false

component/systemd/buildout.cfg

@@ -47,6 +47,10 @@ install =
   python = os.path.join(location, 'bin', 'python')
   call([python, '-c', 'import jinja2'])
 
+[systemd-python:python2]
+recipe =
+location =
+
 [systemd]
 recipe = slapos.recipe.build
 shared = true