Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Roque
slapos
Commits
a41296a7
Commit
a41296a7
authored
Sep 23, 2022
by
Ivan Tyagov
Browse files
Options
Browse Files
Download
Plain Diff
Update software/fluent-bit/software.cfg, software/fluent-bit/instance.cfg.in,...
See merge request
nexedi/slapos!1254
parents
bdc6e1a7
6f0e6986
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
75 additions
and
22 deletions
+75
-22
component/fluent-bit/0001-slapos-don-t-try-to-install-system-startup-script.patch
...1-slapos-don-t-try-to-install-system-startup-script.patch
+45
-0
component/fluent-bit/buildout.cfg
component/fluent-bit/buildout.cfg
+22
-0
software/fluent-bit/buildout.hash.cfg
software/fluent-bit/buildout.hash.cfg
+1
-1
software/fluent-bit/instance.cfg.in
software/fluent-bit/instance.cfg.in
+4
-4
software/fluent-bit/software.cfg
software/fluent-bit/software.cfg
+3
-17
No files found.
component/fluent-bit/0001-slapos-don-t-try-to-install-system-startup-script.patch
0 → 100644
View file @
a41296a7
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
0 → 100644
View file @
a41296a7
[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
View file @
a41296a7
[instance-profile]
[instance-profile]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
21ea6fe8ebb6b7baf7e26c0f4c13ebcd
md5sum =
6a32b81db4ea9f2f63b5a92e8a134d58
software/fluent-bit/instance.cfg.in
View file @
a41296a7
[buildout]
[buildout]
parts =
parts =
fluentbit-service
fluent
-
bit-service
eggs-directory = {{ buildout['eggs-directory'] }}
eggs-directory = {{ buildout['eggs-directory'] }}
develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
...
@@ -17,8 +17,8 @@ promise = ${:etc}/promise/
...
@@ -17,8 +17,8 @@ promise = ${:etc}/promise/
log = ${:var}/log
log = ${:var}/log
bin = ${:home}/bin
bin = ${:home}/bin
[fluentbit-service]
[fluent
-
bit-service]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
command-line = {{ fluent
bit_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
wrapper-path = ${directory:service}/fluentbit-service
output = $${:wrapper-path}
output = $${:wrapper-path}
software/fluent-bit/software.cfg
View file @
a41296a7
...
@@ -2,13 +2,11 @@
...
@@ -2,13 +2,11 @@
extends =
extends =
buildout.hash.cfg
buildout.hash.cfg
../../stack/slapos.cfg
../../stack/slapos.cfg
../../component/cmake/buildout.cfg
../../stack/monitor/buildout.cfg
../../component/bison/buildout.cfg
../../component/fluent-bit/buildout.cfg
../../component/flex/buildout.cfg
parts =
parts =
slapos-cookbook
slapos-cookbook
fluent-bit
instance-profile
instance-profile
[instance-profile]
[instance-profile]
...
@@ -17,16 +15,4 @@ template = ${:_profile_base_location_}/instance.cfg.in
...
@@ -17,16 +15,4 @@ template = ${:_profile_base_location_}/instance.cfg.in
rendered = ${buildout:directory}/instance.cfg
rendered = ${buildout:directory}/instance.cfg
context =
context =
section buildout buildout
section buildout buildout
key fluentbit_source_location fluent-bit:location
key fluent_bit_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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment