Restructure packaging related files to better reflect usage. (#17678)
* Restructure packaging related files to better reflect usage. * Remove redundant variable declaration. * Fix variable name.
Austin S. Hemmelgarn committed
May 30, 2024 at 12:40 UTC
78fcd815dc87cfa3029d8f2f10056cac93d5a817
41 files changed
+58
-58
CMakeLists.txt
+22
-22
@@ -231,6 +231,8 @@ if(NEED_PROTOBUF)
231
endif()
232
endif()
233
234
+set(PKG_FILES_PATH "packaging/cmake/pkg-files")
235
+
236
if(ENABLE_PLUGIN_EBPF)
237
include(NetdataLibBPF)
238
include(NetdataEBPFCORE)
@@ -1750,7 +1752,7 @@ if(ENABLE_PLUGIN_DEBUGFS)
1752
1753
if(BUILD_FOR_PACKAGING)
1754
install(FILES
1753
- packaging/cmake/control/copyright
1755
+ ${PKG_FILES_PATH}/copyright
1756
COMPONENT plugin-debugfs
1757
DESTINATION usr/share/doc/netdata-plugin-debugfs)
1758
endif()
@@ -1792,7 +1794,7 @@ if(ENABLE_PLUGIN_APPS)
1794
1795
if(BUILD_FOR_PACKAGING)
1796
install(FILES
1795
- packaging/cmake/control/copyright
1797
+ ${PKG_FILES_PATH}/copyright
1798
COMPONENT plugin-apps
1799
DESTINATION usr/share/doc/netdata-plugin-apps)
1800
endif()
@@ -1818,7 +1820,7 @@ if(ENABLE_PLUGIN_FREEIPMI)
1820
1821
if(BUILD_FOR_PACKAGING)
1822
install(FILES
1821
- packaging/cmake/control/copyright
1823
+ ${PKG_FILES_PATH}/copyright
1824
COMPONENT plugin-freeipmi
1825
DESTINATION usr/share/doc/netdata-plugin-freeipmi)
1826
endif()
@@ -1844,7 +1846,7 @@ if(ENABLE_PLUGIN_NFACCT)
1846
1847
if(BUILD_FOR_PACKAGING)
1848
install(FILES
1847
- packaging/cmake/control/copyright
1849
+ ${PKG_FILES_PATH}/copyright
1850
COMPONENT plugin-nfacct
1851
DESTINATION usr/share/doc/netdata-plugin-nfacct)
1852
endif()
@@ -1867,7 +1869,7 @@ if(ENABLE_PLUGIN_XENSTAT)
1869
1870
if(BUILD_FOR_PACKAGING)
1871
install(FILES
1870
- packaging/cmake/control/copyright
1872
+ ${PKG_FILES_PATH}/copyright
1873
COMPONENT plugin-xenstat
1874
DESTINATION usr/share/doc/netdata-plugin-xenstat)
1875
endif()
@@ -1885,7 +1887,7 @@ if(ENABLE_PLUGIN_PERF)
1887
1888
if(BUILD_FOR_PACKAGING)
1889
install(FILES
1888
- packaging/cmake/control/copyright
1890
+ ${PKG_FILES_PATH}/copyright
1891
COMPONENT plugin-perf
1892
DESTINATION usr/share/doc/netdata-plugin-perf)
1893
endif()
@@ -1903,7 +1905,7 @@ if(ENABLE_PLUGIN_SLABINFO)
1905
1906
if(BUILD_FOR_PACKAGING)
1907
install(FILES
1906
- packaging/cmake/control/copyright
1908
+ ${PKG_FILES_PATH}/copyright
1909
COMPONENT plugin-slabinfo
1910
DESTINATION usr/share/doc/netdata-plugin-slabinfo)
1911
endif()
@@ -1943,7 +1945,7 @@ if(ENABLE_PLUGIN_LOGS_MANAGEMENT)
1945
1946
if(BUILD_FOR_PACKAGING)
1947
install(FILES
1946
- packaging/cmake/control/copyright
1948
+ ${PKG_FILES_PATH}/copyright
1949
COMPONENT plugin-logs-management
1950
DESTINATION usr/share/doc/netdata-plugin-logs-management)
1951
endif()
@@ -1982,7 +1984,7 @@ if(ENABLE_PLUGIN_CUPS)
1984
1985
if(BUILD_FOR_PACKAGING)
1986
install(FILES
1985
- packaging/cmake/control/copyright
1987
+ ${PKG_FILES_PATH}/copyright
1988
COMPONENT plugin-cups
1989
DESTINATION usr/share/doc/netdata-plugin-cups)
1990
endif()
@@ -2022,7 +2024,7 @@ if(ENABLE_PLUGIN_SYSTEMD_JOURNAL)
2024
2025
if(BUILD_FOR_PACKAGING)
2026
install(FILES
2025
- packaging/cmake/control/copyright
2027
+ ${PKG_FILES_PATH}/copyright
2028
COMPONENT plugin-systemd-journal
2029
DESTINATION usr/share/doc/netdata-plugin-systemd-journal)
2030
endif()
@@ -2111,7 +2113,7 @@ if(ENABLE_PLUGIN_EBPF)
2113
2114
if(BUILD_FOR_PACKAGING)
2115
install(FILES
2114
- packaging/cmake/control/copyright
2116
+ ${PKG_FILES_PATH}/copyright
2117
COMPONENT plugin-ebpf
2118
DESTINATION usr/share/doc/netdata-plugin-ebpf)
2119
endif()
@@ -2163,7 +2165,7 @@ if(ENABLE_PLUGIN_NETWORK_VIEWER)
2165
2166
if(BUILD_FOR_PACKAGING)
2167
install(FILES
2166
- packaging/cmake/control/copyright
2168
+ ${PKG_FILES_PATH}/copyright
2169
COMPONENT plugin-network-viewer
2170
DESTINATION usr/share/doc/netdata-plugin-network-viewer)
2171
endif()
@@ -2625,16 +2627,14 @@ install(FILES
2627
#
2628
if(BUILD_FOR_PACKAGING)
2629
install(FILES
2628
- packaging/cmake/control/netdata/etc/default/netdata
2630
+ ${PKG_FILES_PATH}/deb/netdata/etc/default/netdata
2631
COMPONENT netdata
2632
DESTINATION etc/default)
2631
-endif()
2633
2633
-if(BUILD_FOR_PACKAGING)
2634
-install(PROGRAMS
2635
- packaging/cmake/control/netdata/etc/init.d/netdata
2636
- COMPONENT netdata
2637
- DESTINATION etc/init.d)
2634
+ install(PROGRAMS
2635
+ ${PKG_FILES_PATH}/deb/netdata/etc/init.d/netdata
2636
+ COMPONENT netdata
2637
+ DESTINATION etc/init.d)
2638
endif()
2639
2640
install(PROGRAMS
@@ -2759,7 +2759,7 @@ install(FILES
2759
2760
if(BUILD_FOR_PACKAGING)
2761
install(FILES
2762
- packaging/cmake/control/copyright
2762
+ ${PKG_FILES_PATH}/copyright
2763
COMPONENT plugin-chartsd
2764
DESTINATION usr/share/doc/netdata-plugin-chartsd)
2765
endif()
@@ -2882,7 +2882,7 @@ install(FILES
2882
2883
if(BUILD_FOR_PACKAGING)
2884
install(FILES
2885
- packaging/cmake/control/copyright
2885
+ ${PKG_FILES_PATH}/copyright
2886
COMPONENT plugin-pythond
2887
DESTINATION usr/share/doc/netdata-plugin-pythond)
2888
endif()
@@ -2922,7 +2922,7 @@ if(ENABLE_PLUGIN_GO)
2922
2923
if(BUILD_FOR_PACKAGING)
2924
install(FILES
2925
- packaging/cmake/control/copyright
2925
+ ${PKG_FILES_PATH}/copyright
2926
COMPONENT plugin-go
2927
DESTINATION usr/share/doc/netdata-plugin-go)
2928
endif()
packaging/cmake/Modules/Packaging.cmake
+36
-36
@@ -98,10 +98,10 @@ endif()
98
list(JOIN _main_deps ", " CPACK_DEBIAN_NETDATA_PACKAGE_DEPENDS)
99
100
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
101
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/netdata/conffiles;"
102
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/netdata/preinst"
103
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/netdata/postinst"
104
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/netdata/postrm")
101
+ "${PKG_FILES_PATH}/deb/netdata/conffiles;"
102
+ "${PKG_FILES_PATH}/deb/netdata/preinst"
103
+ "${PKG_FILES_PATH}/deb/netdata/postinst"
104
+ "${PKG_FILES_PATH}/deb/netdata/postrm")
105
106
set(CPACK_DEBIAN_NETDATA_DEBUGINFO_PACKAGE On)
107
@@ -121,8 +121,8 @@ set(CPACK_DEBIAN_PLUGIN-APPS_PACKAGE_CONFLICTS "netdata (<< 1.40)")
121
set(CPACK_DEBIAN_PLUGIN-APPS_PACKAGE_PREDEPENDS "libcap2-bin, adduser")
122
123
set(CPACK_DEBIAN_PLUGIN-APPS_PACKAGE_CONTROL_EXTRA
124
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/apps/preinst;"
125
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/apps/postinst")
124
+ "${PKG_FILES_PATH}/deb/plugin-apps/preinst;"
125
+ "${PKG_FILES_PATH}/deb/plugin-apps/postinst")
126
127
set(CPACK_DEBIAN_PLUGIN-APPS_DEBUGINFO_PACKAGE On)
128
@@ -146,8 +146,8 @@ set(CPACK_DEBIAN_PLUGIN-CHARTSD_PACKAGE_ARCHITECTURE "all")
146
set(CPACK_DEBIAN_PLUGIN-CHARTSD_PACKAGE_SUGGESTS "apcupsd, iw, sudo")
147
148
set(CPACK_DEBIAN_PLUGIN-CHARTSD_PACKAGE_CONTROL_EXTRA
149
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/charts.d/preinst;"
150
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/charts.d/postinst")
149
+ "${PKG_FILES_PATH}/deb/plugin-chartsd/preinst;"
150
+ "${PKG_FILES_PATH}/deb/plugin-chartsd/postinst")
151
152
set(CPACK_DEBIAN_PLUGIN-CHARTSD_DEBUGINFO_PACKAGE Off)
153
@@ -164,8 +164,8 @@ set(CPACK_DEBIAN_PLUGIN-CUPS_PACKAGE_NAME "netdata-plugin-cups")
164
set(CPACK_DEBIAN_PLUGIN-CUPS_PACKAGE_SECTION "net")
165
set(CPACK_DEBIAN_PLUGIN-CUPS_PACKAGE_PREDEPENDS "adduser")
166
set(CPACK_DEBIAN_PLUGIN-CUPS_PACKAGE_CONTROL_EXTRA
167
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/cups/preinst;"
168
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/cups/postinst")
167
+ "${PKG_FILES_PATH}/deb/plugin-cups/preinst;"
168
+ "${PKG_FILES_PATH}/deb/plugin-cups/postinst")
169
170
set(CPACK_DEBIAN_PLUGIN-CUPS_DEBUGINFO_PACKAGE On)
171
@@ -184,8 +184,8 @@ set(CPACK_DEBIAN_PLUGIN-DEBUGFS_PACKAGE_SECTION "net")
184
set(CPACK_DEBIAN_PLUGIN-DEBUGFS_PACKAGE_CONFLICTS "netdata (<< 1.40)")
185
set(CPACK_DEBIAN_PLUGIN-DEBUGFS_PACKAGE_PREDEPENDS "libcap2-bin, adduser")
186
set(CPACK_DEBIAN_PLUGIN-DEBUGFS_PACKAGE_CONTROL_EXTRA
187
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/debugfs/preinst;"
188
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/debugfs/postinst")
187
+ "${PKG_FILES_PATH}/deb/plugin-debugfs/preinst;"
188
+ "${PKG_FILES_PATH}/deb/plugin-debugfs/postinst")
189
190
set(CPACK_DEBIAN_PLUGIN-DEBUGFS_DEBUGINFO_PACKAGE On)
191
@@ -206,8 +206,8 @@ set(CPACK_DEBIAN_PLUGIN-EBPF_PACKAGE_PREDEPENDS "adduser")
206
set(CPACK_DEBIAN_PLUGIN-EBPF_PACKAGE_RECOMMENDS "netdata-plugin-apps (= ${CPACK_PACKAGE_VERSION}), netdata-ebpf-code-legacy (= ${CPACK_PACKAGE_VERSION})")
207
208
set(CPACK_DEBIAN_PLUGIN-EBPF_PACKAGE_CONTROL_EXTRA
209
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/ebpf.d/preinst;"
210
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/ebpf.d/postinst")
209
+ "${PKG_FILES_PATH}/deb/plugin-ebpf/preinst;"
210
+ "${PKG_FILES_PATH}/deb/plugin-ebpf/postinst")
211
212
set(CPACK_DEBIAN_PLUGIN-EBPF_DEBUGINFO_PACKAGE On)
213
@@ -230,8 +230,8 @@ set(CPACK_DEBIAN_EBPF-CODE-LEGACY_PACKAGE_PREDEPENDS "adduser")
230
set(CPACK_DEBIAN_EBPF-CODE-LEGACY_PACKAGE_RECOMMENDS "netdata-plugin-ebpf (= ${CPACK_PACKAGE_VERSION})")
231
232
set(CPACK_DEBIAN_EBPF-CODE-LEGACY_PACKAGE_CONTROL_EXTRA
233
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/ebpf-code-legacy/preinst;"
234
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/ebpf-code-legacy/postinst")
233
+ "${PKG_FILES_PATH}/deb/ebpf-code-legacy/preinst;"
234
+ "${PKG_FILES_PATH}/deb/ebpf-code-legacy/postinst")
235
236
set(CPACK_DEBIAN_EBPF-CODE-LEGACY_DEBUGINFO_PACKAGE Off)
237
@@ -250,8 +250,8 @@ set(CPACK_DEBIAN_PLUGIN-FREEIPMI_PACKAGE_SECTION "net")
250
set(CPACK_DEBIAN_PLUGIN-FREEIPMI_PACKAGE_PREDEPENDS "adduser")
251
252
set(CPACK_DEBIAN_PLUGIN-FREEIPMI_PACKAGE_CONTROL_EXTRA
253
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/freeipmi/preinst;"
254
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/freeipmi/postinst")
253
+ "${PKG_FILES_PATH}/deb/plugin-freeipmi/preinst;"
254
+ "${PKG_FILES_PATH}/deb/plugin-freeipmi/postinst")
255
256
set(CPACK_DEBIAN_PLUGIN-FREEIPMI_DEBUGINFO_PACKAGE On)
257
@@ -274,8 +274,8 @@ set(CPACK_DEBIAN_PLUGIN-GO_PACKAGE_PREDEPENDS "libcap2-bin, adduser")
274
set(CPACK_DEBIAN_PLUGIN-GO_PACKAGE_SUGGESTS "nvme-cli")
275
276
set(CPACK_DEBIAN_PLUGIN-GO_PACKAGE_CONTROL_EXTRA
277
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/go.d/preinst;"
278
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/go.d/postinst")
277
+ "${PKG_FILES_PATH}/deb/plugin-go/preinst;"
278
+ "${PKG_FILES_PATH}/deb/plugin-go/postinst")
279
280
set(CPACK_DEBIAN_PLUGIN-GO_DEBUGINFO_PACKAGE Off)
281
@@ -294,8 +294,8 @@ set(CPACK_DEBIAN_PLUGIN-LOGS-MANAGEMENT_PACKAGE_SECTION "net")
294
set(CPACK_DEBIAN_PLUGIN-LOGS-MANAGEMENT_PACKAGE_PREDEPENDS "libcap2-bin, adduser")
295
296
set(CPACK_DEBIAN_PLUGIN-LOGS-MANAGEMENT_PACKAGE_CONTROL_EXTRA
297
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/logs-management/preinst;"
298
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/logs-management/postinst")
297
+ "${PKG_FILES_PATH}/deb/plugin-logs-management/preinst;"
298
+ "${PKG_FILES_PATH}/deb/plugin-logs-management/postinst")
299
300
set(CPACK_DEBIAN_PLUGIN-LOGS-MANAGEMENT_DEBUGINFO_PACKAGE On)
301
@@ -316,8 +316,8 @@ set(CPACK_DEBIAN_PLUGIN-NETWORK-VIEWER_PACKAGE_PREDEPENDS "libcap2-bin, adduser"
316
set(CPACK_DEBIAN_PLUGIN-NETWORK-VIEWER_PACKAGE_RECOMMENDS "netdata-plugin-ebpf (= ${CPACK_PACKAGE_VERSION})")
317
318
set(CPACK_DEBIAN_PLUGIN-NETWORK-VIEWER_PACKAGE_CONTROL_EXTRA
319
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/network-viewer/preinst;"
320
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/network-viewer/postinst")
319
+ "${PKG_FILES_PATH}/deb/plugin-network-viewer/preinst;"
320
+ "${PKG_FILES_PATH}/deb/plugin-network-viewer/postinst")
321
322
set(CPACK_DEBIAN_PLUGIN-NETWORK-VIEWER_DEBUGINFO_PACKAGE On)
323
@@ -337,8 +337,8 @@ set(CPACK_DEBIAN_PLUGIN-NFACCT_PACKAGE_CONFLICTS "netdata (<< 1.40)")
337
set(CPACK_DEBIAN_PLUGIN-NFACCT_PACKAGE_PREDEPENDS "adduser")
338
339
set(CPACK_DEBIAN_PLUGIN-NFACCT_PACKAGE_CONTROL_EXTRA
340
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/nfacct/preinst;"
341
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/nfacct/postinst")
340
+ "${PKG_FILES_PATH}/deb/plugin-nfacct/preinst;"
341
+ "${PKG_FILES_PATH}/deb/plugin-nfacct/postinst")
342
343
set(CPACK_DEBIAN_PLUGIN-NFACCT_DEBUGINFO_PACKAGE On)
344
@@ -358,8 +358,8 @@ set(CPACK_DEBIAN_PLUGIN-PERF_PACKAGE_CONFLICTS "netdata (<< 1.40)")
358
set(CPACK_DEBIAN_PLUGIN-PERF_PACKAGE_PREDEPENDS "libcap2-bin, adduser")
359
360
set(CPACK_DEBIAN_PLUGIN-PERF_PACKAGE_CONTROL_EXTRA
361
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/perf/preinst;"
362
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/perf/postinst")
361
+ "${PKG_FILES_PATH}/deb/plugin-perf/preinst;"
362
+ "${PKG_FILES_PATH}/deb/plugin-perf/postinst")
363
364
set(CPACK_DEBIAN_PLUGIN-PERF_DEBUGINFO_PACKAGE On)
365
@@ -383,8 +383,8 @@ set(CPACK_DEBIAN_PLUGIN-PYTHOND_PACHAGE_DEPENDS "python3")
383
set(CPACK_DEBIAN_PLUGIN-PYTHOND_PACKAGE_ARCHITECTURE "all")
384
385
set(CPACK_DEBIAN_PLUGIN-PYTHOND_PACKAGE_CONTROL_EXTRA
386
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/python.d/preinst;"
387
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/python.d/postinst")
386
+ "${PKG_FILES_PATH}/deb/plugin-pythond/preinst;"
387
+ "${PKG_FILES_PATH}/deb/plugin-pythond/postinst")
388
389
set(CPACK_DEBIAN_PLUGIN-PYTHOND_DEBUGINFO_PACKAGE Off)
390
@@ -404,8 +404,8 @@ set(CPACK_DEBIAN_PLUGIN-SLABINFO_PACKAGE_CONFLICTS "netdata (<< 1.40)")
404
set(CPACK_DEBIAN_PLUGIN-SLABINFO_PACKAGE_PREDEPENDS "libcap2-bin, adduser")
405
406
set(CPACK_DEBIAN_PLUGIN-SLABINFO_PACKAGE_CONTROL_EXTRA
407
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/slabinfo/preinst;"
408
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/slabinfo/postinst")
407
+ "${PKG_FILES_PATH}/deb/plugin-slabinfo/preinst;"
408
+ "${PKG_FILES_PATH}/deb/plugin-slabinfo/postinst")
409
410
set(CPACK_DEBIAN_PLUGIN-SLABINFO_DEBUGINFO_PACKAGE On)
411
@@ -424,8 +424,8 @@ set(CPACK_DEBIAN_PLUGIN-SYSTEMD-JOURNAL_PACKAGE_SECTION "net")
424
set(CPACK_DEBIAN_PLUGIN-SYSTEMD-JOURNAL_PACKAGE_PREDEPENDS "libcap2-bin, adduser")
425
426
set(CPACK_DEBIAN_PLUGIN-SYSTEMD-JOURNAL_PACKAGE_CONTROL_EXTRA
427
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/systemd-journal/preinst;"
428
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/systemd-journal/postinst")
427
+ "${PKG_FILES_PATH}/deb/plugin-systemd-journal/preinst;"
428
+ "${PKG_FILES_PATH}/deb/plugin-systemd-journal/postinst")
429
430
set(CPACK_DEBIAN_PLUGIN-SYSTEMD_JOURNAL_DEBUGINFO_PACKAGE On)
431
@@ -445,8 +445,8 @@ set(CPACK_DEBIAN_PLUGIN-XENSTAT_PACKAGE_CONFLICTS "netdata (<< 1.40)")
445
set(CPACK_DEBIAN_PLUGIN-XENSTAT_PACKAGE_PREDEPENDS "adduser")
446
447
set(CPACK_DEBIAN_PLUGIN-XENSTAT_PACKAGE_CONTROL_EXTRA
448
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/xenstat/preinst;"
449
- "${CMAKE_SOURCE_DIR}/packaging/cmake/control/xenstat/postinst")
448
+ "${PKG_FILES_PATH}/deb/plugin-xenstat/preinst;"
449
+ "${PKG_FILES_PATH}/deb/plugin-xenstat/postinst")
450
451
set(CPACK_DEBIAN_PLUGIN-XENSTAT_DEBUGINFO_PACKAGE On)
452