@cryptotaxi247 / netdata-1 / commits / 5217023dc

Move to using CPack for repository configuration packages. (#17930)

* Move to using CPack for repository configuration packages. This simplifies testing of changes to the configuration itself, as well as making package builds marginally faster. * Fix CMake handling for old RPM distros. * Fix openSUSE detection. * Fix file installation. * Override code ownership for packaging/repoconfig/CMakeLists.txt This way changes won’t bother people who aren’t actually responsible for it. * Update CI skip logic to work correctly with new repoconfig setup. * Add improved status messages.

Austin S. Hemmelgarn committed Jun 18, 2024 at 08:43 UTC 5217023dcdfc77db03d6da1253bc06fb4bb6f1ce
33 files changed +357 -475
.github/CODEOWNERS
+1
@@ -47,6 +47,7 @@ CMakeLists.txt @netdata/agent-sre @vkalintiris
47 netdata.spec.in @netdata/agent-sre
48 netdata-installer.sh @netdata/agent-sre
49 packaging/version @netdatabot @netdata/agent-sre
50 +packaging/repoconfig/CMakelists.txt @netdata/agent-sre
51
52 LICENSE.md @netdata/agent-sre @vkalintiris
53 CHANGELOG.md @netdatabot @netdata/agent-sre
.github/scripts/package-upload.sh
+2 -1
@@ -9,11 +9,12 @@ distro="${2}"
9 arch="${3}"
10 format="${4}"
11 repo="${5}"
12 +pkg_src="${6:-./artifacts}"
13
14 staging="${TMPDIR:-/tmp}/package-staging"
15 prefix="/home/netdatabot/incoming/${repo}/"
16
16 -packages="$(find artifacts -name "*.${format}")"
17 +packages="$(find "${pkg_src}" -name "*.${format}")"
18
19 mkdir -p "${staging}"
20
.github/workflows/build-macos.yml
+1
@@ -52,6 +52,7 @@ jobs:
52 files_ignore: |
53 netdata.spec.in
54 **/*.md
55 + packaging/repoconfig/
56 - name: List all changed files in pattern
57 continue-on-error: true
58 env:
.github/workflows/build.yml
+1
@@ -75,6 +75,7 @@ jobs:
75 packaging/*.checksums
76 files_ignore: |
77 **/*.md
78 + packaging/repoconfig/
79 - name: List all changed files in pattern
80 continue-on-error: true
81 env:
.github/workflows/checks.yml
+1
@@ -59,6 +59,7 @@ jobs:
59 packaging/*.checksums
60 files_ignore: |
61 **/*.md
62 + packaging/repoconfig/
63 - name: List all changed files in pattern
64 continue-on-error: true
65 env:
.github/workflows/docker.yml
+1
@@ -82,6 +82,7 @@ jobs:
82 packaging/*.checksums
83 files_ignore: |
84 **/*.md
85 + packaging/repoconfig/
86 - name: List all changed files in pattern
87 continue-on-error: true
88 if: github.event_name != 'workflow_dispatch'
.github/workflows/go-tests.yml
+1
@@ -36,6 +36,7 @@ jobs:
36 files_ignore: |
37 **/*.md
38 src/go/**/metadata.yaml
39 + packaging/repoconfig/
40 - name: List all changed files in pattern
41 continue-on-error: true
42 env:
.github/workflows/packaging.yml
+1
@@ -68,6 +68,7 @@ jobs:
68 src/web/server/h2o/libh2o/
69 files_ignore: |
70 **/*.md
71 + packaging/repoconfig/
72 - name: List all changed files in pattern
73 continue-on-error: true
74 env:
packaging/repoconfig/CMakeLists.txt new
+260
@@ -0,0 +1,260 @@
1 +# SPDX-License-Identifier: GPL-3.0-or-later
2 +
3 +cmake_minimum_required(VERSION 3.13.0...3.28)
4 +
5 +list(APPEND RHEL_DISTROS centos centos-stream rocky almalinux cloudlinux)
6 +list(APPEND SUSE_DISTROS opensuse-leap opensuse-tumbleweed)
7 +list(APPEND RPM_DISTROS rhel opensuse ol amzn fedora)
8 +list(APPEND DEB_DISTROS debian ubuntu)
9 +
10 +set(DEB_GPG_KEY_SOURCE "https://repo.netdata.cloud/netdatabot.gpg.key")
11 +
12 +set(PACKAGE_VERSION 3)
13 +set(PACKAGE_RELEASE 1)
14 +
15 +set(CPACK_THREADS 0)
16 +set(CPACK_STRIP_FILES NO)
17 +set(CPACK_PACKAGE_INSTALL_DIRECTORY "netdata")
18 +set(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}/packages")
19 +set(CPACK_PACKAGING_INSTALL_PREFIX "/")
20 +set(CPACK_PACKAGE_VENDOR "Netdata Inc.")
21 +set(CPACK_COMPONENT_NETDATA-REPO_PACKAGE_DESCRIPTION "Configuration for the official Netdata Stable package repository.")
22 +set(CPACK_COMPONENT_NETDATA-REPO-EDGE_PACKAGE_DESCRIPTION "Configuration for the official Netdata Edge package repository.")
23 +
24 +project(netdata-repoconfig VERSION "${PACKAGE_VERSION}.${PACKAGE_RELEASE}"
25 + DESCRIPTION "Repository configuration for Netdata’s official native packages."
26 + HOMEPAGE_URL "https://www.netdata.cloud/"
27 + LANGUAGES NONE)
28 +
29 +function(extract_release_item _variable _item)
30 + if(DEFINED "${_variable}")
31 + return()
32 + endif()
33 +
34 + if(DEFINED OS_RELEASE_FILE)
35 + else()
36 + message(CHECK_START "Searching for os-release file")
37 + find_file(OS_RELEASE_FILE os-release PATHS /etc /lib /usr/lib NO_DEFAULT_PATH)
38 + if(${OS_RELEASE_FILE} STREQUAL "OS_RELEASE_FILE-NOTFOUND")
39 + message(CHECK_FAIL "failed")
40 + message(FATAL_ERROR "Could not find os-release file")
41 + endif()
42 +
43 + message(CHECK_PASS "${OS_RELEASE_FILE}")
44 + endif()
45 +
46 + message(CHECK_START "Extracting ${_item} from ${OS_RELEASE_FILE}")
47 + execute_process(COMMAND sh -c ". ${OS_RELEASE_FILE} && printf %s $${_item}"
48 + RESULT_VARIABLE _result
49 + OUTPUT_VARIABLE _output)
50 +
51 + if(NOT ${_result} EQUAL 0)
52 + message(CHECK_FAIL "failed to parse ${OS_RELEASE_FILE}")
53 + return()
54 + elseif(${_output} STREQUAL "")
55 + message(CHECK_FAIL "variable ${_item} not defined in ${OS_RELEASE_FILE}")
56 + return()
57 + endif()
58 +
59 + message(CHECK_PASS ${_output})
60 + set(${_variable} ${_output} PARENT_SCOPE)
61 +endfunction()
62 +
63 +function(require_command _variable _cmd)
64 + if(DEFINED ${_variable})
65 + return()
66 + endif()
67 +
68 + message(CHECK_START "Looking for ${_cmd}")
69 +
70 + find_program(_result_${_cmd} ${_cmd})
71 +
72 + if(${_result_${_cmd}} STREQUAL "_result_${_cmd}-NOTFOUND")
73 + message(CHECK_FAIL "failed")
74 + message(FATAL_ERROR "Unable to find required command: ${_cmd}")
75 + endif()
76 +
77 + message(CHECK_PASS "${_result_${_cmd}}")
78 + set(${_variable} ${_result_${_cmd}} PARENT_SCOPE)
79 +endfunction()
80 +
81 +if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
82 + extract_release_item("DISTRO" ID)
83 +
84 + if(NOT DEFINED DISTRO)
85 + message(FATAL_ERROR "Failed to auto-detect distro ID")
86 + endif()
87 +
88 + extract_release_item(DISTRO_VERSION VERSION_ID)
89 +
90 + if(NOT DEFINED DISTRO_VERSION)
91 + message(FATAL_ERROR "Failed to auto-detect distro version ID.")
92 + endif()
93 +else()
94 + message(FATAL_ERROR "Repository configuration packages can only be built on Linux")
95 +endif()
96 +
97 +if(${DISTRO} IN_LIST RHEL_DISTROS)
98 + set(DISTRO "rhel")
99 +elseif(${DISTRO} STREQUAL "opensuse-leap")
100 + set(DISTRO "opensuse")
101 +elseif(${DISTRO} STREQUAL "opensuse-tumbleweed")
102 + set(DISTRO "opensuse")
103 + set(DISTRO_VERSION "tumbleweed")
104 +endif()
105 +
106 +if(${DISTRO} IN_LIST DEB_DISTROS)
107 + extract_release_item(SUITE VERSION_CODENAME)
108 +
109 + if(NOT DEFINED SUITE)
110 + message(FATAL_ERROR "Failed to determine version codename")
111 + endif()
112 +
113 + require_command(DPKG dpkg)
114 + require_command(CURL curl)
115 + require_command(GPG gpg)
116 +
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)
121 + message(STATUS "Generating edge repository configuration for ${DISTRO} ${SUITE}")
122 + set(VARIANT edge)
123 + configure_file(netdata.list.in netdata-edge.list @ONLY)
124 + message(STATUS "Preparing changelogs")
125 + set(PKG_NAME netdata-repo)
126 + file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/netdata-repo)
127 + configure_file(deb.changelog netdata-repo/changelog @ONLY)
128 + set(PKG_NAME netdata-repo-edge)
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
133 + DESTINATION etc/apt/sources.list.d
134 + COMPONENT netdata-repo)
135 + install(FILES ${CMAKE_BINARY_DIR}/netdata-edge.list
136 + DESTINATION etc/apt/sources.list.d
137 + COMPONENT netdata-repo-edge)
138 +
139 + add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/netdatabot.gpg.key
140 + COMMENT "Fetch GPG key from ${DEB_GPG_KEY_SOURCE}"
141 + COMMAND ${CURL} -f -L -o ${CMAKE_BINARY_DIR}/netdatabot.gpg.key ${DEB_GPG_KEY_SOURCE})
142 +
143 + add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/netdata.gpg
144 + COMMENT "Dearmor ${CMAKE_BINARY_DIR}/netdatabot.gpg.key"
145 + DEPENDS ${CMAKE_BINARY_DIR}/netdatabot.gpg.key
146 + COMMAND ${GPG} --dearmor --output ${CMAKE_BINARY_DIR}/netdata.gpg ${CMAKE_BINARY_DIR}/netdatabot.gpg.key)
147 + add_custom_target(dearmor_gpg_key
148 + ALL
149 + COMMENT "Dearmor ${CMAKE_BINARY_DIR}/netdatabot.gpg.key"
150 + DEPENDS ${CMAKE_BINARY_DIR}/netdata.gpg)
151 +
152 + install(FILES ${CMAKE_BINARY_DIR}/netdata.gpg
153 + DESTINATION etc/apt/trusted.gpg.d
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)
162 +
163 + 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
171 + PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
172 + COMPONENT netdata-repo-edge)
173 +
174 + set(CPACK_DEB_COMPONENT_INSTALL YES)
175 + set(CPACK_DEBIAN_DEBUGINFO_PACKAGE NO)
176 + set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS NO)
177 + set(CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS YES)
178 + set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
179 + set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Netdata Builder <bot@netdata.cloud>")
180 + set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "all")
181 + set(CPACK_DEBIAN_PACKAGE_DEPENDS "debian-keyring, gnupg")
182 + set(CPACK_DEBIAN_PACKAGE_SECTION "net")
183 + set(CPACK_DEBIAN_PACKAGE_VERSION "${PACKAGE_VERSION}")
184 + set(CPACK_DEBIAN_PACKAGE_RELEASE "${PACKAGE_RELEASE}")
185 + set(CPACK_DEBIAN_NETDATA-REPO_PACKAGE_NAME "netdata-repo")
186 + set(CPACK_DEBIAN_NETDATA-REPO-EDGE_PACKAGE_NAME "netdata-repo-edge")
187 + set(CPACK_DEBIAN_NETDATA-REPO_PACKAGE_CONFLICTS "netdata-repo-edge")
188 + set(CPACK_DEBIAN_NETDATA-REPO-EDGE_PACKAGE_CONFLICTS "netdata-repo")
189 + set(CPACK_DEBIAN_NETDATA-REPO_PACKAGE_CONTROL_EXTRA "${CMAKE_BINARY_DIR}/netdata-repo/changelog")
190 + set(CPACK_DEBIAN_NETDATA-REPO-EDGE_PACKAGE_CONTROL_EXTRA "${CMAKE_BINARY_DIR}/netdata-repo-edge/changelog")
191 +elseif(${DISTRO} IN_LIST RPM_DISTROS)
192 + require_command(RPM rpm)
193 +
194 + if(${RPM} STREQUAL "RPM-NOTFOUND")
195 + message(FATAL_ERROR "Unable to find rpm, which is required for RPM package builds.")
196 + endif()
197 +
198 + set(REPO_CFG_PATH "yum.repos.d")
199 + set(REPO_ID "dnf")
200 + set(DIST_NAME "${DISTRO}")
201 + set(DIST_VERSION "$releasever")
202 +
203 + if(${DISTRO} STREQUAL "amzn")
204 + set(DIST_NAME "amazonlinux")
205 + if(${DISTRO_VERSION} VERSION_EQUAL 2)
206 + # Nothing to do in this case, defaults work here.
207 + elseif(${DISTRO_VERSION} VERSION_EQUAL 2023)
208 + set(DIST_VERSION "2023")
209 + else()
210 + message(FATAL_ERROR "Unsupported version of Amazon Linux: ${DISTRO_VERSION}")
211 + endif()
212 + elseif(${DISTRO} STREQUAL "opensuse")
213 + set(REPO_CFG_PATH "zypp/repos.d")
214 + set(REPO_ID "zypp")
215 + set(DIST_NAME "opensuse")
216 + elseif(${DISTRO} STREQUAL "rhel")
217 + set(DIST_NAME "el")
218 +
219 + if(${DISTRO_VERSION} VERSION_LESS_EQUAL 8)
220 + set(CPACK_RPM_PACKAGE_REQUIRES "yum-plugin-priorities, epel-release")
221 + else()
222 + set(CPACK_RPM_PACKAGE_REQUIRES "epel-release")
223 + endif()
224 + endif()
225 +
226 + message(STATUS "Generating stable repository configuration for ${DISTRO} ${DISTRO_VERSION}")
227 + set(VARIANT stable)
228 + configure_file(netdata.repo.${REPO_ID} netdata.repo @ONLY)
229 + message(STATUS "Generating edge repository configuration for ${DISTRO} ${DISTRO_VERSION}")
230 + set(VARIANT edge)
231 + configure_file(netdata.repo.${REPO_ID} netdata-edge.repo @ONLY)
232 +
233 + install(FILES ${CMAKE_BINARY_DIR}/netdata.repo
234 + COMPONENT netdata-repo
235 + DESTINATION etc/${REPO_CFG_PATH})
236 + install(FILES ${CMAKE_BINARY_DIR}/netdata-edge.repo
237 + COMPONENT netdata-repo-edge
238 + DESTINATION etc/${REPO_CFG_PATH})
239 +
240 + set(CPACK_RPM_COMPONENT_INSTALL ON)
241 + set(CPACK_RPM_PACAKGE_AUTOREQPROV OFF)
242 + set(CPACK_RPM_DEBUGINFO_PACKAGE OFF)
243 + set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
244 + set(CPACK_RPM_PACKAGE_GROUP "System Environment/Base")
245 + set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST "")
246 + set(CPACK_RPM_PACKAGE_ARCHITECTURE "noarch")
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")
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")
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()
257 + message(FATAL_ERROR "Unsupported distribution ${DISTRO} ${DISTRO_VERSION}")
258 +endif()
259 +
260 +include(CPack)
packaging/repoconfig/Makefile deleted
-35
@@ -1,35 +0,0 @@
1 -FILES = netdata.list netdata-edge.list netdata-archive-keyring.gpg netdata-edge-archive-keyring.gpg netdata-repoconfig-archive-keyring.gpg
2 -
3 -all: $(FILES)
4 -
5 -netdata.list: netdata.list.in
6 - cp netdata.list.in netdata.list
7 - set -a && . /etc/os-release && sed -i -e "s/__DISTRO__/$${ID}/" -e "s/__SUITE__/$${VERSION_CODENAME}/" -e "s/__VARIANT__/stable/" netdata.list
8 -
9 -netdata-edge.list: netdata.list.in
10 - cp netdata.list.in netdata-edge.list
11 - set -a && . /etc/os-release && sed -i -e "s/__DISTRO__/$${ID}/" -e "s/__SUITE__/$${VERSION_CODENAME}/" -e "s/__VARIANT__/edge/" netdata-edge.list
12 -
13 -netdata.gpg.key:
14 - curl -L https://repo.netdata.cloud/netdatabot.gpg.key > $@
15 -
16 -netdata-archive-keyring.gpg: netdata.gpg.key
17 - gpg --dearmor > $@ < $<
18 -
19 -netdata-edge-archive-keyring.gpg: netdata.gpg.key
20 - gpg --dearmor > $@ < $<
21 -
22 -netdata-repoconfig-archive-keyring.gpg: netdata.gpg.key
23 - gpg --dearmor > $@ < $<
24 -
25 -debian/tmp:
26 - mkdir -p $@
27 -
28 -install: $(FILES) debian/tmp
29 - cp $(FILES) debian/tmp/
30 -
31 -clean:
32 - rm -f $(FILES)
33 -
34 -.PHONY: clean
35 -.INTERMEDIATE: netdatabot.gpg.key
packaging/repoconfig/build-deb.sh
+26 -29
@@ -1,49 +1,46 @@
1 #!/bin/sh
2
3 -# Extract distro info from /etc/os-release
4 -DISTVERS="$(awk -F'"' '/VERSION_ID=/ {print $2}' /etc/os-release)"
5 -DISTNAME="$(awk -F'=' '/^ID=/ {print $2}' /etc/os-release)"
3 +set -e
4 +
5 +SRC_DIR="$(CDPATH='' cd -- "$(dirname -- "${0}")" && pwd -P)"
6 +BUILD_DIR=/build
7 +DISTRO="$(awk -F'=' '/^ID=/ {print $2}' /etc/os-release)"
8 +DISTRO_VERSION="$(awk -F'"' '/VERSION_ID=/ {print $2}' /etc/os-release)"
9
10 # Needed because dpkg is stupid and tries to configure things interactively if it sees a terminal.
11 export DEBIAN_FRONTEND=noninteractive
12
10 -# Pull in our dependencies
11 -apt update || exit 1
12 -apt upgrade -y || exit 1
13 -apt install -y build-essential debhelper curl gnupg || exit 1
13 +echo "::group::Installing Build Dependencies"
14 +apt update
15 +apt upgrade -y
16 +apt install -y --no-install-recommends ca-certificates cmake ninja-build curl gnupg
17 +echo "::endgroup::"
18 +
19 +echo "::group::Building Packages"
20 +cmake -S "${SRC_DIR}" -B "${BUILD_DIR}" -G Ninja
21 +cmake --build "${BUILD_DIR}"
22
15 -# Run the builds in an isolated source directory.
16 -# This removes the need for cleanup, and ensures anything the build does
17 -# doesn't muck with the user's sources.
18 -cp -a /netdata/packaging/repoconfig /usr/src || exit 1
19 -cd /usr/src/repoconfig || exit 1
23 +cd "${BUILD_DIR}"
24 +cpack -G DEB
25 +echo "::endgroup::"
26
21 -# pre/post options are after 1.18.8, is simpler to just check help for their existence than parsing version
22 -if dpkg-buildpackage --help | grep "\-\-post\-clean" 2> /dev/null > /dev/null; then
23 - dpkg-buildpackage --post-clean --pre-clean -b -us -uc || exit 1
24 -else
25 - dpkg-buildpackage -b -us -uc || exit 1
26 -fi
27 +[ -d "${SRC_DIR}/artifacts" ] || mkdir -p "${SRC_DIR}/artifacts"
28
29 # Embed distro info in package name.
29 -# This is required to make the repo actually standards compliant wthout packageclouds hacks.
30 -distid="${DISTNAME}${DISTVERS}"
31 -for pkg in /usr/src/*.deb; do
32 - pkgname="$(basename "${pkg}" .deb)"
30 +# This is required to make the repo actually standards compliant wthout packagecloud's hacks.
31 +distid="${DISTRO}${DISTRO_VERSION}"
32 +for pkg in "${BUILD_DIR}"/packages/*.deb; do
33 + extension="${pkg##*.}"
34 + pkgname="$(basename "${pkg}" "${extension}")"
35 name="$(echo "${pkgname}" | cut -f 1 -d '_')"
36 version="$(echo "${pkgname}" | cut -f 2 -d '_')"
37 arch="$(echo "${pkgname}" | cut -f 3 -d '_')"
38
37 - newname="$(dirname "${pkg}")/${name}_${version}+${distid}_${arch}.deb"
39 + newname="${SRC_DIR}/artifacts/${name}_${version}+${distid}_${arch}${extension}"
40 mv "${pkg}" "${newname}"
41 done
42
41 -# Copy the built packages to /netdata/artifacts (which may be bind-mounted)
42 -# Also ensure /netdata/artifacts exists and create it if it doesn't
43 -[ -d /netdata/artifacts ] || mkdir -p /netdata/artifacts
44 -cp -a /usr/src/*.deb /netdata/artifacts/ || exit 1
45 -
43 # Correct ownership of the artifacts.
44 # Without this, the artifacts directory and it's contents end up owned
45 # by root instead of the local user on Linux boxes
49 -chown -R --reference=/netdata /netdata/artifacts
46 +chown -R --reference="${SRC_DIR}" "${SRC_DIR}/artifacts"
packaging/repoconfig/build-rpm.sh
+32 -12
@@ -1,26 +1,46 @@
1 #!/bin/sh
2
3 -prefix='/root/rpmbuild'
3 +set -e
4
5 +SRC_DIR="$(CDPATH='' cd -- "$(dirname -- "${0}")" && pwd -P)"
6 +BUILD_DIR=/build
7 +
8 +echo "::group::Installing Build Dependencies"
9 if command -v dnf > /dev/null ; then
10 dnf distro-sync -y --nodocs || exit 1
7 - dnf install -y --nodocs --setopt=install_weak_deps=False rpm-build || exit 1
11 + dnf install -y --nodocs --setopt=install_weak_deps=False rpm-build cmake make || exit 1
12 elif command -v yum > /dev/null ; then
13 yum distro-sync -y || exit 1
10 - yum install -y rpm-build || exit 1
14 + yum install -y rpm-build make || exit 1
15 + curl --fail -sSL --connect-timeout 20 --retry 3 --output "cmake-linux-$(uname -m).sh" "https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-linux-$(uname -m).sh" && \
16 + if [ "$(uname -m)" = "x86_64" ]; then \
17 + echo '8c449dabb2b2563ec4e6d5e0fb0ae09e729680efab71527b59015131cea4a042 cmake-linux-x86_64.sh' | sha256sum -c - ; \
18 + elif [ "$(uname -m)" = "aarch64" ]; then \
19 + echo 'a83e01ed1cdf44c2e33e0726513b9a35a8c09e3b5a126fd720b3c8a9d5552368 cmake-linux-aarch64.sh' | sha256sum -c - ; \
20 + else \
21 + echo "ARCH NOT SUPPORTED BY CMAKE" ; \
22 + exit 1 ; \
23 + fi && \
24 + chmod +x "./cmake-linux-$(uname -m).sh" && \
25 + mkdir -p /cmake && \
26 + "./cmake-linux-$(uname -m).sh" --skip-license --prefix=/cmake
27 + PATH="/cmake/bin:${PATH}"
28 elif command -v zypper > /dev/null ; then
29 zypper update -y || exit 1
13 - zypper install -y rpm-build || exit 1
14 - prefix="/usr/src/packages"
30 + zypper install -y rpm-build cmake make || exit 1
31 fi
32 +echo "::endgroup::"
33 +
34 +echo "::group::Building Packages"
35 +cmake -S "${SRC_DIR}" -B "${BUILD_DIR}"
36 +cmake --build "${BUILD_DIR}"
37
17 -mkdir -p "${prefix}/BUILD" "${prefix}/RPMS" "${prefix}/SRPMS" "${prefix}/SPECS" "${prefix}/SOURCES" || exit 1
18 -cp -a /netdata/packaging/repoconfig/netdata-repo.spec "${prefix}/SPECS" || exit 1
19 -cp -a /netdata/packaging/repoconfig/* "${prefix}/SOURCES/" || exit 1
38 +cd "${BUILD_DIR}"
39 +cpack -G RPM
40 +echo "::endgroup::"
41
21 -rpmbuild -bb --rebuild "${prefix}/SPECS/netdata-repo.spec" || exit 1
42 +[ -d "${SRC_DIR}/artifacts" ] || mkdir -p "${SRC_DIR}/artifacts"
43
23 -[ -d /netdata/artifacts ] || mkdir -p /netdata/artifacts
24 -find "${prefix}/RPMS/" -type f -name '*.rpm' -exec cp '{}' /netdata/artifacts \; || exit 1
44 +find "${BUILD_DIR}/packages/" -type f -name '*.rpm' -exec cp '{}' "${SRC_DIR}/artifacts" \; || exit 1
45
26 -chown -R --reference=/netdata /netdata/artifacts
46 +chown -R --reference="${SRC_DIR}" "${SRC_DIR}/artifacts"
packaging/repoconfig/deb.changelog renamed
+12 -6
@@ -1,25 +1,31 @@
1 -netdata-repo (2-2) unstable; urgency=medium
1 +@PKG_NAME@ (3-1) unstable; urgency=medium
2 +
3 + * Migrate to CPack for package builds
4 +
5 + -- Netdata Builder <bot@netdata.cloud> Fri, 14 Jun 2024 08:22:00 -0400
6 +
7 +@PKG_NAME@ (2-2) unstable; urgency=medium
8
9 * Version bump to keep in sync with RPM repo packages
10
11 -- Netdata Builder <bot@netdata.cloud> Mon, 13 Nov 2023 11:15:00 -0500
12
7 -netdata-repo (2-1) unstable; urgency=medium
13 +@PKG_NAME@ (2-1) unstable; urgency=medium
14
15 * Switched to new package hosting infrastructure
16 * Removed apt-transport-https requirement
17
18 -- Netdata Builder <bot@netdata.cloud> Wed, 18 Jan 2023 08:30:00 -0500
19
14 -netdata-repo (1-2) unstable; urgency=medium
20 +@PKG_NAME@ (1-2) unstable; urgency=medium
21
22 * Fixed package file naming for repo layout compliance
23
18 - -- Netdata Builder <bot@netdata.cloud> Mon, 6 Jun 2022 09:30:00 -0500
24 + -- Netdata Builder <bot@netdata.cloud> Mon, 6 Jun 2022 09:30:00 -0400
25
20 -netdata-repo (1-1) unstable; urgency=medium
26 +@PKG_NAME@ (1-1) unstable; urgency=medium
27
28 * Initial Release
29
24 - -- Netdata Builder <bot@netdata.cloud> Mon, 14 Jun 2021 08:00:00 -0500
30 + -- Netdata Builder <bot@netdata.cloud> Mon, 14 Jun 2021 08:00:00 -0400
31
packaging/repoconfig/debian/compat deleted
-1
@@ -1 +0,0 @@
1 -9
packaging/repoconfig/debian/control deleted
-19
@@ -1,19 +0,0 @@
1 -Source: netdata-repo
2 -Section: net
3 -Priority: optional
4 -Maintainer: Netdata Builder <bot@netdata.cloud>
5 -Standards-Version: 3.9.6
6 -Build-Depends: debhelper (>= 9), curl, gnupg
7 -Homepage: https://netdata.cloud
8 -
9 -Package: netdata-repo
10 -Architecture: all
11 -Depends: debian-archive-keyring, gnupg
12 -Conflicts: netdata-repo-edge
13 -Description: Configuration for the official Netdata Stable package repository.
14 -
15 -Package: netdata-repo-edge
16 -Architecture:all
17 -Depends: debian-archive-keyring, gnupg
18 -Conflicts: netdata-repo
19 -Description: Configuration for the official Netdata Edge package repository.
packaging/repoconfig/debian/copyright deleted
-10
@@ -1,10 +0,0 @@
1 -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2 -Upstream-Name: Netdata
3 -Upstream-Contact: Costa Tsaousis <costa@netdata.cloud>
4 -Source: https://github.com/netdata/netdata
5 -
6 -Files: *
7 -Copyright: 2021-2023 Netdata Inc.
8 -License: GPL-3+
9 - On Debian systems, the complete text of the GNU General Public
10 - License version 3 can be found in /usr/share/common-licenses/GPL-3.
packaging/repoconfig/debian/rules deleted
-21
@@ -1,21 +0,0 @@
1 -#!/usr/bin/make -f
2 -
3 -TOP = $(CURDIR)/debian/netdata-repo
4 -TOP_EDGE = $(CURDIR)/debian/netdata-repo-edge
5 -TEMPTOP = $(CURDIR)/debian/tmp
6 -
7 -%:
8 - dh $@
9 -
10 -override_dh_configure:
11 - true
12 -
13 -override_dh_install:
14 - mkdir -p $(TOP)/etc/apt/sources.list.d $(TOP)/etc/apt/trusted.gpg.d/
15 - mv -f $(TEMPTOP)/netdata.list $(TOP)/etc/apt/sources.list.d
16 - mv -f $(TEMPTOP)/netdata-archive-keyring.gpg $(TOP)/etc/apt/trusted.gpg.d
17 - cp $(TEMPTOP)/netdata-repoconfig-archive-keyring.gpg $(TOP)/etc/apt/trusted.gpg.d
18 - mkdir -p $(TOP_EDGE)/etc/apt/sources.list.d $(TOP_EDGE)/etc/apt/trusted.gpg.d/
19 - mv -f $(TEMPTOP)/netdata-edge.list $(TOP_EDGE)/etc/apt/sources.list.d
20 - mv -f $(TEMPTOP)/netdata-edge-archive-keyring.gpg $(TOP_EDGE)/etc/apt/trusted.gpg.d
21 - cp $(TEMPTOP)/netdata-repoconfig-archive-keyring.gpg $(TOP_EDGE)/etc/apt/trusted.gpg.d
packaging/repoconfig/debian/source/format deleted
-1
@@ -1 +0,0 @@
1 -3.0 (quilt)
packaging/repoconfig/netdata-edge.repo.al deleted
-21
@@ -1,21 +0,0 @@
1 -[netdata-edge]
2 -name=Netdata Edge
3 -baseurl=https://repo.netdata.cloud/repos/edge/amazonlinux/$releasever/$basearch
4 -repo_gpgcheck=1
5 -gpgcheck=1
6 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
7 -enabled=1
8 -sslverify=1
9 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
10 -priority=50
11 -
12 -[netdata-repoconfig]
13 -name=Netdata Repository Config
14 -baseurl=https://repo.netdata.cloud/repos/repoconfig/amazonlinux/$releasever/$basearch
15 -repo_gpgcheck=1
16 -gpgcheck=1
17 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
18 -enabled=1
19 -sslverify=1
20 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
21 -priority=50
packaging/repoconfig/netdata-edge.repo.al2023 deleted
-21
@@ -1,21 +0,0 @@
1 -[netdata-edge]
2 -name=Netdata Edge
3 -baseurl=https://repo.netdata.cloud/repos/edge/amazonlinux/2023/$basearch
4 -repo_gpgcheck=1
5 -gpgcheck=1
6 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
7 -enabled=1
8 -sslverify=1
9 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
10 -priority=50
11 -
12 -[netdata-repoconfig]
13 -name=Netdata Repository Config
14 -baseurl=https://repo.netdata.cloud/repos/repoconfig/amazonlinux/2023/$basearch
15 -repo_gpgcheck=1
16 -gpgcheck=1
17 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
18 -enabled=1
19 -sslverify=1
20 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
21 -priority=50
packaging/repoconfig/netdata-edge.repo.centos deleted
-21
@@ -1,21 +0,0 @@
1 -[netdata-edge]
2 -name=Netdata Edge
3 -baseurl=https://repo.netdata.cloud/repos/edge/el/$releasever/$basearch
4 -repo_gpgcheck=1
5 -gpgcheck=1
6 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
7 -enabled=1
8 -sslverify=1
9 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
10 -priority=50
11 -
12 -[netdata-repoconfig]
13 -name=Netdata Repository Config
14 -baseurl=https://repo.netdata.cloud/repos/repoconfig/el/$releasever/$basearch
15 -repo_gpgcheck=1
16 -gpgcheck=1
17 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
18 -enabled=1
19 -sslverify=1
20 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
21 -priority=50
packaging/repoconfig/netdata-edge.repo.fedora deleted
-21
@@ -1,21 +0,0 @@
1 -[netdata-edge]
2 -name=Netdata Edge
3 -baseurl=https://repo.netdata.cloud/repos/edge/fedora/$releasever/$basearch
4 -repo_gpgcheck=1
5 -gpgcheck=1
6 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
7 -enabled=1
8 -sslverify=1
9 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
10 -priority=50
11 -
12 -[netdata-repoconfig]
13 -name=Netdata Repository Config
14 -baseurl=https://repo.netdata.cloud/repos/repoconfig/fedora/$releasever/$basearch
15 -repo_gpgcheck=1
16 -gpgcheck=1
17 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
18 -enabled=1
19 -sslverify=1
20 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
21 -priority=50
packaging/repoconfig/netdata-edge.repo.ol deleted
-21
@@ -1,21 +0,0 @@
1 -[netdata-edge]
2 -name=Netdata Edge
3 -baseurl=https://repo.netdata.cloud/repos/edge/ol/$releasever/$basearch
4 -repo_gpgcheck=1
5 -gpgcheck=1
6 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
7 -enabled=1
8 -sslverify=1
9 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
10 -priority=50
11 -
12 -[netdata-repoconfig]
13 -name=Netdata Repository Config
14 -baseurl=https://repo.netdata.cloud/repos/repoconfig/ol/$releasever/$basearch
15 -repo_gpgcheck=1
16 -gpgcheck=1
17 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
18 -enabled=1
19 -sslverify=1
20 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
21 -priority=50
packaging/repoconfig/netdata-edge.repo.suse deleted
-19
@@ -1,19 +0,0 @@
1 -[netdata-edge]
2 -name=Netdata Edge
3 -baseurl=https://repo.netdata.cloud/repos/edge/opensuse/$releasever/$basearch
4 -repo_gpgcheck=1
5 -pkg_gpgcheck=1
6 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
7 -enabled=1
8 -type=rpm-md
9 -autorefresh=1
10 -
11 -[netdata-repoconfig]
12 -name=Netdata Repoconfig
13 -baseurl=https://repo.netdata.cloud/repos/repoconfig/opensuse/$releasever/$basearch
14 -repo_gpgcheck=1
15 -pkg_gpgcheck=1
16 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
17 -enabled=1
18 -type=rpm-md
19 -autorefresh=1
packaging/repoconfig/netdata-repo.spec deleted
-126
@@ -1,126 +0,0 @@
1 -%{?rhel:%global centos_ver %rhel}
2 -
3 -Name: netdata-repo
4 -Version: 2
5 -Release: 3
6 -Summary: Netdata stable repositories configuration.
7 -
8 -Group: System Environment/Base
9 -License: GPLv2
10 -
11 -Source0: netdata.repo.fedora
12 -Source1: netdata-edge.repo.fedora
13 -Source2: netdata.repo.suse
14 -Source3: netdata-edge.repo.suse
15 -Source4: netdata.repo.centos
16 -Source5: netdata-edge.repo.centos
17 -Source6: netdata.repo.ol
18 -Source7: netdata-edge.repo.ol
19 -Source8: netdata.repo.al
20 -Source9: netdata-edge.repo.al
21 -Source10: netdata.repo.al2023
22 -Source11: netdata-edge.repo.al2023
23 -
24 -BuildArch: noarch
25 -
26 -%if 0%{?centos_ver} && 0%{?centos_ver} < 8
27 -Requires: yum-plugin-priorities
28 -%endif
29 -
30 -%if 0%{?centos_ver} && 0%{!?amazon_linux:1} && 0%{!?oraclelinux:1}
31 -Requires: epel-release
32 -%endif
33 -
34 -# Overlapping file installs
35 -Conflicts: netdata-repo-edge
36 -
37 -%description
38 -This package contains the official Netdata package repository configuration for stable versions of Netdata.
39 -
40 -%prep
41 -%setup -q -c -T
42 -
43 -%if 0%{?fedora}
44 -install -pm 644 %{SOURCE0} ./netdata.repo
45 -install -pm 644 %{SOURCE1} ./netdata-edge.repo
46 -%endif
47 -
48 -%if 0%{?suse_version}
49 -install -pm 644 %{SOURCE2} ./netdata.repo
50 -install -pm 644 %{SOURCE3} ./netdata-edge.repo
51 -%endif
52 -
53 -%if 0%{?centos_ver}
54 -install -pm 644 %{SOURCE4} ./netdata.repo
55 -install -pm 644 %{SOURCE5} ./netdata-edge.repo
56 -%endif
57 -
58 -%if 0%{?oraclelinux}
59 -install -pm 644 %{SOURCE6} ./netdata.repo
60 -install -pm 644 %{SOURCE7} ./netdata-edge.repo
61 -%endif
62 -
63 -%if 0%{?amzn2}
64 -install -pm 644 %{SOURCE8} ./netdata.repo
65 -install -pm 644 %{SOURCE9} ./netdata-edge.repo
66 -%endif
67 -
68 -%if 0%{?amzn2023}
69 -install -pm 644 %{SOURCE10} ./netdata.repo
70 -install -pm 644 %{SOURCE11} ./netdata-edge.repo
71 -%endif
72 -
73 -%build
74 -true
75 -
76 -%install
77 -rm -rf $RPM_BUILD_ROOT
78 -
79 -%if 0%{?suse_version}
80 -install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d
81 -install -pm 644 netdata.repo $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d
82 -install -pm 644 netdata-edge.repo $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d
83 -%else
84 -install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
85 -install -pm 644 netdata.repo $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
86 -install -pm 644 netdata-edge.repo $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
87 -%endif
88 -
89 -%clean
90 -rm -rf $RPM_BUILD_ROOT
91 -
92 -%files
93 -%if 0%{?suse_version}
94 -%attr(644,root,root) /etc/zypp/repos.d/netdata.repo
95 -%else
96 -%attr(644,root,root) /etc/yum.repos.d/netdata.repo
97 -%endif
98 -
99 -%package edge
100 -Summary: Netdata nightly repositories configuration.
101 -Group: System Environment/Base
102 -
103 -# Overlapping file installs
104 -Conflicts: netdata-repo
105 -
106 -%description edge
107 -This package contains the official Netdata package repository configuration for nightly versions of Netdata.
108 -
109 -%files edge
110 -%if 0%{?suse_version}
111 -%attr(644,root,root) /etc/zypp/repos.d/netdata-edge.repo
112 -%else
113 -%attr(644,root,root) /etc/yum.repos.d/netdata-edge.repo
114 -%endif
115 -
116 -%changelog
117 -* Wed Apr 10 2024 Paul Szymanski <mail@pszy.de> 2-3
118 -- Fix repo specification for Amazon Linux 2023.
119 -* Mon Nov 13 2023 Austin Hemmelgarn <austin@netdata.cloud> 2-2
120 -- Add EPEL requirement for RHEL packages.
121 -* Wed Dec 7 2022 Austin Hemmelgarn <austin@netdata.cloud> 2-1
122 -- Switch to new hosting at repo.netdata.cloud.
123 -* Mon Jun 6 2022 Austin Hemmelgarn <austin@netdata.cloud> 1-2
124 -- Bump release to keep in sync with DEB package.
125 -* Mon Jun 14 2021 Austin Hemmelgarn <austin@netdata.cloud> 1-1
126 -- Initial revision
packaging/repoconfig/netdata.list.in
+2 -2
@@ -1,2 +1,2 @@
1 -deb http://repo.netdata.cloud/repos/__VARIANT__/__DISTRO__/ __SUITE__/
2 -deb http://repo.netdata.cloud/repos/repoconfig/__DISTRO__/ __SUITE__/
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.repo.al2023 deleted
-21
@@ -1,21 +0,0 @@
1 -[netdata]
2 -name=Netdata
3 -baseurl=https://repo.netdata.cloud/repos/stable/amazonlinux/2023/$basearch
4 -repo_gpgcheck=1
5 -gpgcheck=1
6 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
7 -enabled=1
8 -sslverify=1
9 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
10 -priority=50
11 -
12 -[netdata-repoconfig]
13 -name=Netdata Repository Config
14 -baseurl=https://repo.netdata.cloud/repos/repoconfig/amazonlinux/2023/$basearch
15 -repo_gpgcheck=1
16 -gpgcheck=1
17 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
18 -enabled=1
19 -sslverify=1
20 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
21 -priority=50
packaging/repoconfig/netdata.repo.centos deleted
-21
@@ -1,21 +0,0 @@
1 -[netdata]
2 -name=Netdata
3 -baseurl=https://repo.netdata.cloud/repos/stable/el/$releasever/$basearch
4 -repo_gpgcheck=1
5 -gpgcheck=1
6 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
7 -enabled=1
8 -sslverify=1
9 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
10 -priority=50
11 -
12 -[netdata-repoconfig]
13 -name=Netdata Repository Config
14 -baseurl=https://repo.netdata.cloud/repos/repoconfig/el/$releasever/$basearch
15 -repo_gpgcheck=1
16 -gpgcheck=1
17 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
18 -enabled=1
19 -sslverify=1
20 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
21 -priority=50
packaging/repoconfig/netdata.repo.dnf renamed
+2 -2
@@ -1,6 +1,6 @@
1 [netdata]
2 name=Netdata
3 -baseurl=https://repo.netdata.cloud/repos/stable/amazonlinux/$releasever/$basearch
3 +baseurl=https://repo.netdata.cloud/repos/@VARIANT@/@DIST_NAME@/@DIST_VERSION@/$basearch
4 repo_gpgcheck=1
5 gpgcheck=1
6 gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
@@ -11,7 +11,7 @@ priority=50
11
12 [netdata-repoconfig]
13 name=Netdata Repository Config
14 -baseurl=https://repo.netdata.cloud/repos/repoconfig/amazonlinux/$releasever/$basearch
14 +baseurl=https://repo.netdata.cloud/repos/repoconfig/@DIST_NAME@/@DIST_VERSION@/$basearch
15 repo_gpgcheck=1
16 gpgcheck=1
17 gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
packaging/repoconfig/netdata.repo.fedora deleted
-21
@@ -1,21 +0,0 @@
1 -[netdata]
2 -name=Netdata
3 -baseurl=https://repo.netdata.cloud/repos/stable/fedora/$releasever/$basearch
4 -repo_gpgcheck=1
5 -gpgcheck=1
6 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
7 -enabled=1
8 -sslverify=1
9 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
10 -priority=50
11 -
12 -[netdata-repoconfig]
13 -name=Netdata Repository Config
14 -baseurl=https://repo.netdata.cloud/repos/repoconfig/fedora/$releasever/$basearch
15 -repo_gpgcheck=1
16 -gpgcheck=1
17 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
18 -enabled=1
19 -sslverify=1
20 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
21 -priority=50
packaging/repoconfig/netdata.repo.ol deleted
-21
@@ -1,21 +0,0 @@
1 -[netdata]
2 -name=Netdata
3 -baseurl=https://repo.netdata.cloud/repos/stable/ol/$releasever/$basearch
4 -repo_gpgcheck=1
5 -gpgcheck=1
6 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
7 -enabled=1
8 -sslverify=1
9 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
10 -priority=50
11 -
12 -[netdata-repoconfig]
13 -name=Netdata Repository Config
14 -baseurl=https://repo.netdata.cloud/repos/repoconfig/ol/$releasever/$basearch
15 -repo_gpgcheck=1
16 -gpgcheck=1
17 -gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
18 -enabled=1
19 -sslverify=1
20 -sslcacert=/etc/pki/tls/certs/ca-bundle.crt
21 -priority=50
packaging/repoconfig/netdata.repo.zypp renamed
+2 -2
@@ -1,6 +1,6 @@
1 [netdata]
2 name=Netdata
3 -baseurl=https://repo.netdata.cloud/repos/stable/opensuse/$releasever/$basearch
3 +baseurl=https://repo.netdata.cloud/repos/@VARIANT@/@DIST_NAME@/@DIST_VERSION@/$basearch
4 repo_gpgcheck=1
5 pkg_gpgcheck=1
6 gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
@@ -10,7 +10,7 @@ autorefresh=1
10
11 [netdata-repoconfig]
12 name=Netdata Repoconfig
13 -baseurl=https://repo.netdata.cloud/repos/repoconfig/opensuse/$releasever/$basearch
13 +baseurl=https://repo.netdata.cloud/repos/repoconfig/@DIST_NAME@/@DIST_VERSION@/$basearch
14 repo_gpgcheck=1
15 pkg_gpgcheck=1
16 gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
packaging/repoconfig/rpm.changelog new
+12
@@ -0,0 +1,12 @@
1 +* Fri Jun 14 2024 Austin Hemmelgarn <austin@netdata.cloud> 3-1
2 +- Migrate package build infrastructure to CPack.
3 +* Wed Apr 10 2024 Paul Szymanski <mail@pszy.de> 2-3
4 +- Fix repo specification for Amazon Linux 2023.
5 +* Mon Nov 13 2023 Austin Hemmelgarn <austin@netdata.cloud> 2-2
6 +- Add EPEL requirement for RHEL packages.
7 +* Wed Dec 7 2022 Austin Hemmelgarn <austin@netdata.cloud> 2-1
8 +- Switch to new hosting at repo.netdata.cloud.
9 +* Mon Jun 6 2022 Austin Hemmelgarn <austin@netdata.cloud> 1-2
10 +- Bump release to keep in sync with DEB package.
11 +* Mon Jun 14 2021 Austin Hemmelgarn <austin@netdata.cloud> 1-1
12 +- Initial revision