diff --git a/systemd.spec b/systemd.spec index 0c8d5d37129cfa6e8b7e7fad888dc5b67d081577..5e193aff90cbc061b8daeaa9bd8a18b5c44eab17 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,4 +1,4 @@ -%define anolis_release 5 +%define anolis_release 6 %global __requires_exclude pkg-config %global pkgdir %{_prefix}/lib/systemd @@ -58,7 +58,6 @@ Source24: sysusers.generate-pre.sh Source31: systemd-tests-file-list Source32: systemd-devel-file-list -Patch0490: use-bfq-scheduler.patch Patch0491: resolved-actually-check-authenticated-flag-of-SOA-tr.patch Patch1001: Systemd-Add-sw64-architecture.patch @@ -1793,7 +1792,6 @@ fi %doc /usr/lib/udev/rules.d/README /usr/lib/udev/rules.d/60-autosuspend.rules /usr/lib/udev/rules.d/60-block.rules -/usr/lib/udev/rules.d/60-block-scheduler.rules /usr/lib/udev/rules.d/60-cdrom_id.rules /usr/lib/udev/rules.d/60-block.rules /usr/lib/udev/rules.d/60-drm.rules @@ -2172,6 +2170,9 @@ fi %doc docs/DISTRO_PORTING.md docs/HACKING.md %changelog +* Fri Jul 04 2025 Zhang Xianwei - 255-6 +- Revert "udev: use bfq as the default scheduler" + * Fri Apr 25 2025 Shangtong Guo - 255-5 - add support for riscv64 build diff --git a/use-bfq-scheduler.patch b/use-bfq-scheduler.patch deleted file mode 100644 index 9ab58f5b687afa4c8054705ff057ec8b9e8c36cb..0000000000000000000000000000000000000000 --- a/use-bfq-scheduler.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1990fb757f6d275d807fcb48ad09f5fc7c947bc6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 14 Aug 2019 15:57:42 +0200 -Subject: [PATCH] udev: use bfq as the default scheduler - -As requested in https://bugzilla.redhat.com/show_bug.cgi?id=1738828. -Test results are that bfq seems to behave better and more consistently on -typical hardware. The kernel does not have a configuration option to set -the default scheduler, and it currently needs to be set by userspace. - -See the bug for more discussion and links. ---- - rules.d/60-block-scheduler.rules | 5 +++++ - rules.d/meson.build | 1 + - 2 files changed, 6 insertions(+) - create mode 100644 rules.d/60-block-scheduler.rules - -diff --git a/rules.d/60-block-scheduler.rules b/rules.d/60-block-scheduler.rules -new file mode 100644 -index 0000000000..850b64540e ---- /dev/null -+++ b/rules.d/60-block-scheduler.rules -@@ -0,0 +1,5 @@ -+# do not edit this file, it will be overwritten on update -+ -+ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", \ -+ KERNEL=="mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|sd*[!0-9]|sr*", \ -+ ATTR{queue/scheduler}="bfq" -diff --git a/rules.d/meson.build b/rules.d/meson.build -index 20fca222da..94fee9d7c0 100644 ---- a/rules.d/meson.build -+++ b/rules.d/meson.build -@@ -7,6 +7,7 @@ install_data( - rules = [ - [files('60-autosuspend.rules', - '60-block.rules', -+ '60-block-scheduler.rules', - '60-cdrom_id.rules', - '60-dmi-id.rules', - '60-drm.rules', --- -2.41.0