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

Jump to bottom

Clean up CMake packaging code in preparation for migrating RPM packaging to CPack. #17590

Closed
wants to merge 8 commits into from
Closed

Clean up CMake packaging code in preparation for migrating RPM packaging to CPack. #17590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aa1b6f0
Handle most package variable declarations in a function.
Ferroin May 2, 2024
58444ef
Handle adding components to package list in package declaration funct…
Ferroin May 2, 2024
74e23d8
Restructure packaging related files to better reflect usage.
Ferroin May 2, 2024
c60a3fe
Automatically pick up DEB control files from the source tree.
Ferroin May 2, 2024
adf292c
Declare main package using package declaration function.
Ferroin May 2, 2024
75f915e
Assorted fixes.
Ferroin May 3, 2024
5636d7f
Fix missing apps plugin conflict change.
Ferroin May 3, 2024
8a4680c
Further fixups.
Ferroin May 3, 2024
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
44 changes: 22 additions & 22 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,8 @@ if(NEED_PROTOBUF)
endif()
endif()

set(PKG_FILES_PATH "packaging/cmake/pkg-files")

#
# detect OS
#
Expand Down Expand Up @@ -1672,7 +1674,7 @@ if(ENABLE_PLUGIN_DEBUGFS)

if(BUILD_FOR_PACKAGING)
install(FILES
packaging/cmake/control/copyright
${PKG_FILES_PATH}/copyright
COMPONENT plugin-debugfs
DESTINATION usr/share/doc/netdata-plugin-debugfs)
endif()
Expand Down Expand Up @@ -1714,7 +1716,7 @@ if(ENABLE_PLUGIN_APPS)

if(BUILD_FOR_PACKAGING)
install(FILES
packaging/cmake/control/copyright
${PKG_FILES_PATH}/copyright
COMPONENT plugin-apps
DESTINATION usr/share/doc/netdata-plugin-apps)
endif()
Expand All @@ -1740,7 +1742,7 @@ if(ENABLE_PLUGIN_FREEIPMI)

if(BUILD_FOR_PACKAGING)
install(FILES
packaging/cmake/control/copyright
${PKG_FILES_PATH}/copyright
COMPONENT plugin-freeipmi
DESTINATION usr/share/doc/netdata-plugin-freeipmi)
endif()
Expand All @@ -1766,7 +1768,7 @@ if(ENABLE_PLUGIN_NFACCT)

if(BUILD_FOR_PACKAGING)
install(FILES
packaging/cmake/control/copyright
${PKG_FILES_PATH}/copyright
COMPONENT plugin-nfacct
DESTINATION usr/share/doc/netdata-plugin-nfacct)
endif()
Expand All @@ -1789,7 +1791,7 @@ if(ENABLE_PLUGIN_XENSTAT)

if(BUILD_FOR_PACKAGING)
install(FILES
packaging/cmake/control/copyright
${PKG_FILES_PATH}/copyright
COMPONENT plugin-xenstat
DESTINATION usr/share/doc/netdata-plugin-xenstat)
endif()
Expand All @@ -1807,7 +1809,7 @@ if(ENABLE_PLUGIN_PERF)

if(BUILD_FOR_PACKAGING)
install(FILES
packaging/cmake/control/copyright
${PKG_FILES_PATH}/copyright
COMPONENT plugin-perf
DESTINATION usr/share/doc/netdata-plugin-perf)
endif()
Expand All @@ -1825,7 +1827,7 @@ if(ENABLE_PLUGIN_SLABINFO)

if(BUILD_FOR_PACKAGING)
install(FILES
packaging/cmake/control/copyright
${PKG_FILES_PATH}/copyright
COMPONENT plugin-slabinfo
DESTINATION usr/share/doc/netdata-plugin-slabinfo)
endif()
Expand Down Expand Up @@ -1865,7 +1867,7 @@ if(ENABLE_PLUGIN_LOGS_MANAGEMENT)

if(BUILD_FOR_PACKAGING)
install(FILES
packaging/cmake/control/copyright
${PKG_FILES_PATH}/copyright
COMPONENT plugin-logs-management
DESTINATION usr/share/doc/netdata-plugin-logs-management)
endif()
Expand Down Expand Up @@ -1904,7 +1906,7 @@ if(ENABLE_PLUGIN_CUPS)

if(BUILD_FOR_PACKAGING)
install(FILES
packaging/cmake/control/copyright
${PKG_FILES_PATH}/copyright
COMPONENT plugin-cups
DESTINATION usr/share/doc/netdata-plugin-cups)
endif()
Expand Down Expand Up @@ -1944,7 +1946,7 @@ if(ENABLE_PLUGIN_SYSTEMD_JOURNAL)

if(BUILD_FOR_PACKAGING)
install(FILES
packaging/cmake/control/copyright
${PKG_FILES_PATH}/copyright
COMPONENT plugin-systemd-journal
DESTINATION usr/share/doc/netdata-plugin-systemd-journal)
endif()
Expand Down Expand Up @@ -2033,7 +2035,7 @@ if(ENABLE_PLUGIN_EBPF)

if(BUILD_FOR_PACKAGING)
install(FILES
packaging/cmake/control/copyright
${PKG_FILES_PATH}/copyright
COMPONENT plugin-ebpf
DESTINATION usr/share/doc/netdata-plugin-ebpf)
endif()
Expand Down Expand Up @@ -2085,7 +2087,7 @@ if(ENABLE_PLUGIN_NETWORK_VIEWER)

if(BUILD_FOR_PACKAGING)
install(FILES
packaging/cmake/control/copyright
${PKG_FILES_PATH}/copyright
COMPONENT plugin-network-viewer
DESTINATION usr/share/doc/netdata-plugin-network-viewer)
endif()
Expand Down Expand Up @@ -2545,16 +2547,14 @@ install(FILES
#
if(BUILD_FOR_PACKAGING)
install(FILES
packaging/cmake/control/netdata/etc/default/netdata
${PKG_FILES_PATH}/deb/netdata/etc/default/netdata
COMPONENT netdata
DESTINATION etc/default)
endif()

if(BUILD_FOR_PACKAGING)
install(PROGRAMS
packaging/cmake/control/netdata/etc/init.d/netdata
COMPONENT netdata
DESTINATION etc/init.d)
install(PROGRAMS
${PKG_FILES_PATH}/deb/netdata/etc/init.d/netdata
COMPONENT netdata
DESTINATION etc/init.d)
endif()

install(PROGRAMS
Expand Down Expand Up @@ -2679,7 +2679,7 @@ install(FILES

if(BUILD_FOR_PACKAGING)
install(FILES
packaging/cmake/control/copyright
${PKG_FILES_PATH}/copyright
COMPONENT plugin-chartsd
DESTINATION usr/share/doc/netdata-plugin-chartsd)
endif()
Expand Down Expand Up @@ -2810,7 +2810,7 @@ install(FILES

if(BUILD_FOR_PACKAGING)
install(FILES
packaging/cmake/control/copyright
${PKG_FILES_PATH}/copyright
COMPONENT plugin-pythond
DESTINATION usr/share/doc/netdata-plugin-pythond)
endif()
Expand Down Expand Up @@ -2850,7 +2850,7 @@ if(ENABLE_PLUGIN_GO)

if(BUILD_FOR_PACKAGING)
install(FILES
packaging/cmake/control/copyright
${PKG_FILES_PATH}/copyright
COMPONENT plugin-go
DESTINATION usr/share/doc/netdata-plugin-go)
endif()
Expand Down
Loading
Loading