Final fixups to package handling.

3 files changed, 47 insertions, 17 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2397797951..27c3ca88b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,9 +137,6 @@ option(ENABLE_BUNDLED_JSONC "Force use of a vendored copy of JSON-C" False)
 option(ENABLE_BUNDLED_YAML "Force use of a vendored copy of libyaml" False)
 option(ENABLE_BUNDLED_PROTOBUF "Use a vendored copy of protobuf" False)
 
-option(BUILD_FOR_PACKAGING "Include component files for deb packages" False)
-mark_as_advanced(BUILD_FOR_PACKAGING)
-
 # Optional test code
 cmake_dependent_option(ENABLE_LOGS_MANAGEMENT_TESTS "Enable test code for logs-management plugin." True "NOT ENABLE_PLUGIN_LOGS_MANAGEMENT" False)
 mark_as_advanced(ENABLE_LOGS_MANAGEMENT_TESTS)
@@ -154,6 +151,9 @@ mark_as_advanced(ENABLE_H2O)
 option(ENABLE_SENTRY "Build with Sentry Native crash reporting" False)
 mark_as_advanced(ENABLE_SENTRY)
 
+option(BUILD_FOR_PACKAGING "Include component files for native packages" False)
+mark_as_advanced(BUILD_FOR_PACKAGING)
+
 cmake_dependent_option(FORCE_LEGACY_LIBBPF "Force usage of libbpf 0.0.9 instead of the latest version." False "ENABLE_PLUGIN_LIBBPF" False)
 mark_as_advanced(FORCE_LEGACY_LIBBPF)
 
diff --git a/packaging/build-package.sh b/packaging/build-package.sh
index 077ca6791b..11216a3fc7 100755
--- a/packaging/build-package.sh
+++ b/packaging/build-package.sh
@@ -51,6 +51,8 @@ add_cmake_option ENABLE_BUNDLED_PROTOBUF Off
 add_cmake_option ENABLE_BUNDLED_JSONC Off
 add_cmake_option ENABLE_BUNDLED_YAML Off
 
+add_cmake_option BUILD_FOR_PACKAGING On
+
 case "${PKG_TYPE}" in
     DEB)
         if [ "$(uname -m)" = "x86_64" ]; then
diff --git a/packaging/cmake/Modules/Packaging.cmake b/packaging/cmake/Modules/Packaging.cmake
index 6255135aeb..47adc2cfa3 100644
--- a/packaging/cmake/Modules/Packaging.cmake
+++ b/packaging/cmake/Modules/Packaging.cmake
@@ -444,22 +444,50 @@ set(CPACK_DEBIAN_PLUGIN-XENSTAT_DEBUGINFO_PACKAGE On)
 # CPack components
 #
 
-list(APPEND CPACK_COMPONENTS_ALL "ebpf-code-legacy")
 list(APPEND CPACK_COMPONENTS_ALL "netdata")
-list(APPEND CPACK_COMPONENTS_ALL "plugin-apps")
+if(ENABLE_PLUGIN_APPS)
+        list(APPEND CPACK_COMPONENTS_ALL "plugin-apps")
+endif()
 list(APPEND CPACK_COMPONENTS_ALL "plugin-chartsd")
-list(APPEND CPACK_COMPONENTS_ALL "plugin-cups")
-list(APPEND CPACK_COMPONENTS_ALL "plugin-debugfs")
-list(APPEND CPACK_COMPONENTS_ALL "plugin-ebpf")
-list(APPEND CPACK_COMPONENTS_ALL "plugin-freeipmi")
-list(APPEND CPACK_COMPONENTS_ALL "plugin-go")
-list(APPEND CPACK_COMPONENTS_ALL "plugin-logs-management")
-list(APPEND CPACK_COMPONENTS_ALL "plugin-network-viewer")
-list(APPEND CPACK_COMPONENTS_ALL "plugin-nfacct")
-list(APPEND CPACK_COMPONENTS_ALL "plugin-perf")
+if(ENABLE_PLUGIN_CUPS)
+        list(APPEND CPACK_COMPONENTS_ALL "plugin-cups")
+endif()
+if(ENABLE_PLUGIN_DEBUGFS)
+        list(APPEND CPACK_COMPONENTS_ALL "plugin-debugfs")
+endif()
+if(ENABLE_PLUGIN_EBPF)
+        list(APPEND CPACK_COMPONENTS_ALL "plugin-ebpf")
+endif()
+if(ENABLE_EBPF_LEGACY_PROGRAMS)
+        list(APPEND CPACK_COMPONENTS_ALL "ebpf-code-legacy")
+endif()
+if(ENABLE_PLUGIN_FREEIPMI)
+        list(APPEND CPACK_COMPONENTS_ALL "plugin-freeipmi")
+endif()
+if(ENABLE_PLUGIN_GO)
+        list(APPEND CPACK_COMPONENTS_ALL "plugin-go")
+endif()
+if(ENABLE_PLUGIN_LOGS_MANAGEMENT)
+        list(APPEND CPACK_COMPONENTS_ALL "plugin-logs-management")
+endif()
+if(ENABLE_PLUGIN_NETWORK_VIEWER)
+        list(APPEND CPACK_COMPONENTS_ALL "plugin-network-viewer")
+endif()
+if(ENABLE_PLUGIN_NFACCT)
+        list(APPEND CPACK_COMPONENTS_ALL "plugin-nfacct")
+endif()
+if(ENABLE_PLUGIN_PERF)
+        list(APPEND CPACK_COMPONENTS_ALL "plugin-perf")
+endif()
 list(APPEND CPACK_COMPONENTS_ALL "plugin-pythond")
-list(APPEND CPACK_COMPONENTS_ALL "plugin-slabinfo")
-list(APPEND CPACK_COMPONENTS_ALL "plugin-systemd-journal")
-list(APPEND CPACK_COMPONENTS_ALL "plugin-xenstat")
+if(ENABLE_PLUGIN_SLABINFO)
+        list(APPEND CPACK_COMPONENTS_ALL "plugin-slabinfo")
+endif()
+if(ENABLE_PLUGIN_SYSTEMD_JOURNAL)
+        list(APPEND CPACK_COMPONENTS_ALL "plugin-systemd-journal")
+endif()
+if(ENABLE_PLUGIN_XENSTAT)
+        list(APPEND CPACK_COMPONENTS_ALL "plugin-xenstat")
+endif()
 
 include(CPack)