diff --git a/packaging/repoconfig/CMakeLists.txt b/packaging/repoconfig/CMakeLists.txt index 54ac3c4948..b5be420771 100644 --- a/packaging/repoconfig/CMakeLists.txt +++ b/packaging/repoconfig/CMakeLists.txt @@ -10,7 +10,7 @@ list(APPEND DEB_DISTROS debian ubuntu) set(DEB_GPG_KEY_SOURCE "https://repo.netdata.cloud/netdatabot.gpg.key") set(PACKAGE_VERSION 4) -set(PACKAGE_RELEASE 1) +set(PACKAGE_RELEASE 2) set(CPACK_THREADS 0) set(CPACK_STRIP_FILES NO) @@ -149,6 +149,16 @@ if(${DISTRO} IN_LIST DEB_DISTROS) COMMENT "Dearmor ${CMAKE_BINARY_DIR}/netdatabot.gpg.key" DEPENDS ${CMAKE_BINARY_DIR}/netdata.gpg) + install(FILES ${CMAKE_SOURCE_DIR}/netdata-deb-repo-priority + DESTINATION etc/apt/preferences.d + RENAME 80netdata + COMPONENT netdata-repo) + + install(FILES ${CMAKE_SOURCE_DIR}/netdata-deb-repo-priority + DESTINATION etc/apt/preferences.d + RENAME 80netdata + COMPONENT netdata-repo-edge) + install(FILES ${CMAKE_BINARY_DIR}/netdata.gpg DESTINATION usr/share/keyrings RENAME netdata-archive-keyring.gpg diff --git a/packaging/repoconfig/deb.changelog b/packaging/repoconfig/deb.changelog index 28f44705fb..ded6a6a4c8 100644 --- a/packaging/repoconfig/deb.changelog +++ b/packaging/repoconfig/deb.changelog @@ -1,3 +1,9 @@ +@PKG_NAME@ (4-2) unstable; urgency=medium + + * Add priority configuration for repositories + + -- Austin Hemmelgarn <austin@netdata.cloud> Mon, 24 Feb 2025 09:42:00 -0500 + @PKG_NAME@ (4-1) unstable; urgency=medium * Update repositories to new subdomain diff --git a/packaging/repoconfig/netdata-deb-repo-priority b/packaging/repoconfig/netdata-deb-repo-priority new file mode 100644 index 0000000000..881483df0d --- /dev/null +++ b/packaging/repoconfig/netdata-deb-repo-priority @@ -0,0 +1,3 @@ +Package: * +Pin: origin "repository.netdata.cloud" +Priority: 1000 diff --git a/packaging/repoconfig/rpm.changelog b/packaging/repoconfig/rpm.changelog index 7469eb26f0..4cf6ed09c1 100644 --- a/packaging/repoconfig/rpm.changelog +++ b/packaging/repoconfig/rpm.changelog @@ -1,3 +1,5 @@ +* Mon Feb 24 2025 Austin Hemmelgarn <austin@netdata.cloud> 4-2 +- Version bump to stay in sync with DEB packages. * Thu Oct 31 2024 Austin Hemmelgarn <austin@netdata.cloud> 4-1 - Switch repos to new subdomain. * Thu Sep 17 2024 Austin Hemmelgarn <austin@netdata.cloud> 3-5