Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
initramfs-with-mca
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
initramfs-with-mca
Commits
e8ca9219
Commit
e8ca9219
authored
Nov 21, 2022
by
Ophélie Gagnard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add separate package for fluent-bit plugin.
parent
9a3aaf42
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
9 deletions
+12
-9
dracut.module/Makefile.in
dracut.module/Makefile.in
+4
-2
dracut.module/configure
dracut.module/configure
+3
-2
generation/00env.sh
generation/00env.sh
+5
-5
No files found.
dracut.module/Makefile.in
View file @
e8ca9219
ifneq
($(MCA_PATH),)
$(info
MCA_PATH
=
$(MCA_PATH)
)
$(info
FLB_PATH
=
$(FLB_PATH)
)
$(info
PLG_PATH
=
$(PLG_PATH)
)
endif
MCA_PATH
?=
%MCA_PATH%
FLB_PATH
?=
%FLB_PATH%
PLG_PATH
?=
%PLG_PATH%
DRACUT_MODULE_NAME
=
90metadata-collect
LOCAL_DRACUT_MODULE
=
$(DRACUT_MODULE_NAME)
...
...
@@ -20,10 +22,10 @@ all: 90metadata-collect/metadata-collect-agent 90metadata-collect/fluent-bit 90m
cp
$(FLB_PATH)
/bin/fluent-bit
$(LOCAL_DRACUT_MODULE)
90metadata-collect/fluentbit_wendelin.so
:
cp
$(
MCA
_PATH)
/lib/libfluentbit_wendelin.so
$(LOCAL_DRACUT_MODULE)
cp
$(
PLG
_PATH)
/lib/libfluentbit_wendelin.so
$(LOCAL_DRACUT_MODULE)
90metadata-collect/flb.conf
:
cp
$(
MCA
_PATH)
/etc/flb.conf
$(LOCAL_DRACUT_MODULE)
cp
$(
PLG
_PATH)
/etc/flb.conf
$(LOCAL_DRACUT_MODULE)
.PHONY
:
clean
clean
:
...
...
dracut.module/configure
View file @
e8ca9219
...
...
@@ -3,9 +3,10 @@
# At the moment, this is not a standard configure script. It is only used to generate a makefile with the good package names.
source
../generation/00env.sh
FLB_PATH
=
/opt/
${
FLB_PACKAGE_NAME
}
MCA_PATH
=
/opt/
${
MCA_PACKAGE_NAME
}
FLB_PATH
=
/opt/
${
FLB_PACKAGE_NAME
}
PLG_PATH
=
/opt/
${
PLG_PACKAGE_NAME
}
PACKAGE_REGEX
=
"s|%
FLB_PATH%|
${
FLB_PATH
}
|g;s|%MCA_PATH%|
${
MCA
_PATH
}
|g"
PACKAGE_REGEX
=
"s|%
MCA_PATH%|
${
MCA_PATH
}
|g;s|%FLB_PATH%|
${
FLB_PATH
}
|g;s|%PLG_PATH%|
${
PLG
_PATH
}
|g"
sed
${
PACKAGE_REGEX
}
Makefile.in
>
Makefile
generation/00env.sh
View file @
e8ca9219
...
...
@@ -9,9 +9,9 @@ PROJECT_DIR=$GIT_ROOT
MCA_PACKAGE_NAME
=
mca--static
FLB_PACKAGE_NAME
=
fluent-bit
PLG_PACKAGE_NAME
=
plugin-fluentbit-to-wendelin
MCA_VERSION
=
0.3.1+
0.2+1.0.293+
dep-1
FLB_VERSION
=
1.9.
7+1.0.279+
dep-1
PLG_VERSION
=
0.2+1.0.293+nodep-1
MCA_VERSION
=
0.3.1+
1.0.293+no
dep-1
FLB_VERSION
=
1.9.
8+1.0.293+no
dep-1
PLG_VERSION
=
0.2
.1
+1.0.293+nodep-1
SIGNING_KEY_NAME
=
db.key
...
...
@@ -26,6 +26,6 @@ FLB_PACKAGE_FILE=${FLB_NAME_AND_VERSION}_amd64.deb
PLG_PACKAGE_FILE
=
${
PLG_NAME_AND_VERSION
}
_amd64.deb
URL_PATTERN
=
"https://download.opensuse.org/repositories/home:VIFIBnexedi/Debian_11/amd64/"
TMP_URL_PATTERN
=
"https://download.opensuse.org/repositories/home:oph.nxd/Debian_11/amd64/"
MCA_PACKAGE_URL
=
${
URL_PATTERN
}
/
${
MCA_PACKAGE_FILE
}
FLB_PACKAGE_URL
=
${
URL_PATTERN
}
/
${
FLB_PACKAGE_FILE
}
MCA_PACKAGE_URL
=
${
TMP_
URL_PATTERN
}
/
${
MCA_PACKAGE_FILE
}
FLB_PACKAGE_URL
=
${
TMP_
URL_PATTERN
}
/
${
FLB_PACKAGE_FILE
}
PLG_PACKAGE_URL
=
${
TMP_URL_PATTERN
}
/
${
PLG_PACKAGE_FILE
}
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