From af35d8ee94a2acd1f35173462df1f024996fe346 Mon Sep 17 00:00:00 2001 From: h30032433 Date: Fri, 1 Mar 2024 17:19:54 +0800 Subject: [PATCH] move the architecture patches after Patch9800 (excluding Patch9800) --- systemd.spec | 64 +++++++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/systemd.spec b/systemd.spec index 63c25f5..1cc6264 100644 --- a/systemd.spec +++ b/systemd.spec @@ -25,7 +25,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 255 -Release: 4 +Release: 5 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -83,30 +83,31 @@ Patch9032: revert-rpm-restart-services-in-posttrans.patch Patch9033: Don-t-set-AlternativeNamesPolicy-by-default.patch Patch9034: change-NTP-server-to-x.pool.ntp.org.patch Patch9035: keep-weight-consistent-with-the-set-value.patch -Patch9036: Systemd-Add-sw64-architecture.patch -Patch9037: core-update-arg_default_rlimit-in-bump_rlimit.patch -Patch9038: set-forwardtowall-no-to-avoid-emerg-log-shown-on-she.patch -Patch9039: core-cgroup-support-cpuset.patch -Patch9040: core-cgroup-support-freezer.patch -Patch9041: core-cgroup-support-memorysw.patch -Patch9042: systemd-core-Add-new-rules-for-lower-priority-events.patch -Patch9043: bugfix-also-stop-machine-when-a-machine-un.patch -Patch9044: print-the-process-status-to-console-when-shutdown.patch -Patch9045: Retry-to-handle-the-uevent-when-worker-is-terminated.patch -Patch9046: treat-underscore-as-valid-hostname-char.patch -Patch9047: process-util-log-more-information-when-runnin.patch -Patch9048: fuser-print-umount-message-to-reboot-umount-msg.patch -Patch9049: shutdown-reboot-when-recieve-crash-signal.patch -Patch9050: core-add-OptionalLog-to-allow-users-change-log-level.patch -Patch9051: core-cgroup-support-default-slice-for-all-uni.patch -Patch9052: core-add-invalidate-cgroup-config.patch -Patch9053: let-the-child-of-one-unit-don-t-affect-each-other.patch -Patch9054: support-disable-cgroup-controllers-we-don-t-want.patch -Patch9055: bugfix-for-cgroup-Swap-cgroup-v1-deletion-and-migration.patch -Patch9056: delete-journal-files-except-system.journal-when-jour.patch -Patch9057: set-the-cpuset.cpus-mems-of-machine.slice-to-all-by-.patch -Patch9058: add-a-new-switch-to-control-whether-udev-complies-wi.patch -Patch9059: journal-don-t-enable-systemd-journald-audit.socket.patch +Patch9036: core-update-arg_default_rlimit-in-bump_rlimit.patch +Patch9037: set-forwardtowall-no-to-avoid-emerg-log-shown-on-she.patch +Patch9038: core-cgroup-support-cpuset.patch +Patch9039: core-cgroup-support-freezer.patch +Patch9040: core-cgroup-support-memorysw.patch +Patch9041: systemd-core-Add-new-rules-for-lower-priority-events.patch +Patch9042: bugfix-also-stop-machine-when-a-machine-un.patch +Patch9043: print-the-process-status-to-console-when-shutdown.patch +Patch9044: Retry-to-handle-the-uevent-when-worker-is-terminated.patch +Patch9045: treat-underscore-as-valid-hostname-char.patch +Patch9046: process-util-log-more-information-when-runnin.patch +Patch9047: fuser-print-umount-message-to-reboot-umount-msg.patch +Patch9048: shutdown-reboot-when-recieve-crash-signal.patch +Patch9049: core-add-OptionalLog-to-allow-users-change-log-level.patch +Patch9050: core-cgroup-support-default-slice-for-all-uni.patch +Patch9051: core-add-invalidate-cgroup-config.patch +Patch9052: let-the-child-of-one-unit-don-t-affect-each-other.patch +Patch9053: support-disable-cgroup-controllers-we-don-t-want.patch +Patch9054: bugfix-for-cgroup-Swap-cgroup-v1-deletion-and-migration.patch +Patch9055: delete-journal-files-except-system.journal-when-jour.patch +Patch9056: set-the-cpuset.cpus-mems-of-machine.slice-to-all-by-.patch +Patch9057: add-a-new-switch-to-control-whether-udev-complies-wi.patch +Patch9058: journal-don-t-enable-systemd-journald-audit.socket.patch + +Patch9801: Systemd-Add-sw64-architecture.patch BuildRequires: gcc, gcc-c++ BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel @@ -291,9 +292,13 @@ Systemd PAM module registers the session with systemd-logind. %package_help %prep -%autosetup -n %{name}-%{version} -p1 -Sgit -%ifnarch sw_64 -%patch 9036 -R -p1 +%autosetup -n %{name}-%{version} -p1 -Sgit -N +# DO NOT USE "%patch -R" TO REVERT A PATCH. If your patch is only used in +# specific scenarios or architectures, please put it after Patch9800 and +# use "%ifarch" to patch it after applying all other patches. +%autopatch -M 9800 +%ifarch sw_64 +%autopatch 9801 %endif %build @@ -1630,6 +1635,9 @@ fi %{_libdir}/security/pam_systemd_loadkey.so %changelog +* Fri Mar 1 2024 huyubiao - 255-5 +- move the architecture patches after Patch9800 (excluding Patch9800) + * Thu Feb 29 2024 licunlong - 255-4 - fix the compilation warning caused by misusing const