systemd-252-73
Resolves: RHEL-180938, RHEL-180940, RHEL-180939, RHEL-155457
This commit is contained in:
Jan Macku
parent
52b8863288
commit
63d29adf9b
@ -0,0 +1,57 @@
|
||||
From 5262326d17a853e59dcaae88c5d3f618bc8483fe Mon Sep 17 00:00:00 2001
|
||||
From: Rebecca Cran <rebecca@bsdio.com>
|
||||
Date: Fri, 5 Dec 2025 11:20:05 -0700
|
||||
Subject: [PATCH] hwdb,rules: add 82-net-auto-link-local.{hwdb,rules} to build
|
||||
|
||||
Update hwdb.d/meson.build and rules.d/meson.build to add the
|
||||
82-net-auto-link-local.{hwdb,rules} files into the build. Commit
|
||||
ec541c569bd19bbb81791139371111a9a7f1a3d8 in 2023 added the files
|
||||
but didn't add them to the build system.
|
||||
|
||||
(cherry picked from commit b159befeae014a0c64069afaadfb2b58b7a7f8cd)
|
||||
|
||||
Resolves: RHEL-180938
|
||||
---
|
||||
hwdb.d/meson.build | 3 ++-
|
||||
hwdb.d/parse_hwdb.py | 1 +
|
||||
rules.d/meson.build | 1 +
|
||||
3 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build
|
||||
index 0f24f3095c..097ae4ef8c 100644
|
||||
--- a/hwdb.d/meson.build
|
||||
+++ b/hwdb.d/meson.build
|
||||
@@ -39,7 +39,8 @@ hwdb_files_test = files(
|
||||
'70-software-radio.hwdb',
|
||||
'70-sound-card.hwdb',
|
||||
'70-touchpad.hwdb',
|
||||
- '80-ieee1394-unit-function.hwdb')
|
||||
+ '80-ieee1394-unit-function.hwdb',
|
||||
+ '82-net-auto-link-local.hwdb')
|
||||
|
||||
if conf.get('ENABLE_HWDB') == 1
|
||||
auto_suspend_rules = custom_target(
|
||||
diff --git a/hwdb.d/parse_hwdb.py b/hwdb.d/parse_hwdb.py
|
||||
index 668734b237..824433179d 100755
|
||||
--- a/hwdb.d/parse_hwdb.py
|
||||
+++ b/hwdb.d/parse_hwdb.py
|
||||
@@ -181,6 +181,7 @@ def property_grammar():
|
||||
('ID_HARDWARE_WALLET', Or((Literal('0'), Literal('1')))),
|
||||
('ID_SOFTWARE_RADIO', Or((Literal('0'), Literal('1')))),
|
||||
('ID_MM_DEVICE_IGNORE', Or((Literal('0'), Literal('1')))),
|
||||
+ ('ID_NET_AUTO_LINK_LOCAL_ONLY', Or((Literal('0'), Literal('1')))),
|
||||
('POINTINGSTICK_SENSITIVITY', INTEGER),
|
||||
('ID_INPUT_JOYSTICK_INTEGRATION', Or(('internal', 'external'))),
|
||||
('ID_INPUT_TOUCHPAD_INTEGRATION', Or(('internal', 'external'))),
|
||||
diff --git a/rules.d/meson.build b/rules.d/meson.build
|
||||
index 4e88400d02..8327cee78c 100644
|
||||
--- a/rules.d/meson.build
|
||||
+++ b/rules.d/meson.build
|
||||
@@ -30,6 +30,7 @@ rules = [
|
||||
'78-sound-card.rules',
|
||||
'80-net-setup-link.rules',
|
||||
'81-net-dhcp.rules',
|
||||
+ '82-net-auto-link-local.rules',
|
||||
)],
|
||||
|
||||
[files('80-drivers.rules'),
|
||||
29
1351-test-reenable-test-for-cg_get_keyed_attribute.patch
Normal file
29
1351-test-reenable-test-for-cg_get_keyed_attribute.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From ece01612cf57d48488f6dfa26d1681a391115722 Mon Sep 17 00:00:00 2001
|
||||
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||||
Date: Sat, 30 Aug 2025 08:08:04 +0900
|
||||
Subject: [PATCH] test: reenable test for cg_get_keyed_attribute()
|
||||
|
||||
The test case was mistakenly disabled by
|
||||
a412a1b92ab234a57c646f6779471772b2c355ec.
|
||||
|
||||
Co-authored-by: Natalie Vock <natalie.vock@gmx.de>
|
||||
(cherry picked from commit 194e05642f74993d7be80724f2560f1a698931ec)
|
||||
|
||||
Resolves: RHEL-180940
|
||||
---
|
||||
src/test/test-cgroup-util.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
|
||||
index c6439e2fbb..7ac0ba0a77 100644
|
||||
--- a/src/test/test-cgroup-util.c
|
||||
+++ b/src/test/test-cgroup-util.c
|
||||
@@ -367,7 +367,7 @@ TEST(cg_get_keyed_attribute) {
|
||||
int i, r;
|
||||
|
||||
r = cg_get_keyed_attribute("cpu", "/init.scope", "no_such_file", STRV_MAKE("no_such_attr"), &val);
|
||||
- if (IN_SET(r, -ENOMEDIUM, -ENOENT) || ERRNO_IS_PRIVILEGE(r)) {
|
||||
+ if (r == -ENOMEDIUM || ERRNO_IS_PRIVILEGE(r)) {
|
||||
log_info_errno(r, "Skipping most of %s, /sys/fs/cgroup not accessible: %m", __func__);
|
||||
return;
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
From e22bea316fe83011f11faf689f2603a4dd9d8791 Mon Sep 17 00:00:00 2001
|
||||
From: Han Sol Jin <hansol@hansol.ca>
|
||||
Date: Mon, 9 Feb 2026 02:23:03 -0800
|
||||
Subject: [PATCH] Revert "hwdb: fix arrow keys on HP Elite Dragonfly G3"
|
||||
|
||||
Prior to this commit, the behaviour looked like this:
|
||||
|
||||
| Keypress | Result |
|
||||
| -------- | ------------ |
|
||||
| Up | KEY_PAGEUP |
|
||||
| Down | KEY_PAGEDOWN |
|
||||
| Left | KEY_LEFT |
|
||||
| Right | KEY_RIGHT |
|
||||
| Fn+Up | KEY_UP |
|
||||
| Fn+Down | KEY_DOWN |
|
||||
| Fn+Left | KEY_HOME |
|
||||
| Fn+Right | KEY_END |
|
||||
|
||||
This commit would fix it so that PGUP/PGDN would also require the Fn
|
||||
key so that the arrow keys behave identically depending on whether Fn
|
||||
was pressed.
|
||||
|
||||
Presumably after a BIOS update, HP seems to have fixed the order. This
|
||||
now means this commit is now behaving exactly as the table above.
|
||||
|
||||
Revert the commit to restore the intended behaviour:
|
||||
|
||||
| Keypress | Result |
|
||||
| -------- | ------------ |
|
||||
| Up | KEY_UP |
|
||||
| Down | KEY_DOWN |
|
||||
| Left | KEY_LEFT |
|
||||
| Right | KEY_RIGHT |
|
||||
| Fn+Up | KEY_PAGEUP |
|
||||
| Fn+Down | KEY_PAGEDOWN |
|
||||
| Fn+Left | KEY_HOME |
|
||||
| Fn+Right | KEY_END |
|
||||
|
||||
This reverts commit 4fd7c712dcba3c4ed7183ba327d0b88d9b0be9bb.
|
||||
|
||||
Signed-off-by: Han Sol Jin <hansol@hansol.ca>
|
||||
(cherry picked from commit 09b9466e8c6fa8a898769bbbebda513b05251054)
|
||||
|
||||
Resolves: RHEL-180939
|
||||
---
|
||||
hwdb.d/60-keyboard.hwdb | 7 -------
|
||||
1 file changed, 7 deletions(-)
|
||||
|
||||
diff --git a/hwdb.d/60-keyboard.hwdb b/hwdb.d/60-keyboard.hwdb
|
||||
index 465d527817..ba7ddfd1e1 100644
|
||||
--- a/hwdb.d/60-keyboard.hwdb
|
||||
+++ b/hwdb.d/60-keyboard.hwdb
|
||||
@@ -918,13 +918,6 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteDragonflyG2*:pvr*
|
||||
evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteDragonflyG2*:pvr*
|
||||
KEYBOARD_KEY_08=unknown # rfkill is also reported by HP Wireless hotkeys
|
||||
|
||||
-# HP Elite Dragonfly G3
|
||||
-evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP:pnHPEliteDragonfly13.5inchG3NotebookPC:pvr*
|
||||
- KEYBOARD_KEY_c9=up
|
||||
- KEYBOARD_KEY_d1=down
|
||||
- KEYBOARD_KEY_c8=pageup
|
||||
- KEYBOARD_KEY_d0=pagedown
|
||||
-
|
||||
# HP 430 Programmable Wireless Keypad
|
||||
evdev:input:b0005v03F0p854Ae044C*
|
||||
KEYBOARD_KEY_700f3=macro1
|
||||
64
1353-ci-bump-the-mkosi-job-to-Ubuntu-Noble.patch
Normal file
64
1353-ci-bump-the-mkosi-job-to-Ubuntu-Noble.patch
Normal file
@ -0,0 +1,64 @@
|
||||
From 057d8cd08ae99ba09bc0ed280887963e8ae53818 Mon Sep 17 00:00:00 2001
|
||||
From: Frantisek Sumsal <fsumsal@redhat.com>
|
||||
Date: Mon, 20 Jul 2026 18:00:42 +0200
|
||||
Subject: [PATCH] ci: bump the mkosi job to Ubuntu Noble
|
||||
|
||||
This should help with the missing pacman-package-manager package in the
|
||||
mkosi job.
|
||||
|
||||
rhel-only: ci
|
||||
Related: RHEL-155457
|
||||
---
|
||||
.github/workflows/mkosi.yml | 4 ++--
|
||||
mkosi.images/initrd/mkosi.conf | 2 +-
|
||||
mkosi.images/system/mkosi.conf | 2 +-
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
|
||||
index 2694ba14ec..0fa3141b5f 100644
|
||||
--- a/.github/workflows/mkosi.yml
|
||||
+++ b/.github/workflows/mkosi.yml
|
||||
@@ -48,7 +48,7 @@ permissions:
|
||||
|
||||
jobs:
|
||||
ci:
|
||||
- runs-on: ubuntu-22.04
|
||||
+ runs-on: ubuntu-24.04
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ matrix.distro }}-${{ matrix.release }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
@@ -64,7 +64,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
|
||||
- - uses: systemd/mkosi@070528fec478fc93af7ec057a5d2fd0045123c99
|
||||
+ - uses: systemd/mkosi@857838464970f1092cc0107f4b1df714d0744990
|
||||
|
||||
- name: Configure
|
||||
run: |
|
||||
diff --git a/mkosi.images/initrd/mkosi.conf b/mkosi.images/initrd/mkosi.conf
|
||||
index 8e38dc1b78..628a13fe37 100644
|
||||
--- a/mkosi.images/initrd/mkosi.conf
|
||||
+++ b/mkosi.images/initrd/mkosi.conf
|
||||
@@ -8,7 +8,7 @@ Format=cpio
|
||||
|
||||
[Content]
|
||||
BaseTrees=../../mkosi.output/base
|
||||
-ExtraTrees=../../mkosi.output/base-systemd
|
||||
+ExtraTrees=../../mkosi.output/systemd
|
||||
MakeInitrd=yes
|
||||
Bootable=no
|
||||
BuildPackages=
|
||||
diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf
|
||||
index 9646bbefde..a28ba930e3 100644
|
||||
--- a/mkosi.images/system/mkosi.conf
|
||||
+++ b/mkosi.images/system/mkosi.conf
|
||||
@@ -9,7 +9,7 @@ Dependencies=base
|
||||
[Content]
|
||||
Autologin=yes
|
||||
BaseTrees=../../mkosi.output/base
|
||||
-ExtraTrees=../../mkosi.output/base-systemd
|
||||
+ExtraTrees=../../mkosi.output/systemd
|
||||
Packages=
|
||||
acl
|
||||
bash-completion
|
||||
28
1354-ci-bump-super-linter-to-v8.7.0.patch
Normal file
28
1354-ci-bump-super-linter-to-v8.7.0.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From 420652432af30cbb55e716d8bc9895cbfc17db97 Mon Sep 17 00:00:00 2001
|
||||
From: Frantisek Sumsal <fsumsal@redhat.com>
|
||||
Date: Mon, 20 Jul 2026 19:10:23 +0200
|
||||
Subject: [PATCH] ci: bump super-linter to v8.7.0
|
||||
|
||||
So it recognizes the ubuntu-24.04 label.
|
||||
|
||||
Taken from systemd/systemd@b82af8adcf4bdb27f35bc357e200dc3af4171bc7.
|
||||
|
||||
rhel-only: ci
|
||||
Related: RHEL-155457
|
||||
---
|
||||
.github/workflows/linter.yml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
|
||||
index 8dd3b075ad..31c7d790b1 100644
|
||||
--- a/.github/workflows/linter.yml
|
||||
+++ b/.github/workflows/linter.yml
|
||||
@@ -29,7 +29,7 @@ jobs:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Lint Code Base
|
||||
- uses: github/super-linter/slim@01d3218744765b55c3b5ffbb27e50961e50c33c5
|
||||
+ uses: github/super-linter/slim@4ce20838b8ab83717e78138c5b3a1407148e0918
|
||||
env:
|
||||
DEFAULT_BRANCH: main
|
||||
VALIDATE_ALL_CODEBASE: false
|
||||
@ -0,0 +1,29 @@
|
||||
From 6850151e8df81aafeb24f726e79f6820aa072bd1 Mon Sep 17 00:00:00 2001
|
||||
From: Frantisek Sumsal <frantisek@sumsal.cz>
|
||||
Date: Thu, 2 May 2024 09:45:02 +0200
|
||||
Subject: [PATCH] ci: explicitly disable multi status for Super-Linter
|
||||
|
||||
The multi status feature requires $GITHUB_TOKEN, and since [0] it
|
||||
defaults to true. Since we don't need it, let's explicitly disable the
|
||||
feature.
|
||||
|
||||
[0] https://github.com/super-linter/super-linter/commit/e6e6e1fa5f60e15d7e9b89248bb0809bea1c17e9
|
||||
|
||||
(cherry picked from commit b160ac9c126d904358a83a18542e0a37d9ca0d5c)
|
||||
|
||||
Related: RHEL-155457
|
||||
---
|
||||
.github/workflows/linter.yml | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
|
||||
index 31c7d790b1..a7749149ad 100644
|
||||
--- a/.github/workflows/linter.yml
|
||||
+++ b/.github/workflows/linter.yml
|
||||
@@ -32,5 +32,6 @@ jobs:
|
||||
uses: github/super-linter/slim@4ce20838b8ab83717e78138c5b3a1407148e0918
|
||||
env:
|
||||
DEFAULT_BRANCH: main
|
||||
+ MULTI_STATUS: false
|
||||
VALIDATE_ALL_CODEBASE: false
|
||||
VALIDATE_GITHUB_ACTIONS: true
|
||||
@ -0,0 +1,33 @@
|
||||
From ded04794fb290b8bb4ce918fb72dac618f54fc9b Mon Sep 17 00:00:00 2001
|
||||
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||||
Date: Tue, 3 Feb 2026 08:59:38 +0900
|
||||
Subject: [PATCH] github/linter: disable
|
||||
ENABLE_GITHUB_PULL_REQUEST_SUMMARY_COMMENT for super-linter
|
||||
|
||||
Since super-linter 8.4.0, it is enabled by default and requires GITHUB_TOKEN.
|
||||
We do not provide GITHUB_TOKEN for the action, then it fails with the following:
|
||||
```
|
||||
Failed to get [GITHUB_TOKEN]. Terminating because status reports were explicitly enabled,
|
||||
but GITHUB_TOKEN was not provided.
|
||||
```
|
||||
|
||||
Also, even if GITHUB_TOKEN is set, the feature provides annoying
|
||||
messages in each PR. See https://github.com/super-linter/super-linter/issues/7458
|
||||
So, let's disable the feature.
|
||||
|
||||
(cherry picked from commit 90c71778d2bcccbdc70e740a8d706dadd49b8e69)
|
||||
|
||||
Related: RHEL-155457
|
||||
---
|
||||
.github/workflows/linter.yml | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
|
||||
index a7749149ad..213eee9094 100644
|
||||
--- a/.github/workflows/linter.yml
|
||||
+++ b/.github/workflows/linter.yml
|
||||
@@ -35,3 +35,4 @@ jobs:
|
||||
MULTI_STATUS: false
|
||||
VALIDATE_ALL_CODEBASE: false
|
||||
VALIDATE_GITHUB_ACTIONS: true
|
||||
+ ENABLE_GITHUB_PULL_REQUEST_SUMMARY_COMMENT: false
|
||||
@ -0,0 +1,31 @@
|
||||
From 93d0c6945db72a20759bd3fb653f6091541aaa04 Mon Sep 17 00:00:00 2001
|
||||
From: Frantisek Sumsal <fsumsal@redhat.com>
|
||||
Date: Mon, 20 Jul 2026 20:17:23 +0200
|
||||
Subject: [PATCH] test: install iscsi-gen-initiatorname from
|
||||
iscsi-initiator-utils
|
||||
|
||||
The iscsi-init.service started quite recently [0] depending on an
|
||||
external script instead of using an inline one. Let's install it into
|
||||
the test image to make the iSCSI-related tests happy again.
|
||||
|
||||
[0] https://gitlab.com/redhat/centos-stream/rpms/iscsi-initiator-utils/-/commit/d864f8c6e2acda4e6131e334771c9c9d987dc0dc
|
||||
|
||||
rhel-only: ci
|
||||
Related: RHEL-155457
|
||||
---
|
||||
test/test-functions | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/test-functions b/test/test-functions
|
||||
index 52eff07510..76fc1f5437 100644
|
||||
--- a/test/test-functions
|
||||
+++ b/test/test-functions
|
||||
@@ -1036,7 +1036,7 @@ install_iscsi() {
|
||||
# Install client-side stuff ("initiator" in iSCSI jargon) - Open-iSCSI in this case
|
||||
# (open-iscsi on Debian, iscsi-initiator-utils on Fedora, etc.)
|
||||
if [[ -z "$inst" || "$inst" =~ (client|initiator) ]]; then
|
||||
- image_install iscsi-iname iscsiadm iscsid iscsistart
|
||||
+ image_install iscsi-iname iscsiadm iscsid iscsistart iscsi-gen-initiatorname
|
||||
image_install -o "${ROOTLIBDIR:?}"/system/iscsi-{init,onboot,shutdown}.service
|
||||
image_install "${ROOTLIBDIR:?}"/system/iscsid.{service,socket}
|
||||
image_install "${ROOTLIBDIR:?}"/system/iscsi.service
|
||||
20
systemd.spec
20
systemd.spec
@ -21,7 +21,7 @@
|
||||
Name: systemd
|
||||
Url: https://systemd.io
|
||||
Version: 252
|
||||
Release: 72%{?dist}
|
||||
Release: 73%{?dist}
|
||||
# For a breakdown of the licensing, see README
|
||||
License: LGPLv2+ and MIT and GPLv2+
|
||||
Summary: System and Service Manager
|
||||
@ -1432,6 +1432,14 @@ Patch1346: 1346-nss-systemd-avoid-ELF-TLS-for-recursion-guard.patch
|
||||
Patch1347: 1347-udev-builtin-net-id-print-cescaped-bad-attributes.patch
|
||||
Patch1348: 1348-udev-drop-redundant-checks.patch
|
||||
Patch1349: 1349-Revert-udev-builtin-net-id-print-cescaped-bad-attrib.patch
|
||||
Patch1350: 1350-hwdb-rules-add-82-net-auto-link-local.-hwdb-rules-to.patch
|
||||
Patch1351: 1351-test-reenable-test-for-cg_get_keyed_attribute.patch
|
||||
Patch1352: 1352-Revert-hwdb-fix-arrow-keys-on-HP-Elite-Dragonfly-G3.patch
|
||||
Patch1353: 1353-ci-bump-the-mkosi-job-to-Ubuntu-Noble.patch
|
||||
Patch1354: 1354-ci-bump-super-linter-to-v8.7.0.patch
|
||||
Patch1355: 1355-ci-explicitly-disable-multi-status-for-Super-Linter.patch
|
||||
Patch1356: 1356-github-linter-disable-ENABLE_GITHUB_PULL_REQUEST_SUM.patch
|
||||
Patch1357: 1357-test-install-iscsi-gen-initiatorname-from-iscsi-init.patch
|
||||
|
||||
# Downstream-only patches (9000–9999)
|
||||
|
||||
@ -2309,6 +2317,16 @@ systemd-hwdb update &>/dev/null || :
|
||||
%{_prefix}/lib/dracut/modules.d/70rhel-net-naming-sysattrs/*
|
||||
|
||||
%changelog
|
||||
* Tue Jul 21 2026 systemd maintenance team <systemd-maint@redhat.com> - 252-73
|
||||
- hwdb,rules: add 82-net-auto-link-local.{hwdb,rules} to build (RHEL-180938)
|
||||
- test: reenable test for cg_get_keyed_attribute() (RHEL-180940)
|
||||
- Revert "hwdb: fix arrow keys on HP Elite Dragonfly G3" (RHEL-180939)
|
||||
- ci: bump the mkosi job to Ubuntu Noble (RHEL-155457)
|
||||
- ci: bump super-linter to v8.7.0 (RHEL-155457)
|
||||
- ci: explicitly disable multi status for Super-Linter (RHEL-155457)
|
||||
- github/linter: disable ENABLE_GITHUB_PULL_REQUEST_SUMMARY_COMMENT for super-linter (RHEL-155457)
|
||||
- test: install iscsi-gen-initiatorname from iscsi-initiator-utils (RHEL-155457)
|
||||
|
||||
* Thu Jul 16 2026 systemd maintenance team <systemd-maint@redhat.com> - 252-72
|
||||
- man: reword the description of "secure pager" handling (RHEL-102941)
|
||||
- pager: also check for $SUDO_UID (RHEL-102941)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user