diff --git a/1002-Adapt-to-GROUP_BALANCER-MAGIC.patch b/1002-Adapt-to-GROUP_BALANCER-MAGIC.patch new file mode 100644 index 0000000000000000000000000000000000000000..d9a12746094227f36407ad07c8115971aac4f679 --- /dev/null +++ b/1002-Adapt-to-GROUP_BALANCER-MAGIC.patch @@ -0,0 +1,25 @@ +From f9400249b76769369c1239ed08ddf3da4ce7eebf Mon Sep 17 00:00:00 2001 +From: ε”δΈœζ˜Ÿ +Date: Tue, 25 Feb 2025 20:20:11 +0800 +Subject: [PATCH] Adapt to GROUP BALANCER-MAGIC +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- +src/basic/check-filesystems.sh | 2 +- +1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/basic/check-filesystems.sh b/src/basic/check-filesystems.sh +index 696ef61..f0e1d2a 100644 +--- a/src/basic/check-filesystems.sh ++++ b/src/basic/check-filesystems.sh +@@ -23,7 +23,7 @@ + # STACK_END_MAGIC doesn't refer to a filesystem + # mtd_inode was removed in 2015 + # futexfs was removed in 2018 +- if [[ "$fs" =~ ^(STACK_END_MAGIC|MTD_INODE_FS_MAGIC|FUTEXFS_SUPER_MAGIC)$ ]]; then ++ if [[ "$fs" =~ ^(STACK_END_MAGIC|MTD_INODE_FS_MAGIC|FUTEXFS_SUPER_MAGIC|GROUP_BALANCER_MAGIC)$ ]]; then + continue + fi + echo "Filesystem found in kernel header but not in $(basename "$filesystems_gperf"): $fs"; diff --git a/systemd.spec b/systemd.spec index c923846556db88771c3fdc52ebc8b8cd0cdaeca1..4ce0ff3f5d7f98cbe7d9db3b933547a3f758ca4b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,4 +1,4 @@ -%define anolis_release 8 +%define anolis_release 9 %global __requires_exclude pkg-config %global pkgdir %{_prefix}/lib/systemd @@ -68,7 +68,8 @@ Patch0495: coredump-also-stop-forwarding-non-dumpable-processes.patch Patch0496: coredump-get-rid-of-a-bogus-assertion.patch Patch1001: Systemd-Add-sw64-architecture.patch - +Patch1002: 1002-Adapt-to-GROUP_BALANCER-MAGIC.patch + BuildRequires: gcc gcc-c++ clang coreutils BuildRequires: libcap-devel libmount-devel libfdisk-devel libpwquality-devel BuildRequires: pam-devel libselinux-devel audit-libs-devel dbus-devel @@ -2177,6 +2178,9 @@ fi %doc docs/DISTRO_PORTING.md docs/HACKING.md %changelog +* Thu Oct 23 2025 mgb01105731 - 255-9 +- Fix the build error caused by GROUP_BALANCER_MAGIC in the kernel + * Mon Sep 15 2025 zhoujiajia111 - 255-8 - Fix abnormal version conflict information