Add Fedora 42 to CI and package builds. (#20177)
Austin S. Hemmelgarn committed
Apr 30, 2025 at 09:29 UTC
4b32485afbdfb2e4ea867850c46f6dcae9c52b8d
2 files changed
+16
-2
.github/data/distros.yml
+9
-2
@@ -207,7 +207,7 @@ include:
207
208
- &fedora
209
distro: fedora
210
- version: "41"
210
+ version: "42"
211
support_type: Core
212
notes: ''
213
eol_check: true
@@ -216,13 +216,20 @@ include:
216
dnf remove -y json-c-devel
217
packages: &fedora_packages
218
type: rpm
219
- repo_distro: fedora/41
219
+ repo_distro: fedora/42
220
builder_rev: *def_builder_rev
221
arches:
222
- x86_64
223
- aarch64
224
test:
225
ebpf-core: true
226
+ - <<: *fedora
227
+ version: "41"
228
+ packages:
229
+ <<: *fedora_packages
230
+ repo_distro: fedora/41
231
+ test:
232
+ ebpf-core: true
233
- <<: *fedora
234
version: "40"
235
packages:
netdata.spec.in
+7
@@ -117,6 +117,13 @@ AutoReqProv: yes
117
%global _have_ml 1
118
%endif
119
120
+# Fedora 42 merges sbin and bin, but we don’t correctly handle that
121
+# in our install without using the system provided symlinks, so fix our
122
+# handling here.
123
+%if "%{_sbindir}" == "/usr/bin"
124
+%global _sbindir %{_exec_prefix}/sbin
125
+%endif
126
+
127
# Filter known bogus deps that would be caught by AutoReqProv.
128
%global __requires_exclude_from ^%{_libdir}/%{name}/system/.*$
129