Fix RPM repoconfig naming (#18003)
Fix naming of RPM repository configuration packages.
Austin S. Hemmelgarn committed
Jun 25, 2024 at 07:11 UTC
6ec06514737a71519d756c42b40905e1a2906f71
3 files changed
+11
-3
packaging/repoconfig/CMakeLists.txt
+3
-3
@@ -10,7 +10,7 @@ list(APPEND DEB_DISTROS debian ubuntu)
10
set(DEB_GPG_KEY_SOURCE "https://repo.netdata.cloud/netdatabot.gpg.key")
11
12
set(PACKAGE_VERSION 3)
13
-set(PACKAGE_RELEASE 1)
13
+set(PACKAGE_RELEASE 2)
14
15
set(CPACK_THREADS 0)
16
set(CPACK_STRIP_FILES NO)
@@ -247,10 +247,10 @@ elseif(${DISTRO} IN_LIST RPM_DISTROS)
247
set(CPACK_RPM_PACKAGE_VERSION "${PACKAGE_VERSION}")
248
set(CPACK_RPM_PACKAGE_RELEASE "${PACKAGE_RELEASE}")
249
set(CPACK_RPM_PACKAGE_CHANGELOG "${CMAKE_SOURCE_DIR}/rpm.changelog")
250
- set(CPACK_RPM_NETDATA-REPO_FILE_NAME "netdata-repo-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.rpm")
250
+ set(CPACK_RPM_NETDATA-REPO_FILE_NAME "netdata-repo-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.noarch.rpm")
251
set(CPACK_RPM_NETDATA-REPO_PACKAGE_NAME "netdata-repo")
252
set(CPACK_RPM_NETDATA-REPO_PACAKGE_CONFLICTS "netdata-repo-edge")
253
- set(CPACK_RPM_NETDATA-REPO-EDGE_FILE_NAME "netdata-repo-edge-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.rpm")
253
+ set(CPACK_RPM_NETDATA-REPO-EDGE_FILE_NAME "netdata-repo-edge-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.noarch.rpm")
254
set(CPACK_RPM_NETDATA-REPO-EDGE_PACKAGE_NAME "netdata-repo-edge")
255
set(CPACK_RPM_NETDATA-REPO-EDGE_PACKAGE_CONFLICTS "netdata-repo")
256
else()
packaging/repoconfig/deb.changelog
+6
@@ -1,3 +1,9 @@
1
+@PKG_NAME@ (3-2) unstable; urgency=medium
2
+
3
+ * Version bump to keep in sync with RPM repo packages
4
+
5
+ -- Netdata Builder <bot@netdata.cloud> Mon, 24 Jun 2024 07:54:00 -0400
6
+
7
@PKG_NAME@ (3-1) unstable; urgency=medium
8
9
* Migrate to CPack for package builds
packaging/repoconfig/rpm.changelog
+2
@@ -1,3 +1,5 @@
1
+* Mon Jun 24 2024 Austin Hemmelgarn <austin@netdata.cloud> 3-2
2
+- Fix package file names.
3
* Fri Jun 14 2024 Austin Hemmelgarn <austin@netdata.cloud> 3-1
4
- Migrate package build infrastructure to CPack.
5
* Wed Apr 10 2024 Paul Szymanski <mail@pszy.de> 2-3