Skip to content

RPM spec: add conditional build of ipfixprobe-nemea-process-experimental package #274

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

Merged
SiskaPavel merged 2 commits into from
May 5, 2025
Merged

RPM spec: add conditional build of ipfixprobe-nemea-process-experimental package #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60eae81
RPM spec: add conditional build of ipfixprobe-nemea-process-experimental
May 5, 2025
ccf646a
Github-actions: add build of of ipfixprobe-nemea-process-experimental
May 5, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/rpm-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: make rpm-nemea
run: |
cd build
cmake3 .. -DCMAKE_BUILD_TYPE=Release -DENABLE_OUTPUT_UNIREC=ON
cmake3 .. -DCMAKE_BUILD_TYPE=Release -DENABLE_OUTPUT_UNIREC=ON -DENABLE_PROCESS_EXPERIMENTAL=ON
make rpm-nemea
- name: extract artifact name
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rpm-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ jobs:
run: |
dnf install -y $(ls *.rpm | grep -Ev 'ipfixprobe-msec|ipfixprobe-nemea|ipfixprobe-output-unirec|debuginfo|debugsource')
dnf install -y $(ls ipfixprobe-msec-*.rpm | grep -Ev 'debuginfo|debugsource') --allowerasing
dnf install -y $(ls ipfixprobe-nemea-*.rpm ipfixprobe-output-unirec*.rpm | grep -Ev 'debuginfo|debugsource') --allowerasing
dnf install -y $(ls ipfixprobe-nemea-*.rpm | grep -Ev 'debuginfo|debugsource') --allowerasing
4 changes: 4 additions & 0 deletions pkg/rpm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ if (ENABLE_OUTPUT_UNIREC)
list(APPEND RPMBUILD_ARGS_NEMEA "--with" "output_unirec")
endif()

if (ENABLE_PROCESS_EXPERIMENTAL)
list(APPEND RPMBUILD_ARGS_NEMEA "--with" "process_experimental")
endif()

configure_file("${SPEC_FILE_IN_NEMEA}" "${SPEC_FILE_NEMEA}" @ONLY)

add_custom_target(rpm-nemea
Expand Down
18 changes: 17 additions & 1 deletion pkg/rpm/ipfixprobe-nemea.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
%bcond_with output_unirec
%bcond_with process_experimental

%global _unitdir %{_prefix}/lib/systemd/system

Expand Down Expand Up @@ -59,6 +60,13 @@ Requires: ipfixprobe-nemea
Output plugin for unirec.
%endif

%if %{with process_experimental}
%package process-experimental
Summary: Experimental process plugins.

%description process-experimental
Experimental process plugins.
%endif

# Make sure that build is always performed out-of-source
%undefine __cmake_in_source_build
Expand All @@ -70,7 +78,7 @@ Output plugin for unirec.
%if 0%{?rhel} == 8
source /opt/rh/gcc-toolset-14/enable
%endif
%cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_NEMEA=ON %{?with_output_unirec: -DENABLE_OUTPUT_UNIREC=ON}
%cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_NEMEA=ON %{?with_output_unirec: -DENABLE_OUTPUT_UNIREC=ON} %{?with_process_experimental: -DENABLE_PROCESS_EXPERIMENTAL=ON}
%cmake_build

%install
Expand Down Expand Up @@ -123,5 +131,13 @@ source /opt/rh/gcc-toolset-14/enable
%{_libdir}/ipfixprobe/output/libipfixprobe-output-unirec.so
%endif

%if %{with process_experimental}
%files process-experimental
%{_libdir}/ipfixprobe/process/libipfixprobe-process-nettisa.so
%{_libdir}/ipfixprobe/process/libipfixprobe-process-sip.so
%{_libdir}/ipfixprobe/process/libipfixprobe-process-rtsp.so
%{_libdir}/ipfixprobe/process/libipfixprobe-process-mpls.so
%{_libdir}/ipfixprobe/process/libipfixprobe-process-ntp.so
%endif

%changelog
Loading