systemd-252-78
Resolves: RHEL-164539, RHEL-155457
This commit is contained in:
parent
e72e282de3
commit
a99abb5d8a
37
1374-test-rename-the-start-limit-subtest.patch
Normal file
37
1374-test-rename-the-start-limit-subtest.patch
Normal file
@ -0,0 +1,37 @@
|
||||
From 9c200c01eeb947d2300da421e8994ef9d286183e Mon Sep 17 00:00:00 2001
|
||||
From: Frantisek Sumsal <fsumsal@redhat.com>
|
||||
Date: Wed, 19 Aug 2026 09:56:52 +0200
|
||||
Subject: [PATCH] test: rename the start limit subtest
|
||||
|
||||
It uses the current upstream naming, unfortunately in RHEL 9 we still
|
||||
use the previous one, so the test was not picked up by the
|
||||
TEST-07-PID1's main test script.
|
||||
|
||||
Also, unmask & enable the systemd-resolved service, as the old testing
|
||||
framework masks it by default.
|
||||
|
||||
rhel-only: ci
|
||||
Related: RHEL-164539
|
||||
|
||||
Follow-up for 4060cdad388b0ae658f2024633b842a46c37962e.
|
||||
---
|
||||
...{TEST-07-PID1.start-limit.sh => testsuite-07.start-limit.sh} | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
rename test/units/{TEST-07-PID1.start-limit.sh => testsuite-07.start-limit.sh} (93%)
|
||||
|
||||
diff --git a/test/units/TEST-07-PID1.start-limit.sh b/test/units/testsuite-07.start-limit.sh
|
||||
similarity index 93%
|
||||
rename from test/units/TEST-07-PID1.start-limit.sh
|
||||
rename to test/units/testsuite-07.start-limit.sh
|
||||
index 93447452da..ebd8ac50ac 100755
|
||||
--- a/test/units/TEST-07-PID1.start-limit.sh
|
||||
+++ b/test/units/testsuite-07.start-limit.sh
|
||||
@@ -15,6 +15,8 @@ at_exit() {
|
||||
|
||||
trap at_exit EXIT
|
||||
|
||||
+systemctl unmask systemd-resolved.service
|
||||
+systemctl enable systemd-resolved.service
|
||||
mkdir -p /run/systemd/system/systemd-resolved.service.d/
|
||||
cat >/run/systemd/system/systemd-resolved.service.d/99-start-limit.conf <<EOF
|
||||
[Unit]
|
||||
37
1375-ci-install-GPG-keys-for-Fedora-42.patch
Normal file
37
1375-ci-install-GPG-keys-for-Fedora-42.patch
Normal file
@ -0,0 +1,37 @@
|
||||
From 01a9f0f0489d0744b24ffbe0badba04a02c21dc4 Mon Sep 17 00:00:00 2001
|
||||
From: Frantisek Sumsal <fsumsal@redhat.com>
|
||||
Date: Wed, 19 Aug 2026 12:24:43 +0200
|
||||
Subject: [PATCH] ci: install GPG keys for Fedora 42
|
||||
|
||||
Fedora 42 is EOL and the official keyring doesn't have its keys anymore.
|
||||
This, in combination with a pretty old version of mkosi means we have to
|
||||
improvise a bit to get the old keys at the correct place, so we can
|
||||
bootstrap the tools tree with the old Fedora release.
|
||||
|
||||
rhel-only: ci
|
||||
Related: RHEL-155457
|
||||
---
|
||||
.github/workflows/mkosi.yml | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
|
||||
index 0fa3141b5f..23375bdb13 100644
|
||||
--- a/.github/workflows/mkosi.yml
|
||||
+++ b/.github/workflows/mkosi.yml
|
||||
@@ -66,6 +66,16 @@ jobs:
|
||||
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
|
||||
- uses: systemd/mkosi@857838464970f1092cc0107f4b1df714d0744990
|
||||
|
||||
+ - name: Install GPG keys for Fedora 42
|
||||
+ run: |
|
||||
+ sudo mkdir -p /usr/share/distribution-gpg-keys
|
||||
+ sudo apt-get install -y curl cpio rpm2cpio
|
||||
+ tmpdir=$(mktemp -d)
|
||||
+ curl -sL https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/42/Server/x86_64/os/Packages/f/fedora-gpg-keys-42-1.noarch.rpm |
|
||||
+ rpm2cpio | cpio -idmv -D "$tmpdir"
|
||||
+ sudo mv "$tmpdir/etc/pki/rpm-gpg" /usr/share/distribution-gpg-keys/fedora
|
||||
+ rm -rf "$tmpdir"
|
||||
+
|
||||
- name: Configure
|
||||
run: |
|
||||
tee mkosi.local.conf <<EOF
|
||||
@ -21,7 +21,7 @@
|
||||
Name: systemd
|
||||
Url: https://systemd.io
|
||||
Version: 252
|
||||
Release: 77%{?dist}
|
||||
Release: 78%{?dist}
|
||||
# For a breakdown of the licensing, see README
|
||||
License: LGPLv2+ and MIT and GPLv2+
|
||||
Summary: System and Service Manager
|
||||
@ -1456,6 +1456,8 @@ Patch1370: 1370-man-repart-fix-typo.patch
|
||||
Patch1371: 1371-test-include-util.sh-needed-for-assert_-functions.patch
|
||||
Patch1372: 1372-test-drop-forgotten-set-e.patch
|
||||
Patch1373: 1373-journal-treble-field-hash-table-size.patch
|
||||
Patch1374: 1374-test-rename-the-start-limit-subtest.patch
|
||||
Patch1375: 1375-ci-install-GPG-keys-for-Fedora-42.patch
|
||||
|
||||
# Downstream-only patches (9000–9999)
|
||||
|
||||
@ -2333,6 +2335,10 @@ systemd-hwdb update &>/dev/null || :
|
||||
%{_prefix}/lib/dracut/modules.d/70rhel-net-naming-sysattrs/*
|
||||
|
||||
%changelog
|
||||
* Wed Aug 19 2026 systemd maintenance team <systemd-maint@redhat.com> - 252-78
|
||||
- test: rename the start limit subtest (RHEL-164539)
|
||||
- ci: install GPG keys for Fedora 42 (RHEL-155457)
|
||||
|
||||
* Tue Aug 18 2026 systemd maintenance team <systemd-maint@redhat.com> - 252-77
|
||||
- test: include util.sh needed for assert_*() functions (RHEL-155457)
|
||||
- test: drop forgotten `set +e` (RHEL-155457)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user