Switch to DEB822 format for APT repository configuration. (#18374)
* Switch to DEB822 format for APT repository configuration. * Fix typos.
Austin S. Hemmelgarn committed
Aug 20, 2024 at 07:02 UTC
77b672566611a7959c7e4e1e010611331ff6a74c
5 files changed
+32
-21
packaging/repoconfig/CMakeLists.txt
+9
-19
@@ -1,6 +1,6 @@
1
# SPDX-License-Identifier: GPL-3.0-or-later
2
3
-cmake_minimum_required(VERSION 3.13.0...3.28)
3
+cmake_minimum_required(VERSION 3.16.0...3.30)
4
5
list(APPEND RHEL_DISTROS centos centos-stream rocky almalinux cloudlinux)
6
list(APPEND SUSE_DISTROS opensuse-leap opensuse-tumbleweed)
@@ -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 2)
13
+set(PACKAGE_RELEASE 4)
14
15
set(CPACK_THREADS 0)
16
set(CPACK_STRIP_FILES NO)
@@ -117,10 +117,10 @@ if(${DISTRO} IN_LIST DEB_DISTROS)
117
set(DIST_NAME ${DISTRO})
118
message(STATUS "Generating stable repository configuration for ${DISTRO} ${SUITE}")
119
set(VARIANT stable)
120
- configure_file(netdata.list.in netdata.list @ONLY)
120
+ configure_file(netdata.sources.in netdata.sources @ONLY)
121
message(STATUS "Generating edge repository configuration for ${DISTRO} ${SUITE}")
122
set(VARIANT edge)
123
- configure_file(netdata.list.in netdata-edge.list @ONLY)
123
+ configure_file(netdata.sources.in netdata-edge.sources @ONLY)
124
message(STATUS "Preparing changelogs")
125
set(PKG_NAME netdata-repo)
126
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/netdata-repo)
@@ -129,10 +129,10 @@ if(${DISTRO} IN_LIST DEB_DISTROS)
129
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/netdata-repo-edge)
130
configure_file(deb.changelog netdata-repo-edge/changelog @ONLY)
131
132
- install(FILES ${CMAKE_BINARY_DIR}/netdata.list
132
+ install(FILES ${CMAKE_BINARY_DIR}/netdata.sources
133
DESTINATION etc/apt/sources.list.d
134
COMPONENT netdata-repo)
135
- install(FILES ${CMAKE_BINARY_DIR}/netdata-edge.list
135
+ install(FILES ${CMAKE_BINARY_DIR}/netdata-edge.sources
136
DESTINATION etc/apt/sources.list.d
137
COMPONENT netdata-repo-edge)
138
@@ -150,24 +150,14 @@ if(${DISTRO} IN_LIST DEB_DISTROS)
150
DEPENDS ${CMAKE_BINARY_DIR}/netdata.gpg)
151
152
install(FILES ${CMAKE_BINARY_DIR}/netdata.gpg
153
- DESTINATION etc/apt/trusted.gpg.d
153
+ DESTINATION usr/share/keyrings
154
RENAME netdata-archive-keyring.gpg
155
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
156
COMPONENT netdata-repo)
157
- install(FILES ${CMAKE_BINARY_DIR}/netdata.gpg
158
- DESTINATION etc/apt/trusted.gpg.d
159
- RENAME netdata-repoconfig-archive-keyring.gpg
160
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
161
- COMPONENT netdata-repo)
157
158
install(FILES ${CMAKE_BINARY_DIR}/netdata.gpg
164
- DESTINATION etc/apt/trusted.gpg.d
165
- RENAME netdata-edge-archive-keyring.gpg
166
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
167
- COMPONENT netdata-repo-edge)
168
- install(FILES ${CMAKE_BINARY_DIR}/netdata.gpg
169
- DESTINATION etc/apt/trusted.gpg.d
170
- RENAME netdata-repoconfig-archive-keyring.gpg
159
+ DESTINATION usr/share/keyrings
160
+ RENAME netdata-archive-keyring.gpg
161
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
162
COMPONENT netdata-repo-edge)
163
packaging/repoconfig/deb.changelog
+6
@@ -1,3 +1,9 @@
1
+@PKG_NAME@ (3-4) unstable; urgency=medium
2
+
3
+ * Convert sources to DEB822 format
4
+
5
+ -- Netdata Builder <bot@netdata.cloud> Mon, 19 Aug 2024 07:49:00 -0400
6
+
7
@PKG_NAME@ (3-3) unstable; urgency=medium
8
9
* Version bump to keep in sync with RPM repo packages
packaging/repoconfig/netdata.list.in
deleted
-2
@@ -1,2 +0,0 @@
1
-deb http://repo.netdata.cloud/repos/@VARIANT@/@DIST_NAME@/ @SUITE@/
2
-deb http://repo.netdata.cloud/repos/repoconfig/@DIST_NAME@/ @SUITE@/
packaging/repoconfig/netdata.sources.in
new
+15
@@ -0,0 +1,15 @@
1
+X-Repolib-Name: Netdata @VARIANT@ repository
2
+Types: deb
3
+URIs: http://repo.netdata.cloud/repos/@VARIANT@/@DIST_NAME@/
4
+Suites: @SUITE@/
5
+Signed-By: /usr/share/keyrings/netdata-archive-keyring.gpg
6
+By-Hash: No
7
+Enabled: Yes
8
+
9
+X-Repolib-Name: Netdata repository configuration repository
10
+Types: deb
11
+URIs: http://repo.netdata.cloud/repos/repoconfig/@DIST_NAME@/
12
+Suites: @SUITE@/
13
+Signed-By: /usr/share/keyrings/netdata-archive-keyring.gpg
14
+By-Hash: No
15
+Enabled: Yes
packaging/repoconfig/rpm.changelog
+2
@@ -1,3 +1,5 @@
1
+* Mon Aug 19 2024 Austin Hemmelgarn <austin@netdata.cloud
2
+- Version bump to stay in sync with DEB packages.
3
* Fri Aug 9 2024 Austin Hemmelgarn <austin@netdata.cloud> 3-3
4
- Use system certificate config for Yum/DNF repos.
5
* Mon Jun 24 2024 Austin Hemmelgarn <austin@netdata.cloud> 3-2