0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-04-07 06:45:39 +00:00

Fix RPM repoconfig naming ()

Fix naming of RPM repository configuration packages.
This commit is contained in:
Austin S. Hemmelgarn 2024-06-25 07:11:07 -04:00 committed by GitHub
parent 70082e868e
commit 6ec0651473
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 3 deletions

View file

@ -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 3)
set(PACKAGE_RELEASE 1)
set(PACKAGE_RELEASE 2)
set(CPACK_THREADS 0)
set(CPACK_STRIP_FILES NO)
@ -247,10 +247,10 @@ elseif(${DISTRO} IN_LIST RPM_DISTROS)
set(CPACK_RPM_PACKAGE_VERSION "${PACKAGE_VERSION}")
set(CPACK_RPM_PACKAGE_RELEASE "${PACKAGE_RELEASE}")
set(CPACK_RPM_PACKAGE_CHANGELOG "${CMAKE_SOURCE_DIR}/rpm.changelog")
set(CPACK_RPM_NETDATA-REPO_FILE_NAME "netdata-repo-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.rpm")
set(CPACK_RPM_NETDATA-REPO_FILE_NAME "netdata-repo-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.noarch.rpm")
set(CPACK_RPM_NETDATA-REPO_PACKAGE_NAME "netdata-repo")
set(CPACK_RPM_NETDATA-REPO_PACAKGE_CONFLICTS "netdata-repo-edge")
set(CPACK_RPM_NETDATA-REPO-EDGE_FILE_NAME "netdata-repo-edge-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.rpm")
set(CPACK_RPM_NETDATA-REPO-EDGE_FILE_NAME "netdata-repo-edge-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.noarch.rpm")
set(CPACK_RPM_NETDATA-REPO-EDGE_PACKAGE_NAME "netdata-repo-edge")
set(CPACK_RPM_NETDATA-REPO-EDGE_PACKAGE_CONFLICTS "netdata-repo")
else()

View file

@ -1,3 +1,9 @@
@PKG_NAME@ (3-2) unstable; urgency=medium
* Version bump to keep in sync with RPM repo packages
-- Netdata Builder <bot@netdata.cloud> Mon, 24 Jun 2024 07:54:00 -0400
@PKG_NAME@ (3-1) unstable; urgency=medium
* Migrate to CPack for package builds

View file

@ -1,3 +1,5 @@
* Mon Jun 24 2024 Austin Hemmelgarn <austin@netdata.cloud> 3-2
- Fix package file names.
* Fri Jun 14 2024 Austin Hemmelgarn <austin@netdata.cloud> 3-1
- Migrate package build infrastructure to CPack.
* Wed Apr 10 2024 Paul Szymanski <mail@pszy.de> 2-3