diff --git a/CMakeLists.txt b/CMakeLists.txt index 9dd9606e12a2d2..27fb237ca16636 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -231,6 +231,8 @@ if(NEED_PROTOBUF) endif() endif() +set(PKG_FILES_PATH "packaging/cmake/pkg-files") + if(ENABLE_PLUGIN_EBPF) include(NetdataLibBPF) include(NetdataEBPFCORE) @@ -1750,7 +1752,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() @@ -1792,7 +1794,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() @@ -1818,7 +1820,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() @@ -1844,7 +1846,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() @@ -1867,7 +1869,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() @@ -1885,7 +1887,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() @@ -1903,7 +1905,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() @@ -1943,7 +1945,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() @@ -1982,7 +1984,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() @@ -2022,7 +2024,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() @@ -2111,7 +2113,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() @@ -2163,7 +2165,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() @@ -2625,16 +2627,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 @@ -2759,7 +2759,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() @@ -2882,7 +2882,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() @@ -2922,7 +2922,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() diff --git a/packaging/cmake/Modules/Packaging.cmake b/packaging/cmake/Modules/Packaging.cmake index cb953cda91f21d..1dd2328cdf488e 100644 --- a/packaging/cmake/Modules/Packaging.cmake +++ b/packaging/cmake/Modules/Packaging.cmake @@ -98,10 +98,10 @@ endif() list(JOIN _main_deps ", " CPACK_DEBIAN_NETDATA_PACKAGE_DEPENDS) set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/netdata/conffiles;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/netdata/preinst" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/netdata/postinst" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/netdata/postrm") + "${PKG_FILES_PATH}/deb/netdata/conffiles;" + "${PKG_FILES_PATH}/deb/netdata/preinst" + "${PKG_FILES_PATH}/deb/netdata/postinst" + "${PKG_FILES_PATH}/deb/netdata/postrm") set(CPACK_DEBIAN_NETDATA_DEBUGINFO_PACKAGE On) @@ -121,8 +121,8 @@ set(CPACK_DEBIAN_PLUGIN-APPS_PACKAGE_CONFLICTS "netdata (<< 1.40)") set(CPACK_DEBIAN_PLUGIN-APPS_PACKAGE_PREDEPENDS "libcap2-bin, adduser") set(CPACK_DEBIAN_PLUGIN-APPS_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/apps/preinst;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/apps/postinst") + "${PKG_FILES_PATH}/deb/plugin-apps/preinst;" + "${PKG_FILES_PATH}/deb/plugin-apps/postinst") set(CPACK_DEBIAN_PLUGIN-APPS_DEBUGINFO_PACKAGE On) @@ -146,8 +146,8 @@ set(CPACK_DEBIAN_PLUGIN-CHARTSD_PACKAGE_ARCHITECTURE "all") set(CPACK_DEBIAN_PLUGIN-CHARTSD_PACKAGE_SUGGESTS "apcupsd, iw, sudo") set(CPACK_DEBIAN_PLUGIN-CHARTSD_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/charts.d/preinst;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/charts.d/postinst") + "${PKG_FILES_PATH}/deb/plugin-chartsd/preinst;" + "${PKG_FILES_PATH}/deb/plugin-chartsd/postinst") set(CPACK_DEBIAN_PLUGIN-CHARTSD_DEBUGINFO_PACKAGE Off) @@ -164,8 +164,8 @@ set(CPACK_DEBIAN_PLUGIN-CUPS_PACKAGE_NAME "netdata-plugin-cups") set(CPACK_DEBIAN_PLUGIN-CUPS_PACKAGE_SECTION "net") set(CPACK_DEBIAN_PLUGIN-CUPS_PACKAGE_PREDEPENDS "adduser") set(CPACK_DEBIAN_PLUGIN-CUPS_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/cups/preinst;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/cups/postinst") + "${PKG_FILES_PATH}/deb/plugin-cups/preinst;" + "${PKG_FILES_PATH}/deb/plugin-cups/postinst") set(CPACK_DEBIAN_PLUGIN-CUPS_DEBUGINFO_PACKAGE On) @@ -184,8 +184,8 @@ set(CPACK_DEBIAN_PLUGIN-DEBUGFS_PACKAGE_SECTION "net") set(CPACK_DEBIAN_PLUGIN-DEBUGFS_PACKAGE_CONFLICTS "netdata (<< 1.40)") set(CPACK_DEBIAN_PLUGIN-DEBUGFS_PACKAGE_PREDEPENDS "libcap2-bin, adduser") set(CPACK_DEBIAN_PLUGIN-DEBUGFS_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/debugfs/preinst;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/debugfs/postinst") + "${PKG_FILES_PATH}/deb/plugin-debugfs/preinst;" + "${PKG_FILES_PATH}/deb/plugin-debugfs/postinst") set(CPACK_DEBIAN_PLUGIN-DEBUGFS_DEBUGINFO_PACKAGE On) @@ -206,8 +206,8 @@ set(CPACK_DEBIAN_PLUGIN-EBPF_PACKAGE_PREDEPENDS "adduser") set(CPACK_DEBIAN_PLUGIN-EBPF_PACKAGE_RECOMMENDS "netdata-plugin-apps (= ${CPACK_PACKAGE_VERSION}), netdata-ebpf-code-legacy (= ${CPACK_PACKAGE_VERSION})") set(CPACK_DEBIAN_PLUGIN-EBPF_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/ebpf.d/preinst;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/ebpf.d/postinst") + "${PKG_FILES_PATH}/deb/plugin-ebpf/preinst;" + "${PKG_FILES_PATH}/deb/plugin-ebpf/postinst") set(CPACK_DEBIAN_PLUGIN-EBPF_DEBUGINFO_PACKAGE On) @@ -230,8 +230,8 @@ set(CPACK_DEBIAN_EBPF-CODE-LEGACY_PACKAGE_PREDEPENDS "adduser") set(CPACK_DEBIAN_EBPF-CODE-LEGACY_PACKAGE_RECOMMENDS "netdata-plugin-ebpf (= ${CPACK_PACKAGE_VERSION})") set(CPACK_DEBIAN_EBPF-CODE-LEGACY_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/ebpf-code-legacy/preinst;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/ebpf-code-legacy/postinst") + "${PKG_FILES_PATH}/deb/ebpf-code-legacy/preinst;" + "${PKG_FILES_PATH}/deb/ebpf-code-legacy/postinst") set(CPACK_DEBIAN_EBPF-CODE-LEGACY_DEBUGINFO_PACKAGE Off) @@ -250,8 +250,8 @@ set(CPACK_DEBIAN_PLUGIN-FREEIPMI_PACKAGE_SECTION "net") set(CPACK_DEBIAN_PLUGIN-FREEIPMI_PACKAGE_PREDEPENDS "adduser") set(CPACK_DEBIAN_PLUGIN-FREEIPMI_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/freeipmi/preinst;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/freeipmi/postinst") + "${PKG_FILES_PATH}/deb/plugin-freeipmi/preinst;" + "${PKG_FILES_PATH}/deb/plugin-freeipmi/postinst") set(CPACK_DEBIAN_PLUGIN-FREEIPMI_DEBUGINFO_PACKAGE On) @@ -274,8 +274,8 @@ set(CPACK_DEBIAN_PLUGIN-GO_PACKAGE_PREDEPENDS "libcap2-bin, adduser") set(CPACK_DEBIAN_PLUGIN-GO_PACKAGE_SUGGESTS "nvme-cli") set(CPACK_DEBIAN_PLUGIN-GO_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/go.d/preinst;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/go.d/postinst") + "${PKG_FILES_PATH}/deb/plugin-go/preinst;" + "${PKG_FILES_PATH}/deb/plugin-go/postinst") set(CPACK_DEBIAN_PLUGIN-GO_DEBUGINFO_PACKAGE Off) @@ -294,8 +294,8 @@ set(CPACK_DEBIAN_PLUGIN-LOGS-MANAGEMENT_PACKAGE_SECTION "net") set(CPACK_DEBIAN_PLUGIN-LOGS-MANAGEMENT_PACKAGE_PREDEPENDS "libcap2-bin, adduser") set(CPACK_DEBIAN_PLUGIN-LOGS-MANAGEMENT_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/logs-management/preinst;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/logs-management/postinst") + "${PKG_FILES_PATH}/deb/plugin-logs-management/preinst;" + "${PKG_FILES_PATH}/deb/plugin-logs-management/postinst") set(CPACK_DEBIAN_PLUGIN-LOGS-MANAGEMENT_DEBUGINFO_PACKAGE On) @@ -316,8 +316,8 @@ set(CPACK_DEBIAN_PLUGIN-NETWORK-VIEWER_PACKAGE_PREDEPENDS "libcap2-bin, adduser" set(CPACK_DEBIAN_PLUGIN-NETWORK-VIEWER_PACKAGE_RECOMMENDS "netdata-plugin-ebpf (= ${CPACK_PACKAGE_VERSION})") set(CPACK_DEBIAN_PLUGIN-NETWORK-VIEWER_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/network-viewer/preinst;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/network-viewer/postinst") + "${PKG_FILES_PATH}/deb/plugin-network-viewer/preinst;" + "${PKG_FILES_PATH}/deb/plugin-network-viewer/postinst") set(CPACK_DEBIAN_PLUGIN-NETWORK-VIEWER_DEBUGINFO_PACKAGE On) @@ -337,8 +337,8 @@ set(CPACK_DEBIAN_PLUGIN-NFACCT_PACKAGE_CONFLICTS "netdata (<< 1.40)") set(CPACK_DEBIAN_PLUGIN-NFACCT_PACKAGE_PREDEPENDS "adduser") set(CPACK_DEBIAN_PLUGIN-NFACCT_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/nfacct/preinst;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/nfacct/postinst") + "${PKG_FILES_PATH}/deb/plugin-nfacct/preinst;" + "${PKG_FILES_PATH}/deb/plugin-nfacct/postinst") set(CPACK_DEBIAN_PLUGIN-NFACCT_DEBUGINFO_PACKAGE On) @@ -358,8 +358,8 @@ set(CPACK_DEBIAN_PLUGIN-PERF_PACKAGE_CONFLICTS "netdata (<< 1.40)") set(CPACK_DEBIAN_PLUGIN-PERF_PACKAGE_PREDEPENDS "libcap2-bin, adduser") set(CPACK_DEBIAN_PLUGIN-PERF_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/perf/preinst;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/perf/postinst") + "${PKG_FILES_PATH}/deb/plugin-perf/preinst;" + "${PKG_FILES_PATH}/deb/plugin-perf/postinst") set(CPACK_DEBIAN_PLUGIN-PERF_DEBUGINFO_PACKAGE On) @@ -383,8 +383,8 @@ set(CPACK_DEBIAN_PLUGIN-PYTHOND_PACHAGE_DEPENDS "python3") set(CPACK_DEBIAN_PLUGIN-PYTHOND_PACKAGE_ARCHITECTURE "all") set(CPACK_DEBIAN_PLUGIN-PYTHOND_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/python.d/preinst;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/python.d/postinst") + "${PKG_FILES_PATH}/deb/plugin-pythond/preinst;" + "${PKG_FILES_PATH}/deb/plugin-pythond/postinst") set(CPACK_DEBIAN_PLUGIN-PYTHOND_DEBUGINFO_PACKAGE Off) @@ -404,8 +404,8 @@ set(CPACK_DEBIAN_PLUGIN-SLABINFO_PACKAGE_CONFLICTS "netdata (<< 1.40)") set(CPACK_DEBIAN_PLUGIN-SLABINFO_PACKAGE_PREDEPENDS "libcap2-bin, adduser") set(CPACK_DEBIAN_PLUGIN-SLABINFO_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/slabinfo/preinst;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/slabinfo/postinst") + "${PKG_FILES_PATH}/deb/plugin-slabinfo/preinst;" + "${PKG_FILES_PATH}/deb/plugin-slabinfo/postinst") set(CPACK_DEBIAN_PLUGIN-SLABINFO_DEBUGINFO_PACKAGE On) @@ -424,8 +424,8 @@ set(CPACK_DEBIAN_PLUGIN-SYSTEMD-JOURNAL_PACKAGE_SECTION "net") set(CPACK_DEBIAN_PLUGIN-SYSTEMD-JOURNAL_PACKAGE_PREDEPENDS "libcap2-bin, adduser") set(CPACK_DEBIAN_PLUGIN-SYSTEMD-JOURNAL_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/systemd-journal/preinst;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/systemd-journal/postinst") + "${PKG_FILES_PATH}/deb/plugin-systemd-journal/preinst;" + "${PKG_FILES_PATH}/deb/plugin-systemd-journal/postinst") set(CPACK_DEBIAN_PLUGIN-SYSTEMD_JOURNAL_DEBUGINFO_PACKAGE On) @@ -445,8 +445,8 @@ set(CPACK_DEBIAN_PLUGIN-XENSTAT_PACKAGE_CONFLICTS "netdata (<< 1.40)") set(CPACK_DEBIAN_PLUGIN-XENSTAT_PACKAGE_PREDEPENDS "adduser") set(CPACK_DEBIAN_PLUGIN-XENSTAT_PACKAGE_CONTROL_EXTRA - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/xenstat/preinst;" - "${CMAKE_SOURCE_DIR}/packaging/cmake/control/xenstat/postinst") + "${PKG_FILES_PATH}/deb/plugin-xenstat/preinst;" + "${PKG_FILES_PATH}/deb/plugin-xenstat/postinst") set(CPACK_DEBIAN_PLUGIN-XENSTAT_DEBUGINFO_PACKAGE On) diff --git a/packaging/cmake/control/copyright b/packaging/cmake/pkg-files/copyright similarity index 100% rename from packaging/cmake/control/copyright rename to packaging/cmake/pkg-files/copyright diff --git a/packaging/cmake/control/ebpf-code-legacy/postinst b/packaging/cmake/pkg-files/deb/ebpf-code-legacy/postinst similarity index 100% rename from packaging/cmake/control/ebpf-code-legacy/postinst rename to packaging/cmake/pkg-files/deb/ebpf-code-legacy/postinst diff --git a/packaging/cmake/control/apps/preinst b/packaging/cmake/pkg-files/deb/ebpf-code-legacy/preinst similarity index 100% rename from packaging/cmake/control/apps/preinst rename to packaging/cmake/pkg-files/deb/ebpf-code-legacy/preinst diff --git a/packaging/cmake/control/netdata/conffiles b/packaging/cmake/pkg-files/deb/netdata/conffiles similarity index 100% rename from packaging/cmake/control/netdata/conffiles rename to packaging/cmake/pkg-files/deb/netdata/conffiles diff --git a/packaging/cmake/control/netdata/etc/default/netdata b/packaging/cmake/pkg-files/deb/netdata/etc/default/netdata similarity index 100% rename from packaging/cmake/control/netdata/etc/default/netdata rename to packaging/cmake/pkg-files/deb/netdata/etc/default/netdata diff --git a/packaging/cmake/control/netdata/etc/init.d/netdata b/packaging/cmake/pkg-files/deb/netdata/etc/init.d/netdata similarity index 100% rename from packaging/cmake/control/netdata/etc/init.d/netdata rename to packaging/cmake/pkg-files/deb/netdata/etc/init.d/netdata diff --git a/packaging/cmake/control/netdata/postinst b/packaging/cmake/pkg-files/deb/netdata/postinst similarity index 100% rename from packaging/cmake/control/netdata/postinst rename to packaging/cmake/pkg-files/deb/netdata/postinst diff --git a/packaging/cmake/control/netdata/postrm b/packaging/cmake/pkg-files/deb/netdata/postrm similarity index 100% rename from packaging/cmake/control/netdata/postrm rename to packaging/cmake/pkg-files/deb/netdata/postrm diff --git a/packaging/cmake/control/netdata/preinst b/packaging/cmake/pkg-files/deb/netdata/preinst similarity index 100% rename from packaging/cmake/control/netdata/preinst rename to packaging/cmake/pkg-files/deb/netdata/preinst diff --git a/packaging/cmake/control/apps/postinst b/packaging/cmake/pkg-files/deb/plugin-apps/postinst similarity index 100% rename from packaging/cmake/control/apps/postinst rename to packaging/cmake/pkg-files/deb/plugin-apps/postinst diff --git a/packaging/cmake/control/charts.d/preinst b/packaging/cmake/pkg-files/deb/plugin-apps/preinst similarity index 100% rename from packaging/cmake/control/charts.d/preinst rename to packaging/cmake/pkg-files/deb/plugin-apps/preinst diff --git a/packaging/cmake/control/charts.d/postinst b/packaging/cmake/pkg-files/deb/plugin-chartsd/postinst similarity index 100% rename from packaging/cmake/control/charts.d/postinst rename to packaging/cmake/pkg-files/deb/plugin-chartsd/postinst diff --git a/packaging/cmake/control/cups/preinst b/packaging/cmake/pkg-files/deb/plugin-chartsd/preinst similarity index 100% rename from packaging/cmake/control/cups/preinst rename to packaging/cmake/pkg-files/deb/plugin-chartsd/preinst diff --git a/packaging/cmake/control/cups/postinst b/packaging/cmake/pkg-files/deb/plugin-cups/postinst similarity index 100% rename from packaging/cmake/control/cups/postinst rename to packaging/cmake/pkg-files/deb/plugin-cups/postinst diff --git a/packaging/cmake/control/debugfs/preinst b/packaging/cmake/pkg-files/deb/plugin-cups/preinst similarity index 100% rename from packaging/cmake/control/debugfs/preinst rename to packaging/cmake/pkg-files/deb/plugin-cups/preinst diff --git a/packaging/cmake/control/debugfs/postinst b/packaging/cmake/pkg-files/deb/plugin-debugfs/postinst similarity index 100% rename from packaging/cmake/control/debugfs/postinst rename to packaging/cmake/pkg-files/deb/plugin-debugfs/postinst diff --git a/packaging/cmake/control/ebpf-code-legacy/preinst b/packaging/cmake/pkg-files/deb/plugin-debugfs/preinst similarity index 100% rename from packaging/cmake/control/ebpf-code-legacy/preinst rename to packaging/cmake/pkg-files/deb/plugin-debugfs/preinst diff --git a/packaging/cmake/control/ebpf.d/postinst b/packaging/cmake/pkg-files/deb/plugin-ebpf/postinst similarity index 100% rename from packaging/cmake/control/ebpf.d/postinst rename to packaging/cmake/pkg-files/deb/plugin-ebpf/postinst diff --git a/packaging/cmake/control/ebpf.d/preinst b/packaging/cmake/pkg-files/deb/plugin-ebpf/preinst similarity index 100% rename from packaging/cmake/control/ebpf.d/preinst rename to packaging/cmake/pkg-files/deb/plugin-ebpf/preinst diff --git a/packaging/cmake/control/freeipmi/postinst b/packaging/cmake/pkg-files/deb/plugin-freeipmi/postinst similarity index 100% rename from packaging/cmake/control/freeipmi/postinst rename to packaging/cmake/pkg-files/deb/plugin-freeipmi/postinst diff --git a/packaging/cmake/control/freeipmi/preinst b/packaging/cmake/pkg-files/deb/plugin-freeipmi/preinst similarity index 100% rename from packaging/cmake/control/freeipmi/preinst rename to packaging/cmake/pkg-files/deb/plugin-freeipmi/preinst diff --git a/packaging/cmake/control/go.d/postinst b/packaging/cmake/pkg-files/deb/plugin-go/postinst similarity index 100% rename from packaging/cmake/control/go.d/postinst rename to packaging/cmake/pkg-files/deb/plugin-go/postinst diff --git a/packaging/cmake/control/go.d/preinst b/packaging/cmake/pkg-files/deb/plugin-go/preinst similarity index 100% rename from packaging/cmake/control/go.d/preinst rename to packaging/cmake/pkg-files/deb/plugin-go/preinst diff --git a/packaging/cmake/control/logs-management/postinst b/packaging/cmake/pkg-files/deb/plugin-logs-management/postinst similarity index 100% rename from packaging/cmake/control/logs-management/postinst rename to packaging/cmake/pkg-files/deb/plugin-logs-management/postinst diff --git a/packaging/cmake/control/logs-management/preinst b/packaging/cmake/pkg-files/deb/plugin-logs-management/preinst similarity index 100% rename from packaging/cmake/control/logs-management/preinst rename to packaging/cmake/pkg-files/deb/plugin-logs-management/preinst diff --git a/packaging/cmake/control/network-viewer/postinst b/packaging/cmake/pkg-files/deb/plugin-network-viewer/postinst similarity index 100% rename from packaging/cmake/control/network-viewer/postinst rename to packaging/cmake/pkg-files/deb/plugin-network-viewer/postinst diff --git a/packaging/cmake/control/network-viewer/preinst b/packaging/cmake/pkg-files/deb/plugin-network-viewer/preinst similarity index 100% rename from packaging/cmake/control/network-viewer/preinst rename to packaging/cmake/pkg-files/deb/plugin-network-viewer/preinst diff --git a/packaging/cmake/control/nfacct/postinst b/packaging/cmake/pkg-files/deb/plugin-nfacct/postinst similarity index 100% rename from packaging/cmake/control/nfacct/postinst rename to packaging/cmake/pkg-files/deb/plugin-nfacct/postinst diff --git a/packaging/cmake/control/nfacct/preinst b/packaging/cmake/pkg-files/deb/plugin-nfacct/preinst similarity index 100% rename from packaging/cmake/control/nfacct/preinst rename to packaging/cmake/pkg-files/deb/plugin-nfacct/preinst diff --git a/packaging/cmake/control/perf/postinst b/packaging/cmake/pkg-files/deb/plugin-perf/postinst similarity index 100% rename from packaging/cmake/control/perf/postinst rename to packaging/cmake/pkg-files/deb/plugin-perf/postinst diff --git a/packaging/cmake/control/perf/preinst b/packaging/cmake/pkg-files/deb/plugin-perf/preinst similarity index 100% rename from packaging/cmake/control/perf/preinst rename to packaging/cmake/pkg-files/deb/plugin-perf/preinst diff --git a/packaging/cmake/control/python.d/postinst b/packaging/cmake/pkg-files/deb/plugin-pythond/postinst similarity index 100% rename from packaging/cmake/control/python.d/postinst rename to packaging/cmake/pkg-files/deb/plugin-pythond/postinst diff --git a/packaging/cmake/control/python.d/preinst b/packaging/cmake/pkg-files/deb/plugin-pythond/preinst similarity index 100% rename from packaging/cmake/control/python.d/preinst rename to packaging/cmake/pkg-files/deb/plugin-pythond/preinst diff --git a/packaging/cmake/control/slabinfo/postinst b/packaging/cmake/pkg-files/deb/plugin-slabinfo/postinst similarity index 100% rename from packaging/cmake/control/slabinfo/postinst rename to packaging/cmake/pkg-files/deb/plugin-slabinfo/postinst diff --git a/packaging/cmake/control/slabinfo/preinst b/packaging/cmake/pkg-files/deb/plugin-slabinfo/preinst similarity index 100% rename from packaging/cmake/control/slabinfo/preinst rename to packaging/cmake/pkg-files/deb/plugin-slabinfo/preinst diff --git a/packaging/cmake/control/systemd-journal/postinst b/packaging/cmake/pkg-files/deb/plugin-systemd-journal/postinst similarity index 100% rename from packaging/cmake/control/systemd-journal/postinst rename to packaging/cmake/pkg-files/deb/plugin-systemd-journal/postinst diff --git a/packaging/cmake/control/systemd-journal/preinst b/packaging/cmake/pkg-files/deb/plugin-systemd-journal/preinst similarity index 100% rename from packaging/cmake/control/systemd-journal/preinst rename to packaging/cmake/pkg-files/deb/plugin-systemd-journal/preinst diff --git a/packaging/cmake/control/xenstat/postinst b/packaging/cmake/pkg-files/deb/plugin-xenstat/postinst similarity index 100% rename from packaging/cmake/control/xenstat/postinst rename to packaging/cmake/pkg-files/deb/plugin-xenstat/postinst diff --git a/packaging/cmake/control/xenstat/preinst b/packaging/cmake/pkg-files/deb/plugin-xenstat/preinst similarity index 100% rename from packaging/cmake/control/xenstat/preinst rename to packaging/cmake/pkg-files/deb/plugin-xenstat/preinst