Fix logic for determining when to use $releasever_major. (#21610)
* Fix logic for determining when to use $releasever_major. Instead of using it on any version of RHEL greater than 8.0, it needs to be used for any version greater than or equal to 9.0. * Update packaging/repoconfig/rpm.changelog Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com> --------- Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
Austin S. Hemmelgarn committed
Jan 22, 2026 at 08:42 UTC
722d85b1504bbbfc1890b8f7a4d6aef03552138e
3 files changed
+13
-5
packaging/repoconfig/CMakeLists.txt
+4
-4
@@ -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 5)
13
-set(PACKAGE_RELEASE 3)
13
+set(PACKAGE_RELEASE 4)
14
15
set(CPACK_THREADS 0)
16
set(CPACK_STRIP_FILES NO)
@@ -219,11 +219,11 @@ elseif(${DISTRO} IN_LIST RPM_DISTROS)
219
endif()
220
elseif(${DISTRO} STREQUAL "rhel")
221
set(DIST_NAME "el")
222
+ set(CPACK_RPM_PACKAGE_REQUIRES "epel-release")
223
223
- if(${DISTRO_VERSION} VERSION_LESS_EQUAL 8)
224
+ if(${DISTRO_VERSION} VERSION_LESS 8)
225
set(CPACK_RPM_PACKAGE_REQUIRES "yum-plugin-priorities, epel-release")
225
- else()
226
- set(CPACK_RPM_PACKAGE_REQUIRES "epel-release")
226
+ elseif(${DISTRO_VERSION} VERSION_GREATER_EQUAL 9)
227
set(DIST_VERSION "$releasever_major")
228
endif()
229
endif()
packaging/repoconfig/deb.changelog
+6
@@ -1,3 +1,9 @@
1
+@PKG_NAME@ (5-4) unstable; urgency=medium
2
+
3
+ * Version bump to keep in sync with RPM repo packages
4
+
5
+ -- Austin Hemmelgarn <austin@netdata.cloud> Thu, 22 Jan 2026 07:21:00 -0500
6
+
7
@PKG_NAME@ (5-3) unstable; urgency=medium
8
9
* Version bump to keep in sync with RPM repo packages
packaging/repoconfig/rpm.changelog
+3
-1
@@ -1,4 +1,6 @@
1
-* Tue Jan 20 2025 Austin Hemmelgarn <austin@netdata.cloud> 5-3
1
+* Thu Jan 22 2026 Austin Hemmelgarn <austin@netdata.cloud> 5-4
2
+- Fix logic for usage of $releasever_major.
3
+* Tue Jan 20 2026 Austin Hemmelgarn <austin@netdata.cloud> 5-3
4
- Use $releasever_major instead of $releasever in repo URLs when supported.
5
* Thu Nov 13 2025 Austin Hemmelgarn <austin@netdata.cloud> 5-2
6
- Fix repository URLs for openSUSE Tumbleweed.