Skip to content

Commit 06313fc

Browse files
authored
Merge pull request dm-vdo#15 from C2Redhat/main
[TECH-213] Add Fedora 43 and debug OS support
2 parents f04f5ec + 371f757 commit 06313fc

6 files changed

Lines changed: 22 additions & 5 deletions

File tree

packaging/perl-Permabit-Core/perl-Permabit-Core.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%define base_name Permabit-Core
22
Name: perl-%{base_name}
33
Version: 1.03
4-
Release: 55%{?dist}
4+
Release: 56%{?dist}
55
Summary: Permabit Core Perl libs
66
License: GPL2+
77
URL: https://github.com/dm-vdo/common
@@ -430,6 +430,9 @@ find %{buildroot} -type f -name .packlist -delete
430430
%{__install} -m 644 -D lib/Permabit/ConfiguredFactory.yaml $RPM_BUILD_ROOT/%{_sysconfdir}/permabit/perl.yaml
431431

432432
%changelog
433+
* Fri Oct 31 2025 Chung Chung <cchung@redhat.com> - 1.03-56
434+
- Add Fedora 43 support
435+
433436
* Sat May 10 2025 Chung Chung <cchung@redhat.com> - 1.03-55
434437
- Add Fedora 42 support
435438

packaging/perl-Permabit-checkServer/perl-Permabit-checkServer.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%define base_name Permabit-checkServer
22
Name: perl-%{base_name}
33
Version: 1.0
4-
Release: 37%{?dist}
4+
Release: 38%{?dist}
55
Summary: Permabit checkServer utility
66
License: GPL2+
77
URL: https://github.com/dm-vdo/common
@@ -98,6 +98,9 @@ find %{buildroot} -type f -name .packlist -delete
9898
%{_fixperms} -c %{buildroot}
9999

100100
%changelog
101+
* Fri Oct 31 2025 Chung Chung <cchung@redhat.com> - 1.0-38
102+
- Add Fedora 43 support
103+
101104
* Sat May 10 2025 Chung Chung <cchung@redhat.com> - 1.0-37
102105
- Add Fedora 42 support
103106

perl/Permabit/CheckServer/Constants.pm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ our @DIST_CLASSES = qw(CENTOS8
8484
FEDORA40
8585
FEDORA41
8686
FEDORA42
87+
FEDORA42DEBUG
88+
FEDORA43
89+
FEDORA42DEBUG
8790
FEDORANEXT
8891
RAWHIDE
8992
RHEL6

perl/Permabit/ConfiguredFactory.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ Permabit::RSVP:
131131
- FEDORA40
132132
- FEDORA41
133133
- FEDORA42
134+
- FEDORA42DEBUG
135+
- FEDORA43
136+
- FEDORA43DEBUG
134137
- FEDORANEXT
135138
- RAWHIDE
136139
- RHEL6

perl/Permabit/PlatformUtils.pm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ our @EXPORT_OK = qw(
9898
isThirtyNine
9999
isForty
100100
isFortyOne
101+
isFortyThree
101102
);
102103

103104
my $log = Log::Log4perl->get_logger(__PACKAGE__);
@@ -336,7 +337,7 @@ sub getDistroInfo {
336337
|| ($major == 33) || ($major == 34) || ($major == 35)
337338
|| ($major == 36) || ($major == 37) || ($major == 38)
338339
|| ($major == 39) || ($major == 40) || ($major == 41)
339-
|| ($major == 42)) {
340+
|| ($major == 42) || ($major == 43)) {
340341
return "FEDORA$major";
341342
}
342343
} elsif (isSles($host)) {
@@ -587,7 +588,7 @@ BEGIN {
587588
fedora => [qw(TwentySeven TwentyEight TwentyNine Thirty ThirtyOne
588589
ThirtyTwo ThirtyThree ThirtyFour ThirtyFive ThirtySix
589590
ThirtySeven ThirtyEight ThirtyNine Forty FortyOne Adams
590-
Rawhide)],
591+
FortyThree Rawhide)],
591592
sles => [],
592593
centOS => [qw(8)],
593594
};

perl/bin/checkServer.pl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
isThirtyNine
117117
isForty
118118
isFortyOne
119+
isFortyThree
119120
isRawhide
120121
);
121122

@@ -263,6 +264,8 @@ sub _setPaths {
263264
$CURRENT_KERNELS = '6.*.fc41.x86_64';
264265
} elsif (isAdams()) {
265266
$CURRENT_KERNELS = '6.*.fc42.x86_64';
267+
} elsif (isFortyThree()) {
268+
$CURRENT_KERNELS = '6.*.fc43.x86_64';
266269
} elsif (isRawhide()) {
267270
# Since Fedora Rawhide's kernel changes so frequently
268271
# we can only check basic formatting.
@@ -1090,7 +1093,7 @@ sub checkDaemons {
10901093
|| isThirtyTwo() || isThirtyThree() || isThirtyFour()
10911094
|| isThirtyFive() || isThirtySix() || isThirtySeven()
10921095
|| isThirtyEight() || isThirtyNine() || isForty() || isFortyOne()
1093-
|| isAdams())
1096+
|| isAdams() || isFortyThree())
10941097
&& $daemon eq "ntpd") {
10951098
next;
10961099
}
@@ -1324,6 +1327,7 @@ sub _getOsClass {
13241327
fedora40 => \&isForty,
13251328
fedora41 => \&isFortyOne,
13261329
fedora42 => \&isAdams,
1330+
fedora43 => \&isFortyThree,
13271331
rawhide => \&isRawhide,
13281332
);
13291333
# Fedora linux-next kernel can run on any Fedora OS. Check to see if

0 commit comments

Comments
 (0)