Skip to content

Commit 4cb0ae3

Browse files
[AUTO-CHERRYPICK] Enabled support of luajit for fluent-bit - branch main (#11850)
Co-authored-by: kgodara912 <kshigodara@outlook.com>
1 parent f63d1ab commit 4cb0ae3

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

SPECS/fluent-bit/fluent-bit.spec

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: Fast and Lightweight Log processor and forwarder for Linux, BSD and OSX
22
Name: fluent-bit
33
Version: 2.2.3
4-
Release: 6%{?dist}
4+
Release: 7%{?dist}
55
License: Apache-2.0
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
@@ -64,15 +64,14 @@ Development files for %{name}
6464
-DFLB_DEBUG=Off \
6565
-DFLB_TLS=On \
6666
-DFLB_JEMALLOC=On \
67-
-DFLB_LUAJIT=Off \
6867

6968
%cmake_build
7069

7170
%install
7271
%cmake_install
7372

7473
%check
75-
%ctest --exclude-regex "flb-rt-in_podman_metrics|flb-rt-filter_lua|.*\\.sh"
74+
%ctest --exclude-regex "flb-rt-in_podman_metrics|.*\\.sh"
7675

7776
%files
7877
%license LICENSE
@@ -81,12 +80,19 @@ Development files for %{name}
8180
%{_unitdir}/fluent-bit.service
8281
%{_bindir}/*
8382
%{_prefix}%{_sysconfdir}/fluent-bit/*
83+
%exclude %{_bindir}/luajit
84+
%exclude %{_libdir}/libluajit.a
8485

8586
%files devel
8687
%{_includedir}/*
8788
%{_libdir}/fluent-bit/*.so
8889

8990
%changelog
91+
* Fri Jan 10 2025 Kshitiz Godara <kgodara@microsoft.com> - 2.2.3-7
92+
- Enable luajit support
93+
- Exclude luajit binary from final package to remove conflict with luajit package
94+
- Exclude luajit static library from package as not needed
95+
9096
* Tue Dec 10 2024 Sudipta Pandit <sudpandit@microsoft.com> - 2.2.3-6
9197
- Backport fix for CVE-2024-27532
9298

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

135-
* Thu Feb 19 2022 Sriram Nambakam <snambakam@microsoft.com> - 1.8.12-2
141+
* Sat Feb 19 2022 Sriram Nambakam <snambakam@microsoft.com> - 1.8.12-2
136142
- Compile with -DFLB_JEMALLOC=on.
137143

138144
* Tue Feb 01 2022 Cameron Baird <cameronbaird@microsoft.com> - 1.8.12-1

0 commit comments

Comments
 (0)