Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AUTO-CHERRYPICK] Enabled support of luajit for fluent-bit - branch main #11850

Merged
merged 1 commit into from
Jan 13, 2025
Merged

[AUTO-CHERRYPICK] Enabled support of luajit for fluent-bit - branch main #11850

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions SPECS/fluent-bit/fluent-bit.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Fast and Lightweight Log processor and forwarder for Linux, BSD and OSX
Name: fluent-bit
Version: 2.2.3
Release: 6%{?dist}
Release: 7%{?dist}
License: Apache-2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -64,15 +64,14 @@ Development files for %{name}
-DFLB_DEBUG=Off \
-DFLB_TLS=On \
-DFLB_JEMALLOC=On \
-DFLB_LUAJIT=Off \

%cmake_build

%install
%cmake_install

%check
%ctest --exclude-regex "flb-rt-in_podman_metrics|flb-rt-filter_lua|.*\\.sh"
%ctest --exclude-regex "flb-rt-in_podman_metrics|.*\\.sh"

%files
%license LICENSE
Expand All @@ -81,12 +80,19 @@ Development files for %{name}
%{_unitdir}/fluent-bit.service
%{_bindir}/*
%{_prefix}%{_sysconfdir}/fluent-bit/*
%exclude %{_bindir}/luajit
%exclude %{_libdir}/libluajit.a

%files devel
%{_includedir}/*
%{_libdir}/fluent-bit/*.so

%changelog
* Fri Jan 10 2025 Kshitiz Godara <[email protected]> - 2.2.3-7
- Enable luajit support
- Exclude luajit binary from final package to remove conflict with luajit package
- Exclude luajit static library from package as not needed

* Tue Dec 10 2024 Sudipta Pandit <[email protected]> - 2.2.3-6
- Backport fix for CVE-2024-27532

Expand Down Expand Up @@ -132,7 +138,7 @@ Development files for %{name}
- Upgrade version to 1.9.6
- Add build time dependency libyaml-devel

* Thu Feb 19 2022 Sriram Nambakam <[email protected]> - 1.8.12-2
* Sat Feb 19 2022 Sriram Nambakam <[email protected]> - 1.8.12-2
- Compile with -DFLB_JEMALLOC=on.

* Tue Feb 01 2022 Cameron Baird <[email protected]> - 1.8.12-1
Expand Down
Loading