Merge pull request #274 from CESNET/nemea-process-experimental-rpm

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

Author: SiskaPavel

.github/workflows/rpm-build.yml

@@ -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: |

.github/workflows/rpm-install.yml

@@ -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

pkg/rpm/CMakeLists.txt

@@ -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

pkg/rpm/ipfixprobe-nemea.spec.in

@@ -1,4 +1,5 @@
 %bcond_with output_unirec
+%bcond_with process_experimental
 
 %global _unitdir %{_prefix}/lib/systemd/system
 
@@ -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
@@ -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
@@ -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